bailcharge player var

This commit is contained in:
Ashnal 2025-05-09 17:13:01 -04:00
parent b8a693be32
commit 3146110d08
5 changed files with 9 additions and 2 deletions

View file

@ -1081,6 +1081,7 @@ struct player_t
UINT16 progressivethrust; // When getting beat up in GTR_BUMPERS, speed up the longer you've been out of control.
UINT8 ringvisualwarning; // Check with > 1, not >= 1! Set when put in debt, counts down and holds at 1 when still in debt.
UINT32 bailcharge;
UINT32 baildrop;
boolean analoginput; // Has an input been recorded that requires analog usage? For input display.

View file

@ -284,6 +284,8 @@ static int player_get(lua_State *L)
lua_pushboolean(L, plr->progressivethrust);
else if (fastcmp(field,"ringvisualwarning"))
lua_pushboolean(L, plr->ringvisualwarning);
else if (fastcmp(field,"bailcharge"))
lua_pushboolean(L, plr->bailcharge);
else if (fastcmp(field,"baildrop"))
lua_pushboolean(L, plr->baildrop);
else if (fastcmp(field,"dotrickfx"))
@ -912,6 +914,8 @@ static int player_set(lua_State *L)
plr->progressivethrust = luaL_checkboolean(L, 3);
else if (fastcmp(field,"ringvisualwarning"))
plr->ringvisualwarning = luaL_checkboolean(L, 3);
else if (fastcmp(field,"bailcharge"))
plr->bailcharge = luaL_checkinteger(L, 3);
else if (fastcmp(field,"baildrop"))
plr->baildrop = luaL_checkinteger(L, 3);
else if (fastcmp(field,"analoginput"))

View file

@ -3503,7 +3503,7 @@ void A_AttractChase(mobj_t *actor)
if (actor->extravalue1 && actor->type != MT_EMERALD) // SRB2Kart
{
if (!actor->target || P_MobjWasRemoved(actor->target) || !actor->target->player || actor->target->player->baildrop)
if (!actor->target || P_MobjWasRemoved(actor->target) || !actor->target->player || actor->target->player->baildrop || actor->target->player->bailcharge)
{
P_RemoveMobj(actor);
return;

View file

@ -731,7 +731,7 @@ void P_TouchSpecialThing(mobj_t *special, mobj_t *toucher, boolean heightcheck)
if (player->instaWhipCharge)
return;
if (player->baildrop)
if (player->baildrop || player->bailcharge)
return;
// Don't immediately pick up spilled rings

View file

@ -667,6 +667,7 @@ static void P_NetArchivePlayers(savebuffer_t *save)
WRITEUINT16(save->p, players[i].progressivethrust);
WRITEUINT8(save->p, players[i].ringvisualwarning);
WRITEUINT32(save->p, players[i].bailcharge);
WRITEUINT32(save->p, players[i].baildrop);
WRITEUINT8(save->p, players[i].analoginput);
@ -1324,6 +1325,7 @@ static void P_NetUnArchivePlayers(savebuffer_t *save)
players[i].progressivethrust = READUINT16(save->p);
players[i].ringvisualwarning = READUINT8(save->p);
players[i].bailcharge = READUINT32(save->p);
players[i].baildrop = READUINT32(save->p);
players[i].analoginput = READUINT8(save->p);