From 546efe17eae8032317f4fadd594de813e4711a2c Mon Sep 17 00:00:00 2001
From: FutureRave <edoardo.sanguineti222@gmail.com>
Date: Wed, 10 May 2023 10:44:17 +0100
Subject: [PATCH] fix: re-work ufo & noclip

---
 _utility.gsh | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/_utility.gsh b/_utility.gsh
index e1a1809..51e777e 100644
--- a/_utility.gsh
+++ b/_utility.gsh
@@ -73,18 +73,22 @@
 	#define FLOAT(num) getDvarFloat( TEMP_DVAR, 0.0 )
 #endif
 
-/* defined in common_scripts\iw4x_utility */
 #if defined(IW4MP)
-	#define NOCLIP(ent) noclip( ent )
-#else /* All clients should have it */
 	#define NOCLIP(ent) ent noclip()
+#else /* All clients should have it */
+	#define NOCLIP(ent) \
+		setDvar( "sv_cheats", 1 ); \
+		ent noclip(); \
+		setDvar( "sv_cheats", 0 );
 #endif
 
-/* defined in common_scripts\iw4x_utility */
 #if defined(IW4MP)
-	#define UFO(ent) ufo( ent )
-#else /* All clients should have it */
 	#define UFO(ent) ent ufo()
+#else /* All clients should have it. But require the following */
+	#define UFO(ent) \
+		setDvar( "sv_cheats", 1 ); \
+		ent ufo(); \
+		setDvar( "sv_cheats", 0 );
 #endif
 
 #define WAIT_CNT(ent) level waittill ( "connected", ent )