games/raycaster
1
0
Fork 0
Code Issues 30 Pull requests Projects Releases 2 Packages Wiki Activity Actions

Now floor drops always work by having a drop against a wall just drop at your feet. Closes #77.

Browse source
This commit is contained in:
Zed A. Shaw 2025-08-02 23:26:42 -04:00
parent 1788b8fb28
commit 694ee210d6
8 changed files with 30 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

24
gui/dnd_loot.cpp
View file

@ -111,8 +111,8 @@ namespace gui {
switch(ev) {
case AIM_CLICK: {
// take from inventory, drop on floor
bool worked = throw_on_floor($status_ui.$gui, true);
if(worked) END(CLOSE);
throw_on_floor($status_ui.$gui, true);
END(CLOSE);
} break;
case INV_SELECT: {
auto drop_id = std::any_cast<guecs::Entity>(data);
@ -137,8 +137,8 @@ namespace gui {
break;
case AIM_CLICK: {
// THIS IS PUT IT BACK ON THE FLOOR
bool worked = throw_on_floor($loot_ui.$gui, false);
if(worked) END(CLOSE);
throw_on_floor($loot_ui.$gui, false);
END(CLOSE);
} break;
default:
handle_mouse(ev, $loot_ui.$gui);
@ -282,27 +282,21 @@ namespace gui {
* Dropping on the ground is only possible from the
* status_ui for now.
*/
bool DNDLoot::throw_on_floor(guecs::UI& gui, bool from_status) {
void DNDLoot::throw_on_floor(guecs::UI& gui, bool from_status) {
dbc::check($grab_source != std::nullopt, "attempt to commit_drop but no grab_source set");
dbc::check(gui.has<guecs::GrabSource>(*$grab_source),
"StatusUI doesn't actually have that GrabSource in the gui.");
auto& grab = gui.get<guecs::GrabSource>(*$grab_source);
bool result = false;
if(from_status) {
result = $status_ui.drop_item(grab.world_entity);
$status_ui.drop_item(grab.world_entity);
} else {
result = $loot_ui.drop_item(grab.world_entity);
$loot_ui.drop_item(grab.world_entity);
}
if(result) {
grab.commit();
clear_grab();
}
return result;
grab.commit();
clear_grab();
}
/*