Fix compile and use of .mins/.maxs on the monster registry entities

diff --git a/qcsrc/common/monsters/monster.qh b/qcsrc/common/monsters/monster.qh
index a437e355d63e847535858bb78b59fe78fc306edb..841e7ef4026f49e6443d6d0d1973a5a3f4a4f663 100644 (file)
--- a/qcsrc/common/monsters/monster.qh
+++ b/qcsrc/common/monsters/monster.qh
@@ -38,9 +38,9 @@ CLASS(Monster, Object)
     /** model */
     ATTRIB(Monster, m_model, entity);
     /** hitbox size */
-    ATTRIB(Monster, mins, vector, '-0 -0 -0');
+    ATTRIB(Monster, m_mins, vector, '-0 -0 -0');
     /** hitbox size */
-    ATTRIB(Monster, maxs, vector, '0 0 0');
+    ATTRIB(Monster, m_maxs, vector, '0 0 0');
 
     /** (SERVER) setup monster data */
     METHOD(Monster, mr_setup, bool(Monster this, entity actor)) { TC(Monster, this); return false; }

diff --git a/qcsrc/common/monsters/monster/mage.qh b/qcsrc/common/monsters/monster/mage.qh
index d78ee5ecf6b7f4bc8f8577a5d68ca93898da3550..194b6b2b2d2da88ccff35d24151e8537ec6a8d8b 100644 (file)
--- a/qcsrc/common/monsters/monster/mage.qh
+++ b/qcsrc/common/monsters/monster/mage.qh
@@ -8,8 +8,8 @@ MODEL(MON_MAGE, M_Model("mage.dpm"));
 
 CLASS(Mage, Monster)
     ATTRIB(Mage, spawnflags, int, MON_FLAG_MELEE | MON_FLAG_RANGED);
-    ATTRIB(Mage, mins, vector, '-36 -36 -24');
-    ATTRIB(Mage, maxs, vector, '36 36 50');
+    ATTRIB(Mage, m_mins, vector, '-36 -36 -24');
+    ATTRIB(Mage, m_maxs, vector, '36 36 50');
 #ifdef GAMEQC
     ATTRIB(Mage, m_model, Model, MDL_MON_MAGE);
 #endif

diff --git a/qcsrc/common/monsters/monster/shambler.qh b/qcsrc/common/monsters/monster/shambler.qh
index f7a3ce3a94f7ad7ee847c2f6ba269bc2e683d9c6..fde28e9f46e7a87fe7d8756cc1943a9f252ef866 100644 (file)
--- a/qcsrc/common/monsters/monster/shambler.qh
+++ b/qcsrc/common/monsters/monster/shambler.qh
@@ -8,8 +8,8 @@ MODEL(MON_SHAMBLER, M_Model("shambler.mdl"));
 
 CLASS(Shambler, Monster)
     ATTRIB(Shambler, spawnflags, int, MONSTER_SIZE_BROKEN | MON_FLAG_SUPERMONSTER | MON_FLAG_MELEE | MON_FLAG_RANGED);
-    ATTRIB(Shambler, mins, vector, '-41 -41 -31');
-    ATTRIB(Shambler, maxs, vector, '41 41 65');
+    ATTRIB(Shambler, m_mins, vector, '-41 -41 -31');
+    ATTRIB(Shambler, m_maxs, vector, '41 41 65');
 #ifdef GAMEQC
     ATTRIB(Shambler, m_model, Model, MDL_MON_SHAMBLER);
 #endif

diff --git a/qcsrc/common/monsters/monster/spider.qh b/qcsrc/common/monsters/monster/spider.qh
index c54eb3a7a8c7a3e9c7cef14d562f8bcfa22eda70..cd7fa9e6becb8c72c195bea86cfe256cf8fcf69d 100644 (file)
--- a/qcsrc/common/monsters/monster/spider.qh
+++ b/qcsrc/common/monsters/monster/spider.qh
@@ -8,8 +8,8 @@ MODEL(MON_SPIDER, M_Model("spider.dpm"));
 
 CLASS(Spider, Monster)
     ATTRIB(Spider, spawnflags, int, MON_FLAG_MELEE | MON_FLAG_RANGED | MON_FLAG_RIDE);
-    ATTRIB(Spider, mins, vector, '-18 -18 -25');
-    ATTRIB(Spider, maxs, vector, '18 18 30');
+    ATTRIB(Spider, m_mins, vector, '-18 -18 -25');
+    ATTRIB(Spider, m_maxs, vector, '18 18 30');
 #ifdef GAMEQC
     ATTRIB(Spider, m_model, Model, MDL_MON_SPIDER);
 #endif

diff --git a/qcsrc/common/monsters/monster/wyvern.qh b/qcsrc/common/monsters/monster/wyvern.qh
index 0af84c1301e26e042930bd26519e6fec3dfb93e1..012c9c2a5e8817913ae557781fae0ac9787f8ba9 100644 (file)
--- a/qcsrc/common/monsters/monster/wyvern.qh
+++ b/qcsrc/common/monsters/monster/wyvern.qh
@@ -8,8 +8,8 @@ MODEL(MON_WYVERN, M_Model("wizard.mdl"));
 
 CLASS(Wyvern, Monster)
     ATTRIB(Wyvern, spawnflags, int, MONSTER_TYPE_FLY | MONSTER_SIZE_BROKEN | MON_FLAG_RANGED | MON_FLAG_RIDE);
