- Exported PickNewWeapon function from PlayerPawn to ZScript.

ZDoom · Oct 13, 2018 · 6dc0268 · 6dc0268
1 parent ec7e855
commit 6dc0268
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/src/p_user.cpp b/src/p_user.cpp
@@ -1195,6 +1195,12 @@ AWeapon *APlayerPawn::PickNewWeapon(PClassActor *ammotype)
 	return best;
 }
 
+DEFINE_ACTION_FUNCTION(APlayerPawn, PickNewWeapon)
+{
+	PARAM_SELF_PROLOGUE(APlayerPawn);
+	PARAM_CLASS(ammo, AActor);
+	ACTION_RETURN_POINTER(self->PickNewWeapon(ammo));
+}
 //===========================================================================
 //
 // APlayerPawn :: GiveDeathmatchInventory

diff --git a/wadsrc/static/zscript/shared/player.txt b/wadsrc/static/zscript/shared/player.txt
@@ -1277,6 +1277,7 @@ class PlayerPawn : Actor native
 	native void CheckUse();
 	native void CheckWeaponButtons();
 	native Weapon BestWeapon(class<Ammo> ammotype);
+    native Weapon PickNewWeapon(class<Ammo> ammotype);
 
 }