diff --git a/src/d_main.c b/src/d_main.c index 9a99fabec..7e5843916 100644 --- a/src/d_main.c +++ b/src/d_main.c @@ -184,6 +184,9 @@ static void D_GamePadMenuScrollTicker(void) static SINT8 menuInputDelayTimer = 0; int key = 0; // butt-on output + if (dedicated) + return; + // wish i had a switch ono if (DPADUPSCROLL) key = KEY_UPARROW; @@ -215,7 +218,7 @@ static void D_DeviceLEDTick(void) UINT16 color[MAXSPLITSCREENPLAYERS]; UINT16 curcolor[MAXSPLITSCREENPLAYERS]; - if (I_NumJoys() == 0) + if (dedicated || I_NumJoys() == 0) { return; } diff --git a/src/p_mobj.c b/src/p_mobj.c index 0ace34b2c..3f90d8bb0 100644 --- a/src/p_mobj.c +++ b/src/p_mobj.c @@ -6038,6 +6038,10 @@ static void P_KoopaThinker(mobj_t *koopa) // void P_RollPitchMobj(mobj_t* mobj) { + // we dont need this in dedi do we? + if (rendermode == render_none) + return; + if (P_MobjWasRemoved(mobj)) return; diff --git a/src/p_tick.c b/src/p_tick.c index 401bed9e2..81897936e 100644 --- a/src/p_tick.c +++ b/src/p_tick.c @@ -373,7 +373,7 @@ static void P_DeviceRumbleTick(void) { UINT8 i; - if (I_NumJoys() == 0 || gamestate != GS_LEVEL) + if (dedicated || I_NumJoys() == 0 || gamestate != GS_LEVEL) { return; } @@ -521,6 +521,9 @@ static inline void P_ResetSpriteStuff(void) { thinker_t *th; + if (rendermode == render_none) + return; + for (th = thinkercap.next; th != &thinkercap; th = th->next) { mobj_t *mo;