Merge branch 'master' into terencehill/bot_fixes

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

diff --git a/qcsrc/server/mutators/gamemode_assault.qh b/qcsrc/server/mutators/gamemode_assault.qh
index 6f306ae383781c212b3e45649d938f884e65c396..1266492ca091e4b99a05f3cc89ffa13822e853a5 100644 (file)
--- a/qcsrc/server/mutators/gamemode_assault.qh
+++ b/qcsrc/server/mutators/gamemode_assault.qh
@@ -5,11 +5,11 @@
 .entity assault_sprite;
 
 // legacy bot defs
-const float HAVOCBOT_AST_ROLE_NONE = 0;
-const float HAVOCBOT_AST_ROLE_DEFENSE = 2;
-const float HAVOCBOT_AST_ROLE_OFFENSE = 4;
+const int HAVOCBOT_AST_ROLE_NONE = 0;
+const int HAVOCBOT_AST_ROLE_DEFENSE = 2;
+const int HAVOCBOT_AST_ROLE_OFFENSE = 4;
 
-.float havocbot_role_flags;
+.int havocbot_role_flags;
 .float havocbot_attack_time;
 
 .void() havocbot_role;
@@ -29,6 +29,5 @@ const float ST_ASSAULT_OBJECTIVES = 1;
 const float SP_ASSAULT_OBJECTIVES = 4;
 
 // predefined spawnfuncs
-void spawnfunc_func_breakable();
 void target_objective_decrease_activate();
-#endif
\ No newline at end of file
+#endif