Merge branch 'martin-t/cvar-prefixes' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / g_hook.qh

diff --git a/qcsrc/server/g_hook.qh b/qcsrc/server/g_hook.qh
index 1ebbb9b8f1984037c5c2acda9c9b4efdb3357c3b..c0df31662a7d5cea6c95584dd7a13bfd7d969dad 100644 (file)
--- a/qcsrc/server/g_hook.qh
+++ b/qcsrc/server/g_hook.qh
@@ -1,17 +1,19 @@
+#pragma once
+
 // Wazat's grappling hook
 .entity                hook;
-void GrapplingHookFrame();
-void RemoveGrapplingHook(entity pl);
-void SetGrappleHookBindings();
+void GrapplingHookThink(entity this);
+void RemoveGrapplingHooks(entity pl);
+void RemoveHook(entity this);
 // (note: you can change the hook impulse #'s to whatever you please)
 .float hook_time;
 
-float HOOK_FIRING = 1;
-float HOOK_REMOVING = 2;
-float HOOK_PULLING = 4;
-float HOOK_RELEASING = 8;
-float HOOK_WAITING_FOR_RELEASE = 16;
+const float HOOK_FIRING = BIT(0);
+const float HOOK_REMOVING = BIT(1);
+const float HOOK_PULLING = BIT(2);
+const float HOOK_RELEASING = BIT(3);
+const float HOOK_WAITING_FOR_RELEASE = BIT(4);
 .float hook_state;
 
 void GrappleHookInit();
-vector hook_shotorigin;
+vector hook_shotorigin[4];