Revert cleanup of havocbot_chooseenemy (gameplay change rejected)

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / weapon.qh

diff --git a/qcsrc/common/weapons/weapon.qh b/qcsrc/common/weapons/weapon.qh
index a08be2e61d5391c406668e6f5039146ba4748518..7b2f4b5b7a03b33073ecd0ba3c9d63e08dc1e6ce 100644 (file)
--- a/qcsrc/common/weapons/weapon.qh
+++ b/qcsrc/common/weapons/weapon.qh
@@ -130,11 +130,11 @@ CLASS(Weapon, Object)
        }
 ENDCLASS(Weapon)
 
-#include <common/items/all.qh>
+#include <common/items/_mod.qh>
 CLASS(WeaponPickup, Pickup)
     ATTRIB(WeaponPickup, m_weapon, Weapon);
     ATTRIB(WeaponPickup, m_name, string);
-#ifndef MENUQC
+#ifdef GAMEQC
     ATTRIB(WeaponPickup, m_sound, Sound, SND_WEAPONPICKUP);
 #endif
 #ifdef SVQC
@@ -146,7 +146,7 @@ CLASS(WeaponPickup, Pickup)
         CONSTRUCT(WeaponPickup);
         this.m_weapon = w;
         this.m_name = w.m_name;
-#ifndef MENUQC
+#ifdef GAMEQC
         this.m_model = w.m_model;
 #endif
 #ifdef SVQC
@@ -175,11 +175,6 @@ ENDCLASS(OffhandWeapon)
 
 const int MAX_SHOT_DISTANCE = 32768;
 
-// weapon pickup ratings for bot logic
-const int BOT_PICKUP_RATING_LOW  =  2500;
-const int BOT_PICKUP_RATING_MID  =  5000;
-const int BOT_PICKUP_RATING_HIGH = 10000;
-
 // weapon flags
 const int WEP_TYPE_OTHER          =  0x00; // not for damaging people
 const int WEP_TYPE_SPLASH         =  0x01; // splash damage