thirdpartymirrors/RingRacers
1
0
Fork 0
mirror of https://github.com/KartKrewDev/RingRacers.git synced 2025-10-30 08:01:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Adjust how properties are handled in G_PlayerReborn a little.

Browse source 
For consistency, all conditionals are done when data is being preserved in local variables, not on write back to player struct.
This commit is contained in:
toaster 2022-11-23 18:11:50 +00:00
parent c2183a626c
commit 86813b96a3
1 changed files with 19 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/g_game.c
View file

@ -2286,12 +2286,22 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
skincolor = players[player].skincolor; skincolor = players[player].skincolor;
skin = players[player].skin; skin = players[player].skin;
fakeskin = players[player].fakeskin;
lastfakeskin = players[player].lastfakeskin;
// SRB2kart if (betweenmaps)
kartspeed = players[player].kartspeed; {
kartweight = players[player].kartweight; fakeskin = MAXSKINS;
kartspeed = skins[players[player].skin].kartspeed;
kartweight = skins[players[player].skin].kartweight;
charflags = skins[players[player].skin].flags;
}
else
{
fakeskin = players[player].fakeskin;
kartspeed = players[player].kartspeed;
kartweight = players[player].kartweight;
charflags = players[player].charflags;
}
lastfakeskin = players[player].lastfakeskin;
followerready = players[player].followerready; followerready = players[player].followerready;
followercolor = players[player].followercolor; followercolor = players[player].followercolor;
@ -2299,8 +2309,6 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
availabilities = players[player].availabilities; availabilities = players[player].availabilities;
charflags = players[player].charflags;
followitem = players[player].followitem; followitem = players[player].followitem;
bot = players[player].bot; bot = players[player].bot;
@ -2417,10 +2425,13 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
// save player config truth reborn // save player config truth reborn
p->skincolor = skincolor; p->skincolor = skincolor;
p->skin = skin; p->skin = skin;
p->fakeskin = fakeskin;
p->kartspeed = kartspeed; p->kartspeed = kartspeed;
p->kartweight = kartweight; p->kartweight = kartweight;
//
p->charflags = charflags; p->charflags = charflags;
p->lastfakeskin = lastfakeskin;
p->availabilities = availabilities; p->availabilities = availabilities;
p->followitem = followitem; p->followitem = followitem;
@ -2441,19 +2452,6 @@ void G_PlayerReborn(INT32 player, boolean betweenmaps)
p->botvars.rival = botrival; p->botvars.rival = botrival;
p->xtralife = xtralife; p->xtralife = xtralife;
if (betweenmaps)
{
p->fakeskin = MAXSKINS;
p->kartspeed = skins[p->skin].kartspeed;
p->kartweight = skins[p->skin].kartweight;
}
else
{
p->fakeskin = fakeskin;
}
p->lastfakeskin = lastfakeskin;
// SRB2kart // SRB2kart
p->itemroulette = itemroulette; p->itemroulette = itemroulette;
p->roulettetype = roulettetype; p->roulettetype = roulettetype;