Merge branch 'master' into Mario/monsters

[xonotic/xonotic-data.pk3dir.git] / qcsrc / client / Main.qc

diff --git a/qcsrc/client/Main.qc b/qcsrc/client/Main.qc
index ecc2000d7ccae32447fa4e78e75460a26e8f1f5a..8b178c81f81bc04e898dbce96daea83b49fd462f 100644 (file)
--- a/qcsrc/client/Main.qc
+++ b/qcsrc/client/Main.qc
@@ -172,6 +172,8 @@ void CSQC_Init(void)
                precache_all_playermodels("models/player/*.iqm");
        }
 
+       Monsters_Precache();
+       generator_precache();
        Projectile_Precache();
        Hook_Precache();
        GibSplash_Precache();
@@ -778,6 +780,8 @@ void CSQC_Ent_Update(float bIsNewEntity)
                case ENT_CLIENT_ACCURACY: Ent_ReadAccuracy(); break;
                case ENT_CLIENT_AUXILIARYXHAIR: Net_AuXair2(bIsNewEntity); break;
                case ENT_CLIENT_TURRET: ent_turret(); break; 
+               case ENT_CLIENT_MONSTER: ent_monster(); break;
+               case ENT_CLIENT_GENERATOR: ent_generator(); break;
                case ENT_CLIENT_MODEL: CSQCModel_Read(bIsNewEntity); break;
                case ENT_CLIENT_ITEM: ItemRead(bIsNewEntity); break;  
                case ENT_CLIENT_BUMBLE_RAYGUN: bumble_raygun_read(bIsNewEntity); break;