Skip to content

Y
ygopro
Commit 8df1ae5c authored by nanahira's avatar nanahira
Browse files
Options

Merge branch 'master' into server

parents 19dac10d 31af874c
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
gframe/deck_con.cpp
View file @ 8df1ae5c
...@@ -717,6 +717,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) { ...@@ -717,6 +717,7 @@ bool DeckBuilder::OnEvent(const irr::SEvent& event) {
return false; return false;
} }
void DeckBuilder::GetHoveredCard() { void DeckBuilder::GetHoveredCard() {
int pre_code = hovered_code;
hovered_pos = 0; hovered_pos = 0;
hovered_code = 0; hovered_code = 0;
irr::gui::IGUIElement* root = mainGame->env->getRootGUIElement(); irr::gui::IGUIElement* root = mainGame->env->getRootGUIElement();
...@@ -725,7 +726,6 @@ void DeckBuilder::GetHoveredCard() { ...@@ -725,7 +726,6 @@ void DeckBuilder::GetHoveredCard() {
position2di pos = mainGame->ResizeReverse(mouse_pos.X, mouse_pos.Y); position2di pos = mainGame->ResizeReverse(mouse_pos.X, mouse_pos.Y);
int x = pos.X; int x = pos.X;
int y = pos.Y; int y = pos.Y;
int pre_code = hovered_code;
is_lastcard = 0; is_lastcard = 0;
if(x >= 314 && x <= 794) { if(x >= 314 && x <= 794) {
if(y >= 164 && y <= 435) { if(y >= 164 && y <= 435) {
......
ocgcore @ 72d3f2ce
Subproject commit c06fbb93376fe8fdcf3d40d576ee779cfbd67984 Subproject commit 72d3f2ce7e7ad76f2b1e4a93787fa38a3a5e06e5
script @ cfd6f884
Subproject commit 19d76127193f08033ad5a4ee8be6e41d10f2c8b7 Subproject commit cfd6f884e399a534a51f68a642d18028cfa84f3e
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment