thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2026-02-15 01:56:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Transfer polish

Browse source
This commit is contained in:
Antonio Martinez 2024-09-15 21:23:40 -07:00
parent d4c0603808
commit ba22dabfe2
4 changed files with 16 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/d_player.h
View file

@ -1054,6 +1054,7 @@ struct player_t
fixed_t outrun; // Milky Way road effect
fixed_t transfer; // Tired of Ramp Park fastfalls
boolean transfersound;
uint8_t public_key[PUBKEYLENGTH];

28
src/k_kart.c
View file

@ -9043,8 +9043,11 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
if (player->itemtype == KITEM_NONE)
player->itemflags &= ~IF_HOLDREADY;
if (onground)
if (onground || player->transfer < 10*player->mo->scale)
{
player->transfer = 0;
player->transfersound = false;
}
if (player->transfer)
{
@ -9059,11 +9062,13 @@ void K_KartPlayerThink(player_t *player, ticcmd_t *cmd)
if ((player->mo->momz > 0) == (transferclamp > 0))
{
if (!S_SoundPlaying(player->mo, sfx_ggfall))
S_StartSound(player->mo, sfx_ggfall);
fuckfactor = FRACUNIT/2;
}
else if (!player->transfersound)
{
S_StartSound(player->mo, sfx_ggfall);
player->transfersound = true;
}
fixed_t sx, sy;
sx = P_RandomRange(PR_DECORATION, -48, 48)*FRACUNIT;
@ -10181,21 +10186,6 @@ void K_KartResetPlayerColor(player_t *player)
goto finalise;
}
if (player->transfer && (leveltime & 1))
{
player->mo->colorized = true;
fullbright = true;
player->mo->color = player->skincolor;
goto finalise;
}
else if (player->transfer)
{
player->mo->colorized = true;
fullbright = true;
player->mo->color = SKINCOLOR_WHITE;
goto finalise;
}
if (player->ringboost && (leveltime & 1)) // ring boosting
{
player->mo->colorized = true;

4
src/lua_playerlib.c
View file

@ -264,6 +264,8 @@ static int player_get(lua_State *L)
lua_pushboolean(L, plr->analoginput);
else if (fastcmp(field,"transfer"))
lua_pushboolean(L, plr->transfer);
else if (fastcmp(field,"transfersound"))
lua_pushboolean(L, plr->transfersound);
else if (fastcmp(field,"markedfordeath"))
lua_pushboolean(L, plr->markedfordeath);
else if (fastcmp(field,"incontrol"))
@ -860,6 +862,8 @@ static int player_set(lua_State *L)
plr->analoginput = luaL_checkboolean(L, 3);
else if (fastcmp(field,"transfer"))
plr->transfer = luaL_checkboolean(L, 3);
else if (fastcmp(field,"transfersound"))
plr->transfersound = luaL_checkboolean(L, 3);
else if (fastcmp(field,"markedfordeath"))
plr->markedfordeath = luaL_checkboolean(L, 3);
else if (fastcmp(field,"dotrickfx"))

2
src/p_saveg.c
View file

@ -656,6 +656,7 @@ static void P_NetArchivePlayers(savebuffer_t *save)
WRITEFIXED(save->p, players[i].outrun);
WRITEFIXED(save->p, players[i].transfer);
WRITEUINT8(save->p, players[i].transfersound);
WRITEUINT8(save->p, players[i].rideroid);
WRITEUINT8(save->p, players[i].rdnodepull);
@ -1281,6 +1282,7 @@ static void P_NetUnArchivePlayers(savebuffer_t *save)
players[i].outrun = READFIXED(save->p);
players[i].transfer = READFIXED(save->p);
players[i].transfersound = READUINT8(save->p);
players[i].rideroid = (boolean)READUINT8(save->p);
players[i].rdnodepull = (boolean)READUINT8(save->p);