Revert "Merge branch 'TimePath/bot_api' into 'master'\r"

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

diff --git a/qcsrc/server/defs.qh b/qcsrc/server/defs.qh
index a8c23b26edfaa72f50aaf2907a2e3995b3c06eb8..4a7edc2b94a782fb900fa7554760c522b171d8ed 100644 (file)
--- a/qcsrc/server/defs.qh
+++ b/qcsrc/server/defs.qh
@@ -261,7 +261,7 @@ WepSet weaponsInMap;
 
 float bot_waypoints_for_items;
 
-.float attack_finished_for[WEP_MAXCOUNT];
+.float attack_finished_for[Weapons_MAX];
 .float attack_finished_single;
 #ifdef INDEPENDENT_ATTACK_FINISHED
 #define ATTACK_FINISHED_FOR(ent,w) ((ent).(attack_finished_for[(w) - WEP_FIRST]))
@@ -302,8 +302,6 @@ float tracebox_hits_trigger_hurt(vector start, vector mi, vector ma, vector end)
 
 float next_pingtime;
 
-.float Version;
-
 // player sounds, voice messages
 // TODO implemented fall and falling
 #define ALLPLAYERSOUNDS \
@@ -348,6 +346,7 @@ ALLVOICEMSGS
 //             _VOICEMSG(droppedflag) \
 //             _VOICEMSG(negative) \
 //             _VOICEMSG(seenenemy) \
+//      /**/
 
 string globalsound_fall;
 string globalsound_metalfall;
@@ -466,7 +465,7 @@ float client_cefc_accumulator;
 float client_cefc_accumulatortime;
 #endif
 
-.float weapon_load[WEP_MAXCOUNT];
+.float weapon_load[Weapons_MAX];
 .int ammo_none; // used by the reloading system, must always be 0
 .float clip_load;
 .float old_clip_load;