Skip to content

Make room panel tabs interactable when you own it but can't make it. #4099

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Spatulade wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Make room panel tabs interactable when you own it but can't make it. #4099

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
9e3599d
some initial setup (needs correcting)
Spatulade Jun 29, 2025
0d44047
Merge branch 'master' into pr/4099
Loobinex Jul 31, 2025
1606cd4
always draw frame if you own it, show room greyed out if you can't ma…
Spatulade Aug 2, 2025
541cece
redo it in the right order
Spatulade Aug 2, 2025
16b59b8
revert to original enabled
Spatulade Aug 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 24 additions & 14 deletions src/frontmenu_ingame_tabs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1582,30 +1582,40 @@ void gui_area_room_button(struct GuiButton *gbtn)
int ps_units_per_px = simple_gui_panel_sprite_height_units_per_px(gbtn, GPS_rpanel_frame_portrt_empty, 128);

RoomKind rkind = gbtn->content.lval;
draw_gui_panel_sprite_left(gbtn->scr_pos_x, gbtn->scr_pos_y, ps_units_per_px, GPS_rpanel_frame_portrt_empty);
struct Dungeon* dungeon = get_my_dungeon();
draw_gui_panel_sprite_left(gbtn->scr_pos_x, gbtn->scr_pos_y, ps_units_per_px, GPS_rpanel_frame_portrt_empty);
if (dungeon->room_kind[rkind] > 0) {
draw_gui_panel_sprite_left(gbtn->scr_pos_x, gbtn->scr_pos_y, ps_units_per_px, GPS_rpanel_frame_portrt_light);
}
if ((dungeon->room_buildable[rkind] & 1) // One can build it now
|| (dungeon->room_resrchable[rkind] == 1) // One can research it at any time
|| (dungeon->room_resrchable[rkind] == 2) // One can research it and get instantly then found
|| ((dungeon->room_resrchable[rkind] == 4) && (dungeon->room_buildable[rkind] & 2)) // Player able to research
)
{
if ((gbtn->flags & LbBtnF_Enabled) != 0)
{
if (dungeon->room_kind[rkind] > 0)
draw_gui_panel_sprite_left(gbtn->scr_pos_x, gbtn->scr_pos_y, ps_units_per_px, GPS_rpanel_frame_portrt_light);
int spr_idx = (dungeon->total_money_owned < get_room_kind_stats(rkind)->cost) + gbtn->sprite_idx;
if ((gbtn->gbactn_1 == 0) && (gbtn->gbactn_2 == 0)) {
draw_gui_panel_sprite_left(gbtn->scr_pos_x, gbtn->scr_pos_y, ps_units_per_px, spr_idx);
} else {
draw_gui_panel_sprite_rmleft(gbtn->scr_pos_x, gbtn->scr_pos_y, ps_units_per_px, spr_idx, 44);
}
} else
{
// Draw a question mark over the button, to indicate it can be researched
int spr_idx;
if ((gbtn->flags & LbBtnF_Enabled) != 0) {
spr_idx = (dungeon->total_money_owned < get_room_kind_stats(rkind)->cost) + gbtn->sprite_idx;
} else if (dungeon->room_kind[rkind] > 0) {// Disabled but owned: Show greyed out
spr_idx = 1 + gbtn->sprite_idx;
} else {
// Disabled and not owned: draw a question mark over the button, to indicate it can be researched
draw_gui_panel_sprite_left(gbtn->scr_pos_x, gbtn->scr_pos_y, ps_units_per_px, GPS_rpanel_frame_portrt_qmark);
lbDisplay.DrawFlags = flg_mem;
return;
}
if ((gbtn->gbactn_1 == 0) && (gbtn->gbactn_2 == 0)) {
draw_gui_panel_sprite_left(gbtn->scr_pos_x, gbtn->scr_pos_y, ps_units_per_px, spr_idx);
} else {
draw_gui_panel_sprite_rmleft(gbtn->scr_pos_x, gbtn->scr_pos_y, ps_units_per_px, spr_idx, 44);
}
}
else if (dungeon->room_kind[rkind] > 0)
{
// Can never make, but owned: show greyed out
int spr_idx = 1 + gbtn->sprite_idx;
draw_gui_panel_sprite_left(gbtn->scr_pos_x, gbtn->scr_pos_y, ps_units_per_px, spr_idx);
}
lbDisplay.DrawFlags = flg_mem;
}

Expand Down
Loading