- moved around some pieces of code to make sharing with Raze easier.

This commit is contained in:
Christoph Oelckers 2020-04-11 19:22:16 +02:00
commit cf51508ce6
21 changed files with 96 additions and 74 deletions

View file

@ -996,7 +996,7 @@ void P_SetupPsprites(player_t *player, bool startweaponup)
player->DestroyPSprites();
// Spawn the ready weapon
player->PendingWeapon = !startweaponup ? player->ReadyWeapon : WP_NOCHANGE;
player->PendingWeapon = !startweaponup ? player->ReadyWeapon : (AActor*)WP_NOCHANGE;
P_BringUpWeapon (player);
}