From df673ced42dcc8e92c7eba50bc6033e087185603 Mon Sep 17 00:00:00 2001 From: Marco Cawthorne Date: Thu, 22 Dec 2022 16:11:46 -0800 Subject: [PATCH] Change Trigger() methods to use triggermode_t --- src/server/entity_spritegod.qc | 4 ++-- src/server/player_giveitems.qc | 4 ++-- src/server/sphere_explosion.qc | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/server/entity_spritegod.qc b/src/server/entity_spritegod.qc index 0a7cce6..bf68102 100644 --- a/src/server/entity_spritegod.qc +++ b/src/server/entity_spritegod.qc @@ -50,7 +50,7 @@ entity_spritegod:NSPointTrigger virtual void(string, string) SpawnKey; virtual void(void) Respawn; virtual void(void) EmitSprite; - virtual void(entity, int) Trigger; + virtual void(entity, triggermode_t) Trigger; virtual void(void) StartTimer; virtual void(void) Spawned; }; @@ -62,7 +62,7 @@ entity_spritegod::StartTimer(void) } void -entity_spritegod::Trigger(entity eAct, int iState) +entity_spritegod::Trigger(entity eAct, triggermode_t iState) { switch (iState) { case TRIG_OFF: diff --git a/src/server/player_giveitems.qc b/src/server/player_giveitems.qc index 35fe722..c58ebce 100644 --- a/src/server/player_giveitems.qc +++ b/src/server/player_giveitems.qc @@ -38,11 +38,11 @@ player_giveitems:NSPointTrigger { void(void) player_giveitems; - virtual void(entity, int) Trigger; + virtual void(entity, triggermode_t) Trigger; }; void -player_giveitems::Trigger(entity eAct, int iState) +player_giveitems::Trigger(entity eAct, triggermode_t iState) { player pl = (player)eAct; diff --git a/src/server/sphere_explosion.qc b/src/server/sphere_explosion.qc index 8cc2187..6f99404 100644 --- a/src/server/sphere_explosion.qc +++ b/src/server/sphere_explosion.qc @@ -55,11 +55,11 @@ sphere_explosion:NSPointTrigger virtual void(void) Respawn; virtual void(string, string) SpawnKey; - virtual void(entity, int) Trigger; + virtual void(entity, triggermode_t) Trigger; }; void -sphere_explosion::Trigger(entity eAct, int iState) +sphere_explosion::Trigger(entity eAct, triggermode_t iState) { FX_Explosion(origin); }