diff --git a/src/d_player.h b/src/d_player.h index 3abcaa18b..e73ff2e12 100644 --- a/src/d_player.h +++ b/src/d_player.h @@ -1092,7 +1092,7 @@ struct player_t UINT32 bailcharge; UINT32 baildrop; - boolean bailquake; + boolean bailhitlag; boolean analoginput; // Has an input been recorded that requires analog usage? For input display. diff --git a/src/k_kart.c b/src/k_kart.c index 580f13d1c..338e01747 100644 --- a/src/k_kart.c +++ b/src/k_kart.c @@ -10132,10 +10132,10 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd) 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); - player->bailquake = false; + player->bailhitlag = false; } // 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; 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)) { diff --git a/src/lua_playerlib.c b/src/lua_playerlib.c index 91b4908aa..ea452a7ab 100644 --- a/src/lua_playerlib.c +++ b/src/lua_playerlib.c @@ -286,8 +286,8 @@ static int player_get(lua_State *L) lua_pushinteger(L, plr->bailcharge); else if (fastcmp(field,"baildrop")) lua_pushinteger(L, plr->baildrop); - else if (fastcmp(field,"bailquake")) - lua_pushboolean(L, plr->bailquake); + else if (fastcmp(field,"bailhitlag")) + lua_pushboolean(L, plr->bailhitlag); else if (fastcmp(field,"dotrickfx")) lua_pushboolean(L, plr->dotrickfx); else if (fastcmp(field,"stingfx")) @@ -927,8 +927,8 @@ static int player_set(lua_State *L) plr->bailcharge = luaL_checkinteger(L, 3); else if (fastcmp(field,"baildrop")) plr->baildrop = luaL_checkinteger(L, 3); - else if (fastcmp(field,"bailquake")) - plr->bailquake = luaL_checkboolean(L, 3); + else if (fastcmp(field,"bailhitlag")) + plr->bailhitlag = luaL_checkboolean(L, 3); else if (fastcmp(field,"analoginput")) plr->analoginput = luaL_checkboolean(L, 3); else if (fastcmp(field,"transfer")) diff --git a/src/p_saveg.cpp b/src/p_saveg.cpp index a8c1db997..45da46e47 100644 --- a/src/p_saveg.cpp +++ b/src/p_saveg.cpp @@ -683,7 +683,7 @@ static void P_NetArchivePlayers(savebuffer_t *save) WRITEUINT32(save->p, players[i].bailcharge); WRITEUINT32(save->p, players[i].baildrop); - WRITEUINT8(save->p, players[i].bailquake); + WRITEUINT8(save->p, players[i].bailhitlag); 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].baildrop = READUINT32(save->p); - players[i].bailquake = READUINT8(save->p); + players[i].bailhitlag = READUINT8(save->p); players[i].analoginput = READUINT8(save->p);