stjr/SRB2
0
0
Fork 0
mirror of https://git.do.srb2.org/STJr/SRB2.git synced 2025-01-30 21:20:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'nightsplus-laplogic' into nightsplus-le

Browse source 
# Conflicts:
#	src/p_map.c
This commit is contained in:
mazmazz 2018-04-02 09:21:55 -04:00
commit 37eeb5d25c
2 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_game.c
View file

@ -2230,6 +2230,8 @@ void G_PlayerReborn(INT32 player)
if (p->mare == 255) if (p->mare == 255)
p->mare = 0; p->mare = 0;
p->marelap = p->marebonuslap = 0;
// Check to make sure their color didn't change somehow... // Check to make sure their color didn't change somehow...
if (G_GametypeHasTeams()) if (G_GametypeHasTeams())
{ {

2
src/p_user.c
View file

@ -588,6 +588,8 @@ static void P_DeNightserizePlayer(player_t *player)
player->climbing = 0; player->climbing = 0;
player->mo->fuse = 0; player->mo->fuse = 0;
player->speed = 0; player->speed = 0;
player->marelap = 0;
player->marebonuslap = 0;
P_SetTarget(&player->mo->target, NULL); P_SetTarget(&player->mo->target, NULL);
P_SetTarget(&player->axis1, P_SetTarget(&player->axis2, NULL)); P_SetTarget(&player->axis1, P_SetTarget(&player->axis2, NULL));