zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-11 15:21:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: A_ZoomFactor and A_SetCrosshair need to be declared 'action'.

Browse source
This commit is contained in:
Christoph Oelckers 2016-11-15 16:05:42 +01:00
parent e559109419
commit 4cc7d95ba5
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/g_shared/a_weapons.cpp
View file

@ -1925,7 +1925,7 @@ PClassWeapon *Net_ReadWeapon(BYTE **stream)
DEFINE_ACTION_FUNCTION_PARAMS(AWeapon, A_ZoomFactor) DEFINE_ACTION_FUNCTION_PARAMS(AWeapon, A_ZoomFactor)
{ {
PARAM_SELF_PROLOGUE(AActor); PARAM_ACTION_PROLOGUE(AActor);
PARAM_FLOAT_DEF(zoom); PARAM_FLOAT_DEF(zoom);
PARAM_INT_DEF(flags); PARAM_INT_DEF(flags);
@ -1953,7 +1953,7 @@ DEFINE_ACTION_FUNCTION_PARAMS(AWeapon, A_ZoomFactor)
DEFINE_ACTION_FUNCTION_PARAMS(AWeapon, A_SetCrosshair) DEFINE_ACTION_FUNCTION_PARAMS(AWeapon, A_SetCrosshair)
{ {
PARAM_SELF_PROLOGUE(AActor); PARAM_ACTION_PROLOGUE(AActor);
PARAM_INT(xhair); PARAM_INT(xhair);
if (self->player != NULL && self->player->ReadyWeapon != NULL) if (self->player != NULL && self->player->ReadyWeapon != NULL)

4
wadsrc/static/zscript/shared/inventory.txt
View file

@ -473,11 +473,11 @@ class Weapon : StateProvider native
Stop; 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_INSTANT = 1;
const ZOOM_NOSCALETURNING = 2; const ZOOM_NOSCALETURNING = 2;
native void A_SetCrosshair(int xhair);
} }
class WeaponGiver : Weapon native class WeaponGiver : Weapon native