Cleaned up and unified the source before the big refactor.
This commit is contained in:
parent
0d6a71b06f
commit
343f3a246f
5 changed files with 11 additions and 29 deletions
|
@ -136,11 +136,9 @@ namespace gui {
|
|||
$grab_source = std::any_cast<DinkyECS::Entity>(data);
|
||||
|
||||
if(auto world_entity = $loot_ui.begin_grab(*$grab_source)) {
|
||||
$window.setMouseCursorVisible(false);
|
||||
$status_ui.begin_drop(*world_entity);
|
||||
} else {
|
||||
// BUG: need a cancel operation here
|
||||
$window.setMouseCursorVisible(true);
|
||||
$grab_source = std::nullopt;
|
||||
state(State::LOOTING);
|
||||
}
|
||||
|
@ -154,7 +152,6 @@ namespace gui {
|
|||
$grab_source = std::nullopt;
|
||||
}
|
||||
|
||||
$window.setMouseCursorVisible(true);
|
||||
state(State::LOOTING);
|
||||
}
|
||||
} break;
|
||||
|
@ -200,7 +197,6 @@ namespace gui {
|
|||
$grab_source = std::nullopt;
|
||||
}
|
||||
|
||||
//$window.setMouseCursorVisible(true);
|
||||
state(State::LOOTING);
|
||||
}
|
||||
} break;
|
||||
|
@ -208,11 +204,9 @@ namespace gui {
|
|||
$grab_source = std::any_cast<DinkyECS::Entity>(data);
|
||||
|
||||
if(auto world_entity = $status_ui.begin_grab(*$grab_source)) {
|
||||
//$window.setMouseCursorVisible(false);
|
||||
$loot_ui.begin_drop(*world_entity);
|
||||
} else {
|
||||
// BUG: need a cancel operation here
|
||||
//$window.setMouseCursorVisible(true);
|
||||
$grab_source = std::nullopt;
|
||||
state(State::LOOTING);
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue