zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-14 00:20:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

SVN r524 (trunk)

Browse source
This commit is contained in:
Christoph Oelckers 2007-04-30 09:04:43 +00:00
parent 6fad457592
commit 5cd1922d26
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/g_shared/a_weapons.cpp
View file

@ -486,7 +486,7 @@ void AWeapon::EndPowerup ()
{ {
if (GetReadyState() != SisterWeapon->GetReadyState()) if (GetReadyState() != SisterWeapon->GetReadyState())
{ {
if (Owner->player->PendingWeapon != NULL) if (Owner->player->PendingWeapon == NULL)
Owner->player->PendingWeapon = SisterWeapon; Owner->player->PendingWeapon = SisterWeapon;
} }
else else

2
src/thingdef_codeptr.cpp
View file

@ -2021,7 +2021,7 @@ void A_Respawn (AActor *actor)
actor->renderflags &= ~RF_INVISIBLE; actor->renderflags &= ~RF_INVISIBLE;
int index=CheckIndex(1, NULL); int index=CheckIndex(1, NULL);
if (index<0 || EvalExpressionN (StateParameters[index+2], actor)) if (index<0 || EvalExpressionN (StateParameters[index], actor))
{ {
Spawn<ATeleportFog> (x, y, actor->z + TELEFOGHEIGHT, ALLOW_REPLACE); Spawn<ATeleportFog> (x, y, actor->z + TELEFOGHEIGHT, ALLOW_REPLACE);
} }