[nexuiz-commits] r6477 - in trunk/data/qcsrc/server/tturrets: system units
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Apr 13 06:06:13 EDT 2009
Author: tzork
Date: 2009-04-13 06:06:06 -0400 (Mon, 13 Apr 2009)
New Revision: 6477
Modified:
trunk/data/qcsrc/server/tturrets/system/system_misc.qc
trunk/data/qcsrc/server/tturrets/units/unit_flac.qc
trunk/data/qcsrc/server/tturrets/units/unit_fusionreactor.qc
trunk/data/qcsrc/server/tturrets/units/unit_hellion.qc
trunk/data/qcsrc/server/tturrets/units/unit_hk.qc
trunk/data/qcsrc/server/tturrets/units/unit_machinegun.qc
trunk/data/qcsrc/server/tturrets/units/unit_mlrs.qc
trunk/data/qcsrc/server/tturrets/units/unit_phaser.qc
trunk/data/qcsrc/server/tturrets/units/unit_plasma.qc
trunk/data/qcsrc/server/tturrets/units/unit_tessla.qc
Log:
Move turret models precache to spawnfunc_
Modified: trunk/data/qcsrc/server/tturrets/system/system_misc.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/system/system_misc.qc 2009-04-12 21:16:44 UTC (rev 6476)
+++ trunk/data/qcsrc/server/tturrets/system/system_misc.qc 2009-04-13 10:06:06 UTC (rev 6477)
@@ -367,10 +367,6 @@
void turrets_precash()
{
- precache_model ("models/turrets/c512.md3");
-
- precache_sound ("turrets/phaser.ogg");
-
precache_model ("models/turrets/base-gib1.md3");
precache_model ("models/turrets/base-gib2.md3");
precache_model ("models/turrets/base-gib3.md3");
@@ -380,22 +376,31 @@
precache_model ("models/turrets/head-gib2.md3");
precache_model ("models/turrets/head-gib3.md3");
precache_model ("models/turrets/head-gib4.md3");
+ precache_model ("models/turrets/terrainbase.md3");
- precache_model ("models/turrets/base.md3");
- precache_model ("models/turrets/flac.md3");
- precache_model ("models/turrets/pd_proj.md3");
- precache_model ("models/turrets/reactor.md3");
- precache_model ("models/turrets/mlrs_rocket.md3");
- precache_model ("models/turrets/hellion.md3");
- precache_model ("models/turrets/hunter2.md3");
- precache_model ("models/turrets/hk.md3");
- precache_model ("models/turrets/machinegun.md3");
- precache_model ("models/turrets/rocket.md3");
- precache_model ("models/turrets/mlrs.md3");
- precache_model ("models/turrets/phaser.md3");
- precache_model ("models/turrets/phaser_beam.md3");
- precache_model ("models/turrets/plasmad.md3");
- precache_model ("models/turrets/plasma.md3");
- precache_model ("models/turrets/tesla_head.md3");
- precache_model ("models/turrets/tesla_base.md3");
+ //precache_model ("models/turrets/base.md3");
+ //precache_model ("models/turrets/flac.md3");
+ //precache_model ("models/turrets/pd_proj.md3");
+ //precache_model ("models/turrets/reactor.md3");
+ //precache_model ("models/turrets/mlrs_rocket.md3");
+ //precache_model ("models/turrets/hellion.md3");
+ //precache_model ("models/turrets/hunter2.md3");
+ //precache_model ("models/turrets/hk.md3");
+ //precache_model ("models/turrets/machinegun.md3");
+ //precache_model ("models/turrets/rocket.md3");
+ //precache_model ("models/turrets/mlrs.md3");
+ //precache_model ("models/turrets/phaser.md3");
+ //precache_model ("models/turrets/phaser_beam.md3");
+ //precache_model ("models/turrets/plasmad.md3");
+ //precache_model ("models/turrets/plasma.md3");
+ //precache_model ("models/turrets/tesla_head.md3");
+ //precache_model ("models/turrets/tesla_base.md3");
+
+#if 0
+ precache_model ("models/turrets/c512.md3");
+ precache_model ("models/pathlib/goodsquare.md3");
+ precache_model ("models/pathlib/badsquare.md3");
+ precache_model ("models/pathlib/square.md3");
+ precache_model ("models/pathlib/edge.md3");
+#endif
}
Modified: trunk/data/qcsrc/server/tturrets/units/unit_flac.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_flac.qc 2009-04-12 21:16:44 UTC (rev 6476)
+++ trunk/data/qcsrc/server/tturrets/units/unit_flac.qc 2009-04-13 10:06:06 UTC (rev 6477)
@@ -98,6 +98,7 @@
}
self.damage_flags |= TFL_DMG_HEADSHAKE;
+ self.target_select_flags |= TFL_TARGETSELECT_NOTURRETS;
setmodel(self,"models/turrets/base.md3");
setmodel(self.tur_head,"models/turrets/flac.md3");
@@ -114,8 +115,8 @@
void spawnfunc_turret_flac()
{
- //precache_model ("models/turrets/base.md3");
- //precache_model ("models/turrets/flac.md3");
+ precache_model ("models/turrets/base.md3");
+ precache_model ("models/turrets/flac.md3");
//precache_model("models/turrets/pd_proj.md3");
self.think = turret_flac_dinit;
Modified: trunk/data/qcsrc/server/tturrets/units/unit_fusionreactor.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_fusionreactor.qc 2009-04-12 21:16:44 UTC (rev 6476)
+++ trunk/data/qcsrc/server/tturrets/units/unit_fusionreactor.qc 2009-04-13 10:06:06 UTC (rev 6477)
@@ -75,8 +75,8 @@
*/
void spawnfunc_turret_fusionreactor()
{
- //precache_model ("models/turrets/reactor.md3");
- //precache_model ("models/turrets/base.md3");
+ precache_model ("models/turrets/reactor.md3");
+ precache_model ("models/turrets/base.md3");
self.think = turret_fusionreactor_dinit;
self.nextthink = time + 0.5;
Modified: trunk/data/qcsrc/server/tturrets/units/unit_hellion.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_hellion.qc 2009-04-12 21:16:44 UTC (rev 6476)
+++ trunk/data/qcsrc/server/tturrets/units/unit_hellion.qc 2009-04-13 10:06:06 UTC (rev 6477)
@@ -212,8 +212,8 @@
void spawnfunc_turret_hellion()
{
//precache_model ( "models/turrets/mlrs_rocket.md3");
- //precache_model ("models/turrets/hellion.md3");
- //precache_model ("models/turrets/base.md3");
+ precache_model ("models/turrets/hellion.md3");
+ precache_model ("models/turrets/base.md3");
self.think = turret_hellion_dinit;
self.nextthink = time + 0.5;
Modified: trunk/data/qcsrc/server/tturrets/units/unit_hk.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_hk.qc 2009-04-12 21:16:44 UTC (rev 6476)
+++ trunk/data/qcsrc/server/tturrets/units/unit_hk.qc 2009-04-13 10:06:06 UTC (rev 6477)
@@ -470,8 +470,8 @@
void spawnfunc_turret_hk()
{
//precache_model ( "models/turrets/hunter2.md3");
- //precache_model ("models/turrets/base.md3");
- //precache_model ("models/turrets/hk.md3");
+ precache_model ("models/turrets/base.md3");
+ precache_model ("models/turrets/hk.md3");
self.think = turret_hk_dinit;
self.nextthink = time + 0.5;
Modified: trunk/data/qcsrc/server/tturrets/units/unit_machinegun.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_machinegun.qc 2009-04-12 21:16:44 UTC (rev 6476)
+++ trunk/data/qcsrc/server/tturrets/units/unit_machinegun.qc 2009-04-13 10:06:06 UTC (rev 6477)
@@ -71,8 +71,8 @@
*/
void spawnfunc_turret_machinegun()
{
- //precache_model ("models/turrets/machinegun.md3");
- //precache_model ("models/turrets/base.md3");
+ precache_model ("models/turrets/machinegun.md3");
+ precache_model ("models/turrets/base.md3");
precache_sound ("weapons/uzi_fire.wav");
self.think = turret_machinegun_std_init;
Modified: trunk/data/qcsrc/server/tturrets/units/unit_mlrs.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_mlrs.qc 2009-04-12 21:16:44 UTC (rev 6476)
+++ trunk/data/qcsrc/server/tturrets/units/unit_mlrs.qc 2009-04-13 10:06:06 UTC (rev 6477)
@@ -132,8 +132,8 @@
void spawnfunc_turret_mlrs()
{
//precache_model ( "models/turrets/rocket.md3");
- //precache_model ("models/turrets/mlrs.md3");
- //precache_model ("models/turrets/base.md3");
+ precache_model ("models/turrets/mlrs.md3");
+ precache_model ("models/turrets/base.md3");
self.think = turret_mlrs_dinit;
self.nextthink = time + 0.5;
Modified: trunk/data/qcsrc/server/tturrets/units/unit_phaser.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_phaser.qc 2009-04-12 21:16:44 UTC (rev 6476)
+++ trunk/data/qcsrc/server/tturrets/units/unit_phaser.qc 2009-04-13 10:06:06 UTC (rev 6477)
@@ -138,10 +138,10 @@
*/
void spawnfunc_turret_phaser()
{
- //precache_sound ("turrets/phaser.ogg");
- //precache_model ("models/turrets/phaser.md3");
- //precache_model ("models/turrets/phaser_beam.md3");
- //precache_model ("models/turrets/base.md3");
+ precache_sound ("turrets/phaser.ogg");
+ precache_model ("models/turrets/phaser.md3");
+ precache_model ("models/turrets/phaser_beam.md3");
+ precache_model ("models/turrets/base.md3");
self.think = turret_phaser_dinit;
self.nextthink = time + 0.5;
Modified: trunk/data/qcsrc/server/tturrets/units/unit_plasma.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_plasma.qc 2009-04-12 21:16:44 UTC (rev 6476)
+++ trunk/data/qcsrc/server/tturrets/units/unit_plasma.qc 2009-04-13 10:06:06 UTC (rev 6477)
@@ -203,8 +203,8 @@
void spawnfunc_turret_plasma()
{
g_turrets_common_precash();
- //precache_model ("models/turrets/plasma.md3");
- //precache_model ("models/turrets/base.md3");
+ precache_model ("models/turrets/plasma.md3");
+ precache_model ("models/turrets/base.md3");
self.think = turret_plasma_std_init;
self.nextthink = time + 0.5;
@@ -215,8 +215,8 @@
void spawnfunc_turret_plasma_dual()
{
- //precache_model ("models/turrets/plasmad.md3");
- //precache_model ("models/turrets/base.md3");
+ precache_model ("models/turrets/plasmad.md3");
+ precache_model ("models/turrets/base.md3");
self.think = turret_plasma_dual_init;
self.nextthink = time + 0.5;
Modified: trunk/data/qcsrc/server/tturrets/units/unit_tessla.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_tessla.qc 2009-04-12 21:16:44 UTC (rev 6476)
+++ trunk/data/qcsrc/server/tturrets/units/unit_tessla.qc 2009-04-13 10:06:06 UTC (rev 6477)
@@ -168,8 +168,8 @@
*/
void spawnfunc_turret_tesla()
{
- //precache_model ("models/turrets/tesla_head.md3");
- //precache_model ("models/turrets/tesla_base.md3");
+ precache_model ("models/turrets/tesla_head.md3");
+ precache_model ("models/turrets/tesla_base.md3");
self.think = turret_tesla_dinit;
More information about the nexuiz-commits
mailing list