Merge branch 'Saturn-Next' into Saturn-Testing
This commit is contained in:
commit
ad74af426b
3 files changed
+12
-2
No files matched your search
+4
-1
@@ -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;
|
||||
}
|
||||
|
||||
@@ -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;
|
||||
|
||||
|
||||
+4
-1
@@ -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;
|
||||
|
||||
Reference in new issue
Block a user