Skip to content
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

Doom: shift widgets one line down so chat typing line may appear #949

Merged
merged 5 commits into from
Oct 7, 2022
Merged

Doom: shift widgets one line down so chat typing line may appear #949

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4d683e8
Doom: shift widgets one line down so chat typing line may appear
JNechaevsky Sep 11, 2022
82e0e70
Shift coords down as well
JNechaevsky Sep 11, 2022
cad3683
Dynamically move widgets down while active chat line
JNechaevsky Sep 12, 2022
5f5fb97
Roll back, shift coords only in HU_Ticker
JNechaevsky Sep 13, 2022
254e341
Corrections
JNechaevsky Sep 13, 2022
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
15 changes: 15 additions & 0 deletions src/doom/hu_stuff.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1058,6 +1058,20 @@ void HU_Ticker(void)
players[i].cmd.chatchar = 0;
}
}
// [crispy] shift widgets one line down so chat typing line may appear
if (crispy->automapstats != WIDGETS_STBAR)
{
const int chat_line = chat_on ? 8 : 0;

w_kills.y = HU_MSGY + 1 * 8 + chat_line;
w_items.y = HU_MSGY + 2 * 8 + chat_line;
w_scrts.y = HU_MSGY + 3 * 8 + chat_line;
// [crispy] do not shift level time widget if no stats widget is used
w_ltime.y = HU_MSGY + 4 * 8 + (crispy->automapstats ? chat_line : 0);
w_coordx.y = HU_MSGY + 1 * 8 + chat_line;
w_coordy.y = HU_MSGY + 2 * 8 + chat_line;
w_coorda.y = HU_MSGY + 3 * 8 + chat_line;
}
}

if (automapactive)
Expand Down Expand Up @@ -1096,6 +1110,7 @@ void HU_Ticker(void)
{
crispy_statsline_func_t crispy_statsline = crispy_statslines[crispy->statsformat];

if (crispy->automapstats == WIDGETS_STBAR)
w_kills.y = HU_MSGY + 1 * 8;

crispy_statsline(str, sizeof(str), kills, plr->killcount, totalkills, extrakills);
Expand Down