-    ATTRIB(Wyvern, mins, vector, '-20 -20 -58');
-    ATTRIB(Wyvern, maxs, vector, '20 20 20');
+    ATTRIB(Wyvern, m_mins, vector, '-20 -20 -58');
+    ATTRIB(Wyvern, m_maxs, vector, '20 20 20');
 #ifdef GAMEQC
     ATTRIB(Wyvern, m_model, Model, MDL_MON_WYVERN);
 #endif

diff --git a/qcsrc/common/monsters/monster/zombie.qh b/qcsrc/common/monsters/monster/zombie.qh
index d3c94cd4546724e1597daa8e4ec8af8caa715be6..dfa37556d46503667464f3a002de2b10d40399d3 100644 (file)
--- a/qcsrc/common/monsters/monster/zombie.qh
+++ b/qcsrc/common/monsters/monster/zombie.qh
@@ -8,8 +8,8 @@ MODEL(MON_ZOMBIE, M_Model("zombie.dpm"));
 
 CLASS(Zombie, Monster)
     ATTRIB(Zombie, spawnflags, int, MONSTER_TYPE_UNDEAD | MON_FLAG_MELEE | MON_FLAG_RIDE);
-    ATTRIB(Zombie, mins, vector, '-18 -18 -25');
-    ATTRIB(Zombie, maxs, vector, '18 18 47');
+    ATTRIB(Zombie, m_mins, vector, '-18 -18 -25');
+    ATTRIB(Zombie, m_maxs, vector, '18 18 47');
 #ifdef GAMEQC
     ATTRIB(Zombie, m_model, Model, MDL_MON_ZOMBIE);
 #endif

diff --git a/qcsrc/common/monsters/sv_monsters.qc b/qcsrc/common/monsters/sv_monsters.qc
index 6acbdaa51c32207d16ef96f379ef892d1f640a5b..469dd7b9cd7d3ec41d609dc48def8cacb2825928 100644 (file)
--- a/qcsrc/common/monsters/sv_monsters.qc
+++ b/qcsrc/common/monsters/sv_monsters.qc
@@ -1389,7 +1389,7 @@ bool Monster_Spawn(entity this, bool check_appear, int mon_id)
                        this.scale *= 1.3;
        }
 
-       setsize(this, mon.mins * this.scale, mon.maxs * this.scale);
+       setsize(this, mon.m_mins * this.scale, mon.m_maxs * this.scale);
 
        this.ticrate = bound(sys_frametime, ((!this.ticrate) ? autocvar_g_monsters_think_delay : this.ticrate), 60);
 

diff --git a/qcsrc/common/physics/player.qc b/qcsrc/common/physics/player.qc
index c4ad8d2eb0d459eb570ea94ca077bb66d0497de1..b8a14a4ce0fb79c80be015de0d0e471de1bb872c 100644 (file)
--- a/qcsrc/common/physics/player.qc
+++ b/qcsrc/common/physics/player.qc
@@ -10,7 +10,7 @@
 // client side physics
 bool Physics_Valid(string thecvar)
 {
-       return autocvar_g_physics_clientselect && thecvar != "" && thecvar && && thecvar != "default" strhasword(autocvar_g_physics_clientselect_options, thecvar);
+       return autocvar_g_physics_clientselect && thecvar != "" && thecvar && thecvar != "default" && strhasword(autocvar_g_physics_clientselect_options, thecvar);
 }
 
 float Physics_ClientOption(entity this, string option, float defaultval)

diff --git a/qcsrc/server/mutators/mutator/gamemode_invasion.qc b/qcsrc/server/mutators/mutator/gamemode_invasion.qc
index 1355134bb1e92ed923ff0cb3fa265490c3fd4d9f..cbff696fc5bf4489ac9e0c2e84cc06b55580084b 100644 (file)
--- a/qcsrc/server/mutators/mutator/gamemode_invasion.qc
+++ b/qcsrc/server/mutators/mutator/gamemode_invasion.qc
@@ -105,7 +105,7 @@ void invasion_SpawnChosenMonster(Monster mon)
        {
                LOG_TRACE("Warning: couldn't find any invasion_spawnpoint spawnpoints, attempting to spawn monsters in random locations");
                entity e = spawn();
-               setsize(e, mon.mins, mon.maxs);
+               setsize(e, mon.m_mins, mon.m_maxs);
 
                if(MoveToRandomMapLocation(e, DPCONTENTS_SOLID | DPCONTENTS_CORPSE | DPCONTENTS_PLAYERCLIP, DPCONTENTS_SLIME | DPCONTENTS_LAVA | DPCONTENTS_SKY | DPCONTENTS_BODY | DPCONTENTS_DONOTENTER, Q3SURFACEFLAG_SKY, 10, 1024, 256))
                        monster = spawnmonster(e, tospawn, mon.monsterid, NULL, NULL, e.origin, false, false, 2);