mirror of
https://github.com/KartKrewDev/RingRacers.git
synced 2026-04-28 04:51:42 +00:00
bailquake rename to bailhitlag
This commit is contained in:
parent
df9d4cf177
commit
5e4bd6adbb
4 changed files with 10 additions and 10 deletions
|
|
@ -1092,7 +1092,7 @@ struct player_t
|
||||||
|
|
||||||
UINT32 bailcharge;
|
UINT32 bailcharge;
|
||||||
UINT32 baildrop;
|
UINT32 baildrop;
|
||||||
boolean bailquake;
|
boolean bailhitlag;
|
||||||
|
|
||||||
boolean analoginput; // Has an input been recorded that requires analog usage? For input display.
|
boolean analoginput; // Has an input been recorded that requires analog usage? For input display.
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -10132,10 +10132,10 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
|
||||||
player->ringboost /= 3;
|
player->ringboost /= 3;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (player->bailquake && !player->mo->hitlag) // quake as soon as we leave hitlag
|
if (player->bailhitlag && !player->mo->hitlag) // quake as soon as we leave hitlag
|
||||||
{
|
{
|
||||||
P_StartQuakeFromMobj(7, 50 * player->mo->scale, 2048 * player->mo->scale, player->mo);
|
P_StartQuakeFromMobj(7, 50 * player->mo->scale, 2048 * player->mo->scale, player->mo);
|
||||||
player->bailquake = false;
|
player->bailhitlag = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
// The precise ordering of start-of-level made me want to cut my head off,
|
// The precise ordering of start-of-level made me want to cut my head off,
|
||||||
|
|
@ -14200,7 +14200,7 @@ void K_MoveKartPlayer(player_t *player, boolean onground)
|
||||||
player->baildrop += baildrop * BAIL_DROPFREQUENCY + 1;
|
player->baildrop += baildrop * BAIL_DROPFREQUENCY + 1;
|
||||||
|
|
||||||
K_AddHitLag(player->mo, TICRATE/4, false);
|
K_AddHitLag(player->mo, TICRATE/4, false);
|
||||||
player->bailquake = true; // set for a one time quake effect as soon as hitlag ends
|
player->bailhitlag = true; // set for a one time quake effect as soon as hitlag ends
|
||||||
|
|
||||||
if (P_PlayerInPain(player))
|
if (P_PlayerInPain(player))
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -286,8 +286,8 @@ static int player_get(lua_State *L)
|
||||||
lua_pushinteger(L, plr->bailcharge);
|
lua_pushinteger(L, plr->bailcharge);
|
||||||
else if (fastcmp(field,"baildrop"))
|
else if (fastcmp(field,"baildrop"))
|
||||||
lua_pushinteger(L, plr->baildrop);
|
lua_pushinteger(L, plr->baildrop);
|
||||||
else if (fastcmp(field,"bailquake"))
|
else if (fastcmp(field,"bailhitlag"))
|
||||||
lua_pushboolean(L, plr->bailquake);
|
lua_pushboolean(L, plr->bailhitlag);
|
||||||
else if (fastcmp(field,"dotrickfx"))
|
else if (fastcmp(field,"dotrickfx"))
|
||||||
lua_pushboolean(L, plr->dotrickfx);
|
lua_pushboolean(L, plr->dotrickfx);
|
||||||
else if (fastcmp(field,"stingfx"))
|
else if (fastcmp(field,"stingfx"))
|
||||||
|
|
@ -927,8 +927,8 @@ static int player_set(lua_State *L)
|
||||||
plr->bailcharge = luaL_checkinteger(L, 3);
|
plr->bailcharge = luaL_checkinteger(L, 3);
|
||||||
else if (fastcmp(field,"baildrop"))
|
else if (fastcmp(field,"baildrop"))
|
||||||
plr->baildrop = luaL_checkinteger(L, 3);
|
plr->baildrop = luaL_checkinteger(L, 3);
|
||||||
else if (fastcmp(field,"bailquake"))
|
else if (fastcmp(field,"bailhitlag"))
|
||||||
plr->bailquake = luaL_checkboolean(L, 3);
|
plr->bailhitlag = luaL_checkboolean(L, 3);
|
||||||
else if (fastcmp(field,"analoginput"))
|
else if (fastcmp(field,"analoginput"))
|
||||||
plr->analoginput = luaL_checkboolean(L, 3);
|
plr->analoginput = luaL_checkboolean(L, 3);
|
||||||
else if (fastcmp(field,"transfer"))
|
else if (fastcmp(field,"transfer"))
|
||||||
|
|
|
||||||
|
|
@ -683,7 +683,7 @@ static void P_NetArchivePlayers(savebuffer_t *save)
|
||||||
|
|
||||||
WRITEUINT32(save->p, players[i].bailcharge);
|
WRITEUINT32(save->p, players[i].bailcharge);
|
||||||
WRITEUINT32(save->p, players[i].baildrop);
|
WRITEUINT32(save->p, players[i].baildrop);
|
||||||
WRITEUINT8(save->p, players[i].bailquake);
|
WRITEUINT8(save->p, players[i].bailhitlag);
|
||||||
|
|
||||||
WRITEUINT8(save->p, players[i].analoginput);
|
WRITEUINT8(save->p, players[i].analoginput);
|
||||||
|
|
||||||
|
|
@ -1348,7 +1348,7 @@ static void P_NetUnArchivePlayers(savebuffer_t *save)
|
||||||
|
|
||||||
players[i].bailcharge = READUINT32(save->p);
|
players[i].bailcharge = READUINT32(save->p);
|
||||||
players[i].baildrop = READUINT32(save->p);
|
players[i].baildrop = READUINT32(save->p);
|
||||||
players[i].bailquake = READUINT8(save->p);
|
players[i].bailhitlag = READUINT8(save->p);
|
||||||
|
|
||||||
players[i].analoginput = READUINT8(save->p);
|
players[i].analoginput = READUINT8(save->p);
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue