lifning
/
SRB2
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Revert "Checkpoint (unfinished): player->totalsphere" 

This reverts commit 6a0175147f
This commit is contained in:
Digiku 2018-08-17 09:09:10 -04:00
parent 6a0175147f
commit 792360ea97
3 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/g_game.c
View File

@ -2075,7 +2075,6 @@ void G_PlayerReborn(INT32 player)
INT32 exiting;
INT16 numboxes;
INT16 totalring;
INT16 totalsphere;
UINT8 laps;
UINT8 mare;
UINT8 skincolor;
@ -2104,7 +2103,6 @@ void G_PlayerReborn(INT32 player)
numboxes = players[player].numboxes;
laps = players[player].laps;
totalring = players[player].totalring;
totalsphere = players[player].totalsphere;
skincolor = players[player].skincolor;
skin = players[player].skin;
@ -2189,7 +2187,6 @@ void G_PlayerReborn(INT32 player)
p->numboxes = numboxes;
p->laps = laps;
p->totalring = totalring;
p->totalsphere = totalsphere;
p->mare = mare;
if (bot)

3
src/m_cheat.c
View File

@ -892,8 +892,7 @@ void Command_Setrings_f(void)
{
players[consoleplayer].spheres = 0;
P_GivePlayerSpheres(&player[consoleplayer], atoi(COM_Argv(1)));
if (!G_IsSpecialStage(gamemap))
players[consoleplayer].totalsphere -= atoi(COM_Argv(1)); //undo totalsphere addition done in P_GivePlayerRings
// no totalsphere addition to revert
}
G_SetGameModified(multiplayer);

2
src/p_user.c
View File

@ -963,8 +963,6 @@ void P_GivePlayerSpheres(player_t *player, INT32 num_spheres)
player->spheres += num_spheres;
player->totalsphere += num_spheres;
// Can only get up to 9999 spheres, sorry!
if (player->spheres > 9999)
player->spheres = 9999;