OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

- scriptified A_SelectWeapon and inlined the last remaining use of APlayerPawn::SelectWeapon.

Browse source
This commit is contained in:
Christoph Oelckers 2018-12-04 17:41:55 +01:00
commit 2459b27895
3 changed files with 8 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/fragglescript/t_func.cpp
View file

@ -49,6 +49,7 @@
#include "g_levellocals.h"
#include "actorinlines.h"
#include "scriptutil.h"
#include "vm.h"
static FRandom pr_script("FScript");
@ -2550,8 +2551,13 @@ void FParser::SF_PlayerWeapon()
if (players[playernum].PendingWeapon==wp) players[playernum].PendingWeapon=WP_NOCHANGE;
if (players[playernum].ReadyWeapon==wp)
{
players[playernum].ReadyWeapon=NULL;
players[playernum].mo->PickNewWeapon(NULL);
players[playernum].ReadyWeapon=nullptr;
IFVM(PlayerPawn, PickNewWeapon)
{
VMValue param[] = { players[playernum].mo, (void*)nullptr };
VMCall(func, param, 2, nullptr, 0);
}
}
}
}