consolidate those
This commit is contained in:
1 parent
288bcbd419
commit
fe6b5a83f8
2 files changed
+3
-16
No files matched your search
+1
-4
@@ -224,10 +224,7 @@ static void D_DeviceLEDTick(void)
|
||||
|
||||
for (i = 0; i <= splitscreen; i++)
|
||||
{
|
||||
if (!cv_usejoystick[i].value)
|
||||
continue;
|
||||
|
||||
if (!cv_gamepadled[i].value)
|
||||
if (!cv_usejoystick[i].value || !cv_gamepadled[i].value)
|
||||
continue;
|
||||
|
||||
color[i] = G_GetSkinColor(i);
|
||||
|
||||
+2
-12
@@ -383,19 +383,14 @@ static void P_DeviceRumbleTick(void)
|
||||
UINT16 low = 0;
|
||||
UINT16 high = 0;
|
||||
|
||||
if (!cv_usejoystick[i].value)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (!cv_rumble[i].value)
|
||||
if (!cv_usejoystick[i].value || !cv_rumble[i].value)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
player_t *player = ((i == 0) ? &players[consoleplayer] : &players[displayplayers[i]]);
|
||||
|
||||
if (player->spectator)
|
||||
if (player->spectator || !player->mo)
|
||||
{
|
||||
continue;
|
||||
}
|
||||
@@ -405,11 +400,6 @@ static void P_DeviceRumbleTick(void)
|
||||
continue;
|
||||
}
|
||||
|
||||
if (P_MobjWasRemoved(player->mo))
|
||||
{
|
||||
continue;
|
||||
}
|
||||
|
||||
if (player->exiting)
|
||||
{
|
||||
G_PlayerDeviceRumble(i, low, high, 0);
|
||||
|
||||
Reference in new issue
Block a user