From: Mario <mario@smbclan.net>
Date: Wed, 30 Dec 2015 21:22:55 +0000 (+1000)
Subject: Revert change to client models (breaks on some maps)
X-Git-Tag: xonotic-v0.8.2~1352
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c7735d862d26c309e8854503880909ff1ec0cf43;p=xonotic%2Fxonotic-data.pk3dir.git

Revert change to client models (breaks on some maps)
---

diff --git a/qcsrc/server/g_models.qc b/qcsrc/server/g_models.qc
index 03064372b..46ebe5ed8 100644
--- a/qcsrc/server/g_models.qc
+++ b/qcsrc/server/g_models.qc
@@ -183,15 +183,15 @@ bool g_clientmodel_genericsendentity(entity this, entity to, int sf)
 	self.default_solid = sol;
 
 // non-solid model entities:
-spawnfunc(misc_gamemodel)         { self.angles_x = -self.angles.x; G_CLIENTMODEL_INIT      (SOLID_NOT) } // model entity
+spawnfunc(misc_gamemodel)         { self.angles_x = -self.angles.x; G_MODEL_INIT      (SOLID_NOT) } // model entity
 spawnfunc(misc_clientmodel)       { self.angles_x = -self.angles.x; G_CLIENTMODEL_INIT(SOLID_NOT) } // model entity
-spawnfunc(misc_models)            { self.angles_x = -self.angles.x; G_CLIENTMODEL_INIT      (SOLID_NOT) } // DEPRECATED old compat entity with confusing name, do not use
+spawnfunc(misc_models)            { self.angles_x = -self.angles.x; G_MODEL_INIT      (SOLID_NOT) } // DEPRECATED old compat entity with confusing name, do not use
 
 // non-solid brush entities:
-spawnfunc(func_illusionary)       { G_CLIENTMODEL_INIT      (SOLID_NOT) } // Q1 name (WARNING: MISPREDICTED)
+spawnfunc(func_illusionary)       { G_MODEL_INIT      (SOLID_NOT) } // Q1 name (WARNING: MISPREDICTED)
 spawnfunc(func_clientillusionary) { G_CLIENTMODEL_INIT(SOLID_NOT) } // brush entity
-spawnfunc(func_static)            { G_CLIENTMODEL_INIT      (SOLID_NOT) } // DEPRECATED old alias name from some other game
+spawnfunc(func_static)            { G_MODEL_INIT      (SOLID_NOT) } // DEPRECATED old alias name from some other game
 
 // solid brush entities
-spawnfunc(func_wall)              { G_CLIENTMODEL_INIT      (SOLID_BSP) } // Q1 name
+spawnfunc(func_wall)              { G_MODEL_INIT      (SOLID_BSP) } // Q1 name
 spawnfunc(func_clientwall)        { G_CLIENTMODEL_INIT(SOLID_BSP) } // brush entity (WARNING: MISPREDICTED)