mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2025-12-23 16:32:36 +00:00
Fix no control toggle
This commit is contained in:
parent
16e6aa423e
commit
ffda097421
4 changed files with 3 additions and 6 deletions
|
|
@ -8250,7 +8250,6 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if (player->stealingtimer == 0
|
if (player->stealingtimer == 0
|
||||||
&& player->rocketsneakertimer
|
&& player->rocketsneakertimer
|
||||||
&& onground == true)
|
&& onground == true)
|
||||||
|
|
|
||||||
|
|
@ -5844,7 +5844,7 @@ static void P_ConvertBinaryLinedefTypes(void)
|
||||||
lines[i].args[1] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS;
|
lines[i].args[1] = sides[lines[i].sidenum[0]].rowoffset >> FRACBITS;
|
||||||
break;
|
break;
|
||||||
case 437: //Disable player control
|
case 437: //Disable player control
|
||||||
lines[i].args[0] = sides[lines[i].sidenum[0]].textureoffset >> FRACBITS;
|
lines[i].args[0] = ((sides[lines[i].sidenum[0]].textureoffset >> FRACBITS) != 0);
|
||||||
break;
|
break;
|
||||||
case 438: //Change object size
|
case 438: //Change object size
|
||||||
lines[i].args[0] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS;
|
lines[i].args[0] = P_AproxDistance(lines[i].dx, lines[i].dy) >> FRACBITS;
|
||||||
|
|
|
||||||
|
|
@ -3369,7 +3369,7 @@ boolean P_ProcessSpecial(activator_t *activator, INT16 special, INT32 *args, cha
|
||||||
case 437: // Toggle Player Controls
|
case 437: // Toggle Player Controls
|
||||||
if (mo && mo->player)
|
if (mo && mo->player)
|
||||||
{
|
{
|
||||||
mo->player->nocontrol = ((args[0] != 0) ? UINT16_MAX : 0);
|
mo->player->nocontrol = ((args[0] == 0) ? UINT16_MAX : 0);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -4349,8 +4349,6 @@ void P_PlayerThink(player_t *player)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
|
||||||
player->nocontrol = 0;
|
|
||||||
|
|
||||||
// Flash player after being hit.
|
// Flash player after being hit.
|
||||||
if (!(player->hyudorotimer // SRB2kart - fixes Hyudoro not flashing when it should.
|
if (!(player->hyudorotimer // SRB2kart - fixes Hyudoro not flashing when it should.
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue