OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- fixed: CHANGELEVEL_RESETINVENTORY may not change the player's health.

Browse source 
APlayerPawn::GiveDefaultInventory altered the player_t's health value which was ok as long as this function was only called from G_PlayerReborn. For all other cases this initialization was wrong and G_PlayerReborn should do this itself.
This commit is contained in:
Christoph Oelckers 2014-10-25 11:51:29 +02:00
commit fc40e9723a
3 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/g_game.cpp
View file

@ -1363,6 +1363,7 @@ void G_PlayerReborn (int player)
::new(p) player_t;
memcpy (p->frags, frags, sizeof(p->frags));
p->health = actor->health;
p->fragcount = fragcount;
p->killcount = killcount;
p->itemcount = itemcount;
@ -1381,6 +1382,8 @@ void G_PlayerReborn (int player)
if (gamestate != GS_TITLELEVEL)
{
// [GRB] Give inventory specified in DECORATE
actor->GiveDefaultInventory ();
p->ReadyWeapon = p->PendingWeapon;
}