From 4cc7d95ba5f33c8fa357adda863d39aca8d93d4b Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 15 Nov 2016 16:05:42 +0100 Subject: [PATCH] - fixed: A_ZoomFactor and A_SetCrosshair need to be declared 'action'. --- src/g_shared/a_weapons.cpp | 4 ++-- wadsrc/static/zscript/shared/inventory.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/g_shared/a_weapons.cpp b/src/g_shared/a_weapons.cpp index 9063c6c2c..9fc2334c4 100644 --- a/src/g_shared/a_weapons.cpp +++ b/src/g_shared/a_weapons.cpp @@ -1925,7 +1925,7 @@ PClassWeapon *Net_ReadWeapon(BYTE **stream) DEFINE_ACTION_FUNCTION_PARAMS(AWeapon, A_ZoomFactor) { - PARAM_SELF_PROLOGUE(AActor); + PARAM_ACTION_PROLOGUE(AActor); PARAM_FLOAT_DEF(zoom); PARAM_INT_DEF(flags); @@ -1953,7 +1953,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AWeapon, A_ZoomFactor) DEFINE_ACTION_FUNCTION_PARAMS(AWeapon, A_SetCrosshair) { - PARAM_SELF_PROLOGUE(AActor); + PARAM_ACTION_PROLOGUE(AActor); PARAM_INT(xhair); if (self->player != NULL && self->player->ReadyWeapon != NULL) diff --git a/wadsrc/static/zscript/shared/inventory.txt b/wadsrc/static/zscript/shared/inventory.txt index 377463adc..12f30c484 100644 --- a/wadsrc/static/zscript/shared/inventory.txt +++ b/wadsrc/static/zscript/shared/inventory.txt @@ -473,11 +473,11 @@ class Weapon : StateProvider native Stop; } - native void A_ZoomFactor(float scale = 1, int flags = 0); + native action void A_ZoomFactor(float scale = 1, int flags = 0); + native action void A_SetCrosshair(int xhair); const ZOOM_INSTANT = 1; const ZOOM_NOSCALETURNING = 2; - native void A_SetCrosshair(int xhair); } class WeaponGiver : Weapon native