Merge branch 'master' into Mario/stats_eloranking

[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 aa641a56bc84bc927299e4715f2c456fbd05e205..1ed78e2745d9d4a4cdfff18792f9399af50fb7e6 100644 (file)
--- a/qcsrc/server/g_hook.qh
+++ b/qcsrc/server/g_hook.qh
@@ -1,21 +1,23 @@
-#ifndef HOOK_H
-#define HOOK_H
+#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;
 
-const float HOOK_FIRING = 1;
-const float HOOK_REMOVING = 2;
-const float HOOK_PULLING = 4;
-const float HOOK_RELEASING = 8;
-const float HOOK_WAITING_FOR_RELEASE = 16;
+.float hook_length;
+
+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;
+.int state;
 
 void GrappleHookInit();
 vector hook_shotorigin[4];
-#endif
+