Compilation errors from corrupted cherry-pick/porting

This commit is contained in:
toaster 2022-11-03 14:32:40 +00:00
parent c5a3d362a1
commit e7c700a64f
3 changed files with 3 additions and 1 deletions

View file

@ -3907,6 +3907,7 @@ static void M_DrawReplayHutReplayInfo(menudemo_t *demoref)
V_DrawThinString(x+32, y+39, V_SNAPTOTOP, "NO CONTEST"); V_DrawThinString(x+32, y+39, V_SNAPTOTOP, "NO CONTEST");
} }
else if (demoref->gametype == GT_RACE) else if (demoref->gametype == GT_RACE)
{
V_DrawRightAlignedString(x+84, y+40, V_SNAPTOTOP, va("%d'%02d\"%02d", V_DrawRightAlignedString(x+84, y+40, V_SNAPTOTOP, va("%d'%02d\"%02d",
G_TicsToMinutes(demoref->standings[0].timeorscore, true), G_TicsToMinutes(demoref->standings[0].timeorscore, true),
G_TicsToSeconds(demoref->standings[0].timeorscore), G_TicsToSeconds(demoref->standings[0].timeorscore),

View file

@ -3343,7 +3343,7 @@ static thinker_t* LoadMobjThinker(actionf_p1 thinker)
if (mobj->type == MT_SKYBOX) if (mobj->type == MT_SKYBOX)
{ {
mtag_t = mobj->movedir; mtag_t tag = mobj->movedir;
if (tag < 0 || tag > 15) if (tag < 0 || tag > 15)
{ {
CONS_Debug(DBG_GAMELOGIC, "LoadMobjThinker: Skybox ID %d of netloaded object is not between 0 and 15!\n", tag); CONS_Debug(DBG_GAMELOGIC, "LoadMobjThinker: Skybox ID %d of netloaded object is not between 0 and 15!\n", tag);

View file

@ -17,6 +17,7 @@
#include "r_state.h" #include "r_state.h"
#include "s_sound.h" #include "s_sound.h"
#include "r_main.h" #include "r_main.h"
#include "r_fps.h"
/** \brief The P_MixUp function /** \brief The P_MixUp function