Skip to content

Commit c6e0572

Browse files
committed
Move automap info to not overlap horde hud
1 parent baace24 commit c6e0572

File tree

1 file changed

+27
-3
lines changed

1 file changed

+27
-3
lines changed

client/src/am_map.cpp

+27-3
Original file line numberDiff line numberDiff line change
@@ -1842,9 +1842,17 @@ void AM_Drawer()
18421842
{
18431843
if (am_showmonsters)
18441844
{
1845-
StrFormat(line, TEXTCOLOR_RED "MONSTERS:" TEXTCOLOR_NORMAL " %d / %d",
1845+
if (G_IsHordeMode())
1846+
{
1847+
StrFormat(line, TEXTCOLOR_RED "MONSTERS:" TEXTCOLOR_NORMAL " %d",
1848+
level.killed_monsters);
1849+
}
1850+
else
1851+
{
1852+
StrFormat(line, TEXTCOLOR_RED "MONSTERS:" TEXTCOLOR_NORMAL " %d / %d",
18461853
level.killed_monsters,
18471854
(level.total_monsters + level.respawned_monsters));
1855+
}
18481856

18491857
int x, y;
18501858
const int text_width = V_StringWidth(line.c_str()) * CleanXfac;
@@ -1853,6 +1861,10 @@ void AM_Drawer()
18531861
{
18541862
x = surface_width - text_width;
18551863
y = OV_Y - (text_height * 4) + 1;
1864+
if (G_IsHordeMode())
1865+
{
1866+
y -= text_height * 2;
1867+
}
18561868
}
18571869
else
18581870
{
@@ -1863,7 +1875,7 @@ void AM_Drawer()
18631875
screen->DrawTextClean(CR_GREY, x, y, line.c_str());
18641876
}
18651877

1866-
if (am_showitems)
1878+
if (am_showitems && !G_IsHordeMode())
18671879
{
18681880
StrFormat(line, TEXTCOLOR_RED "ITEMS:" TEXTCOLOR_NORMAL " %d / %d",
18691881
level.found_items,
@@ -1886,7 +1898,7 @@ void AM_Drawer()
18861898
screen->DrawTextClean(CR_GREY, x, y, line.c_str());
18871899
}
18881900

1889-
if (am_showsecrets)
1901+
if (am_showsecrets && !G_IsHordeMode())
18901902
{
18911903
StrFormat(line, TEXTCOLOR_RED "SECRETS:" TEXTCOLOR_NORMAL " %d / %d",
18921904
level.found_secrets, level.total_secrets);
@@ -1940,6 +1952,10 @@ void AM_Drawer()
19401952
{
19411953
x = surface_width - text_width;
19421954
y = OV_Y - (text_height * 1) + 1;
1955+
if (G_IsHordeMode())
1956+
{
1957+
y -= text_height * 3;
1958+
}
19431959
}
19441960
else
19451961
{
@@ -1981,6 +1997,10 @@ void AM_Drawer()
19811997
{
19821998
x = surface_width - text_width;
19831999
y = OV_Y - (text_height * 1) + 1;
2000+
if (G_IsHordeMode())
2001+
{
2002+
y -= text_height * 3;
2003+
}
19842004
}
19852005
else
19862006
{
@@ -2009,6 +2029,10 @@ void AM_Drawer()
20092029
x = surface_width - text_width;
20102030
y = OV_Y - (text_height * 1) + 1;
20112031
}
2032+
if (G_IsHordeMode())
2033+
{
2034+
y -= text_height * 3;
2035+
}
20122036

20132037
screen->DrawTextClean(CR_GREY, x, y, line.c_str());
20142038
}

0 commit comments

Comments
 (0)