OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

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

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

2
src/playsim/fragglescript/t_func.cpp
View file

@ -2523,7 +2523,7 @@ void FParser::SF_PlayerWeapon()
{
wp->Destroy();
// If the weapon is active pick a replacement. Legacy didn't do this!
if (Level->Players[playernum]->PendingWeapon==wp) Level->Players[playernum]->PendingWeapon=WP_NOCHANGE;
if (Level->Players[playernum]->PendingWeapon==wp) Level->Players[playernum]->PendingWeapon=(AActor*)WP_NOCHANGE;
if (Level->Players[playernum]->ReadyWeapon==wp)
{
Level->Players[playernum]->ReadyWeapon=nullptr;