mirror of
https://github.com/ZDoom/qzdoom.git
synced 2024-11-10 23:02:08 +00:00
- reverted r2783 because it was causing problems.
SVN r2792 (trunk)
This commit is contained in:
parent
c948fd08f2
commit
3662bf8a15
3 changed files with 2 additions and 14 deletions
|
@ -1345,10 +1345,7 @@ void G_PlayerReborn (int player)
|
|||
if (gamestate != GS_TITLELEVEL)
|
||||
{
|
||||
actor->GiveDefaultInventory ();
|
||||
|
||||
// [Spleen] ReadyWeapon will be set when P_MovePsprites calls P_BringUpWeapon
|
||||
p->ReadyWeapon = NULL;
|
||||
//p->ReadyWeapon = p->PendingWeapon;
|
||||
p->ReadyWeapon = p->PendingWeapon;
|
||||
}
|
||||
|
||||
//Added by MC: Init bot structure.
|
||||
|
|
|
@ -794,15 +794,9 @@ void P_SetupPsprites(player_t *player)
|
|||
{
|
||||
player->psprites[i].state = NULL;
|
||||
}
|
||||
|
||||
|
||||
// [Spleen] Let P_MovePsprites handle calling P_BringUpWeapon,
|
||||
// instead of P_SetupPsprites, to avoid raising it twice in one tic.
|
||||
/*
|
||||
// Spawn the ready weapon
|
||||
player->PendingWeapon = player->ReadyWeapon;
|
||||
P_BringUpWeapon (player);
|
||||
*/
|
||||
}
|
||||
|
||||
//------------------------------------------------------------------------
|
||||
|
|
|
@ -1103,10 +1103,7 @@ void APlayerPawn::GiveDefaultInventory ()
|
|||
if (item != NULL && item->IsKindOf (RUNTIME_CLASS (AWeapon)) &&
|
||||
static_cast<AWeapon*>(item)->CheckAmmo(AWeapon::EitherFire, false))
|
||||
{
|
||||
// [Spleen] ReadyWeapon will be set when P_MovePsprites calls P_BringUpWeapon
|
||||
player->PendingWeapon = static_cast<AWeapon *> (item);
|
||||
player->ReadyWeapon = NULL;
|
||||
//player->ReadyWeapon = player->PendingWeapon = static_cast<AWeapon *> (item);
|
||||
player->ReadyWeapon = player->PendingWeapon = static_cast<AWeapon *> (item);
|
||||
}
|
||||
}
|
||||
di = di->Next;
|
||||
|
|
Loading…
Reference in a new issue