Merge branch 'master' into terencehill/menu_optimization

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / all.qc

diff --git a/qcsrc/common/weapons/all.qc b/qcsrc/common/weapons/all.qc
index 7d107fd61d5a34d345541cb1697e12dd0e3ca30d..5149c8d4255087304ea127e31bfd47c45edfea45 100644 (file)
--- a/qcsrc/common/weapons/all.qc
+++ b/qcsrc/common/weapons/all.qc
@@ -14,7 +14,7 @@
        #include "../../client/autocvars.qh"
        #include "../deathtypes/all.qh"
        #include "../../lib/csqcmodel/interpolate.qh"
-       #include "../movetypes/movetypes.qh"
+       #include "../physics/movetypes/movetypes.qh"
        #include "../../client/main.qh"
        #include "../../lib/csqcmodel/cl_model.qh"
 #elif defined(MENUQC)
@@ -47,6 +47,9 @@
 #ifndef MENUQC
        #include "calculations.qc"
 #endif
+#ifdef SVQC
+       #include "config.qc"
+#endif
 #define IMPLEMENTATION
 #include "all.inc"
 #undef IMPLEMENTATION
@@ -191,7 +194,7 @@ string W_FixWeaponOrder_ForceComplete(string order)
 
 void W_RandomWeapons(entity e, float n)
 {
-       int i, j;
+       int i;
        WepSet remaining;
        WepSet result;
        remaining = e.weapons;
@@ -199,9 +202,11 @@ void W_RandomWeapons(entity e, float n)
        for (i = 0; i < n; ++i)
        {
                RandomSelection_Init();
-               for (j = WEP_FIRST; j <= WEP_LAST; ++j)
-                       if (remaining & WepSet_FromWeapon(Weapons_from(j))) RandomSelection_Add(NULL, j, string_null, 1, 1);
-               Weapon w = Weapons_from(RandomSelection_chosen_float);
+               FOREACH(Weapons, it != WEP_Null, LAMBDA(
+                       if (remaining & (it.m_wepset))
+                               RandomSelection_Add(it, 0, string_null, 1, 1);
+               ));
+               Weapon w = RandomSelection_chosen_ent;
                result |= WepSet_FromWeapon(w);
                remaining &= ~WepSet_FromWeapon(w);
        }
@@ -588,6 +593,60 @@ void wframe_send(entity actor, entity weaponentity, vector a, bool restartanim)
 }
 #endif
 
+REGISTER_NET_C2S(w_whereis)
+#ifdef SVQC
+void Weapon_whereis(Weapon this, entity cl);
+NET_HANDLE(w_whereis, bool)
+{
+       Weapon wpn = ReadRegistered(Weapons);
+       if (wpn != WEP_Null) Weapon_whereis(wpn, sender);
+       return true;
+}
+#else
+void w_whereis(Weapon this)
+{
+       int channel = MSG_C2S;
+       WriteHeader(channel, w_whereis);
+       WriteRegistered(Weapons, channel, this);
+}
+CLIENT_COMMAND(weapon_find, "Show spawn locations of a weapon")
+{
+       switch (request)
+       {
+               case CMD_REQUEST_COMMAND:
+               {
+                       string s = argv(1);
+                       if (s == "all")
+                       {
+                               FOREACH(Weapons, it != WEP_Null, w_whereis(it));
+                               return;
+                       }
+                       if (s == "unowned")
+                       {
+                               FOREACH(Weapons, it != WEP_Null && !(STAT(WEAPONS) & it.m_wepset), w_whereis(it));
+                               return;
+                       }
+                       FOREACH(Weapons, it != WEP_Null && it.netname == s,
+                       {
+                               w_whereis(it);
+                               return;
+                       });
+               }
+               default:
+               {
+                       LOG_INFOF("Incorrect parameters for ^2%s^7\n", "weapon_find");
+               }
+               case CMD_REQUEST_USAGE:
+               {
+                       LOG_INFO("\nUsage:^3 cl_cmd weapon_find weapon\n");
+                       LOG_INFO("  Where 'weapon' is the lowercase weapon name, 'all' or 'unowned'.\n");
+                       return;
+               }
+       }
+}
+#endif
+
+
 #endif
 
 #endif