iikorni/quakespasm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More conversion

Browse Source
This commit is contained in:
iikorni
2026-08-29 19:17:46 -05:00
parent 0404d430dc
commit 70e5c02355
72 changed files with 13308 additions and 14309 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Quake/sbar.cpp
+8 -8
View File
@@ -253,8 +253,8 @@ Sbar_Init -- johnfitz -- rewritten
*/
void Sbar_Init (void)
{
Cmd_AddCommand ("+showscores", Sbar_ShowScores);
Cmd_AddCommand ("-showscores", Sbar_DontShowScores);
command::add ("+showscores", Sbar_ShowScores);
command::add ("-showscores", Sbar_DontShowScores);
Sbar_LoadPics ();
}
@@ -388,7 +388,7 @@ void Sbar_DrawNum (int x, int y, int num, int digits, int color)
char *ptr;
int l, frame;
num = q_min(999,num); //johnfitz -- cap high values rather than truncating number
num = std::min(999,num); //johnfitz -- cap high values rather than truncating number
l = Sbar_itoa (num, str);
ptr = str;
@@ -640,7 +640,7 @@ void Sbar_DrawInventory (void)
for (i = 0; i < 4; i++)
{
val = cl.stats[STAT_SHELLS+i];
val = (val < 0)? 0 : q_min(999,val);//johnfitz -- cap displayed value to 999
val = (val < 0)? 0 : std::min(999,val);//johnfitz -- cap displayed value to 999
sprintf (num, "%3i", val);
if (num[0] != ' ')
Sbar_DrawCharacter ( (6*i+1)*8 + 2, -24, 18 + num[0] - '0');
@@ -754,7 +754,7 @@ void Sbar_DrawFrags (void)
Sbar_SortFrags ();
// draw the text
numscores = q_min(scoreboardlines, 4);
numscores = std::min(scoreboardlines, 4);
for (i = 0, x = 184; i<numscores; i++, x += 32)
{
@@ -1302,12 +1302,12 @@ void Sbar_IntermissionOverlay (void)
lsecrets = Sbar_IntermissionTextWidth (secrets, 0);
lmonsters = Sbar_IntermissionTextWidth (monsters, 0);
total = q_max (ltime, lsecrets);
total = q_max (lmonsters, total);
total = std::max (ltime, lsecrets);
total = std::max (lmonsters, total);
pic = Draw_CachePic ("gfx/inter.lmp");
total += pic->width + 24;
total = q_min (320, total);
total = std::min (320, total);
Draw_Pic (160 - total / 2, 56, pic);
pic = Draw_CachePic ("gfx/complete.lmp");