[nexuiz-commits] r7537 - in trunk/data/qcsrc/server/tturrets: system units
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Wed Aug 26 15:06:40 EDT 2009
Author: tzork
Date: 2009-08-26 15:06:39 -0400 (Wed, 26 Aug 2009)
New Revision: 7537
Modified:
trunk/data/qcsrc/server/tturrets/system/system_main.qc
trunk/data/qcsrc/server/tturrets/units/unit_ewheel.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
trunk/data/qcsrc/server/tturrets/units/unit_walker.qc
Log:
Fix turrets bboxes.
Modified: trunk/data/qcsrc/server/tturrets/system/system_main.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/system/system_main.qc 2009-08-26 18:24:59 UTC (rev 7536)
+++ trunk/data/qcsrc/server/tturrets/system/system_main.qc 2009-08-26 19:06:39 UTC (rev 7537)
@@ -881,7 +881,7 @@
* (unless you have a very good reason not to)
* if the return value is 0, the turret should be removed.
*/
-float turret_stdproc_init (string cvar_base_name, float csqc_shared)
+float turret_stdproc_init (string cvar_base_name, float csqc_shared, string base, string head)
{
entity e,ee;
@@ -1146,6 +1146,13 @@
self.tur_head.team = self.team;
self.tur_head.owner = self;
+ setmodel(self,base);
+ setmodel(self.tur_head,head);
+
+ setsize(self,'-32 -32 0','32 32 32');
+ setsize(self.tur_head,'-32 -32 0','32 32 32');
+
+
// Defend mode?
if(!self.tur_defend)
if (self.target != "")
Modified: trunk/data/qcsrc/server/tturrets/units/unit_ewheel.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_ewheel.qc 2009-08-26 18:24:59 UTC (rev 7536)
+++ trunk/data/qcsrc/server/tturrets/units/unit_ewheel.qc 2009-08-26 19:06:39 UTC (rev 7537)
@@ -439,7 +439,7 @@
self.turret_respawnhook = ewheel_respawnhook;
self.turret_diehook = ewheel_diehook;
- if (turret_stdproc_init("ewheel_std",0) == 0)
+ if (turret_stdproc_init("ewheel_std",0,"models/turrets/ewheel-base.md3","models/turrets/ewheel-gun1.md3") == 0)
{
remove(self);
return;
@@ -454,9 +454,9 @@
self.solid = SOLID_SLIDEBOX;
self.takedamage = DAMAGE_AIM;
- setmodel(self,"models/turrets/ewheel-base.md3");
- setmodel(self.tur_head,"models/turrets/ewheel-gun1.md3");
setattachment(self.tur_head,self,"tag_head");
+ setsize(self,'-32 -32 0','32 32 48');
+ setsize(self.tur_head,'0 0 0','0 0 0');
self.pos1 = self.origin;
Modified: trunk/data/qcsrc/server/tturrets/units/unit_flac.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_flac.qc 2009-08-26 18:24:59 UTC (rev 7536)
+++ trunk/data/qcsrc/server/tturrets/units/unit_flac.qc 2009-08-26 19:06:39 UTC (rev 7537)
@@ -94,18 +94,16 @@
self.ammo_flags = TFL_AMMO_ROCKETS | TFL_AMMO_RECHARGE;
self.aim_flags = TFL_AIM_LEAD | TFL_AIM_SHOTTIMECOMPENSATE;
- if (turret_stdproc_init("flac_std",0) == 0)
+ if (turret_stdproc_init("flac_std",0,"models/turrets/base.md3","models/turrets/flac.md3") == 0)
{
remove(self);
return;
}
+ setsize(self.tur_head,'-32 -32 0','32 32 64');
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");
-
if (!turret_tag_setup())
dprint("Warning: Turret ",self.classname, " faild to initialize md3 tags\n");
Modified: trunk/data/qcsrc/server/tturrets/units/unit_fusionreactor.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_fusionreactor.qc 2009-08-26 18:24:59 UTC (rev 7536)
+++ trunk/data/qcsrc/server/tturrets/units/unit_fusionreactor.qc 2009-08-26 19:06:39 UTC (rev 7537)
@@ -49,18 +49,13 @@
self.aim_flags = TFL_AIM_NO;
self.track_flags = TFL_TRACK_NO;
self.turret_respawnhook = turret_fusionreactor_respawnhook;
- if (turret_stdproc_init("fusreac_std",0) == 0)
+ if (turret_stdproc_init("fusreac_std",0,"models/turrets/base.md3","models/turrets/reactor.md3") == 0)
{
remove(self);
return;
}
+ setsize(self.tur_head,'-32 -32 0','32 32 64');
- setmodel(self,"models/turrets/base.md3");
- setmodel(self.tur_head,"models/turrets/reactor.md3");
-
- //if(!turret_tag_setup())
- // dprint("Warning: Turret ",self.classname, " faild to initialize md3 tags\n");
-
self.tur_head.scale = 0.75;
setorigin(self.tur_head,self.origin + '0 0 25');
self.tur_head.avelocity = '0 50 0';
Modified: trunk/data/qcsrc/server/tturrets/units/unit_hellion.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_hellion.qc 2009-08-26 18:24:59 UTC (rev 7536)
+++ trunk/data/qcsrc/server/tturrets/units/unit_hellion.qc 2009-08-26 19:06:39 UTC (rev 7537)
@@ -188,15 +188,12 @@
self.firecheck_flags = TFL_FIRECHECK_WORLD | TFL_FIRECHECK_DEAD | TFL_FIRECHECK_DISTANCES | TFL_FIRECHECK_TEAMCECK | TFL_FIRECHECK_REFIRE | TFL_FIRECHECK_AFF | TFL_FIRECHECK_OWM_AMMO;
self.ammo_flags = TFL_AMMO_ROCKETS | TFL_AMMO_RECHARGE;
- if (turret_stdproc_init("hellion_std",0) == 0)
+ if (turret_stdproc_init("hellion_std",0,"models/turrets/base.md3","models/turrets/hellion.md3") == 0)
{
remove(self);
return;
}
- setmodel(self,"models/turrets/base.md3");
- setmodel(self.tur_head,"models/turrets/hellion.md3");
-
if (!turret_tag_setup())
dprint("Warning: Turret ",self.classname, " faild to initialize md3 tags\n");
Modified: trunk/data/qcsrc/server/tturrets/units/unit_hk.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_hk.qc 2009-08-26 18:24:59 UTC (rev 7536)
+++ trunk/data/qcsrc/server/tturrets/units/unit_hk.qc 2009-08-26 19:06:39 UTC (rev 7537)
@@ -433,7 +433,7 @@
self.shoot_flags = TFL_SHOOT_CLEARTARGET;
- if (turret_stdproc_init("hk_std",0) == 0)
+ if (turret_stdproc_init("hk_std",0,"models/turrets/base.md3","models/turrets/hk.md3") == 0)
{
remove(self);
return;
@@ -441,8 +441,6 @@
self.target_validate_flags = TFL_TARGETSELECT_PLAYERS | TFL_TARGETSELECT_TEAMCHECK;
- setmodel(self,"models/turrets/base.md3");
- setmodel(self.tur_head,"models/turrets/hk.md3");
if (!turret_tag_setup())
dprint("Warning: Turret ",self.classname, " faild to initialize md3 tags\n");
Modified: trunk/data/qcsrc/server/tturrets/units/unit_machinegun.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_machinegun.qc 2009-08-26 18:24:59 UTC (rev 7536)
+++ trunk/data/qcsrc/server/tturrets/units/unit_machinegun.qc 2009-08-26 19:06:39 UTC (rev 7537)
@@ -42,7 +42,7 @@
else
self.aim_flags |= TFL_AIM_SHOTTIMECOMPENSATE;
- if (turret_stdproc_init("machinegun_std",0) == 0)
+ if (turret_stdproc_init("machinegun_std",0,"models/turrets/base.md3","models/turrets/machinegun.md3") == 0)
{
remove(self);
return;
@@ -50,9 +50,6 @@
self.damage_flags |= TFL_DMG_HEADSHAKE;
- setmodel(self,"models/turrets/base.md3");
- setmodel(self.tur_head,"models/turrets/machinegun.md3");
-
if (!turret_tag_setup())
dprint("Warning: Turret ",self.classname, " faild to initialize md3 tags\n");
Modified: trunk/data/qcsrc/server/tturrets/units/unit_mlrs.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_mlrs.qc 2009-08-26 18:24:59 UTC (rev 7536)
+++ trunk/data/qcsrc/server/tturrets/units/unit_mlrs.qc 2009-08-26 19:06:39 UTC (rev 7537)
@@ -103,7 +103,7 @@
self.ammo_flags = TFL_AMMO_ROCKETS | TFL_AMMO_RECHARGE;
self.aim_flags = TFL_AIM_LEAD | TFL_AIM_ZEASE | TFL_AIM_SHOTTIMECOMPENSATE | TFL_AIM_INFRONT;
- if (turret_stdproc_init("mlrs_std",0) == 0)
+ if (turret_stdproc_init("mlrs_std",0,"models/turrets/base.md3","models/turrets/mlrs.md3") == 0)
{
remove(self);
return;
@@ -114,9 +114,6 @@
self.shoot_flags |= TFL_SHOOT_VOLLYALWAYS;
self.volly_counter = self.shot_volly;
- setmodel(self,"models/turrets/base.md3");
- setmodel(self.tur_head,"models/turrets/mlrs.md3");
-
if (!turret_tag_setup())
dprint("Warning: Turret ",self.classname, " faild to initialize md3 tags\n");
Modified: trunk/data/qcsrc/server/tturrets/units/unit_phaser.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_phaser.qc 2009-08-26 18:24:59 UTC (rev 7536)
+++ trunk/data/qcsrc/server/tturrets/units/unit_phaser.qc 2009-08-26 19:06:39 UTC (rev 7537)
@@ -116,15 +116,12 @@
self.ammo_flags = TFL_AMMO_ENERGY | TFL_AMMO_RECHARGE | TFL_AMMO_RECIVE;
self.aim_flags = TFL_AIM_ZEASE | TFL_AIM_LEAD;
- if (turret_stdproc_init("phaser_std",0) == 0)
+ if (turret_stdproc_init("phaser_std",0,"models/turrets/base.md3","models/turrets/phaser.md3") == 0)
{
remove(self);
return;
}
- setmodel(self,"models/turrets/base.md3");
- setmodel(self.tur_head,"models/turrets/phaser.md3");
-
if (!turret_tag_setup())
dprint("Warning: Turret ",self.classname, " faild to initialize md3 tags\n");
Modified: trunk/data/qcsrc/server/tturrets/units/unit_plasma.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_plasma.qc 2009-08-26 18:24:59 UTC (rev 7536)
+++ trunk/data/qcsrc/server/tturrets/units/unit_plasma.qc 2009-08-26 19:06:39 UTC (rev 7537)
@@ -127,7 +127,7 @@
self.aim_flags = TFL_AIM_LEAD | TFL_AIM_SHOTTIMECOMPENSATE | TFL_AIM_GROUND2;
self.turrcaps_flags = TFL_TURRCAPS_RADIUSDMG | TFL_TURRCAPS_MEDPROJ | TFL_TURRCAPS_PLAYERKILL | TFL_TURRCAPS_MISSILEKILL;
- if (turret_stdproc_init("plasma_std",FALSE) == 0)
+ if (turret_stdproc_init("plasma_std",FALSE,"models/turrets/base.md3","models/turrets/plasma.md3") == 0)
{
remove(self);
return;
@@ -141,8 +141,8 @@
//self.target_select_flags |= TFL_TARGETSELECT_FOV;
//self.target_select_fov = 45;
- setmodel(self,"models/turrets/base.md3");
- setmodel(self.tur_head,"models/turrets/plasma.md3");
+ //setmodel(self,"models/turrets/base.md3");
+ //setmodel(self.tur_head,"models/turrets/plasma.md3");
// self.tur_head.alpha = -1;
if (!turret_tag_setup())
@@ -168,7 +168,7 @@
self.aim_flags = TFL_AIM_LEAD | TFL_AIM_SHOTTIMECOMPENSATE | TFL_AIM_GROUND2 ;
self.turrcaps_flags = TFL_TURRCAPS_RADIUSDMG | TFL_TURRCAPS_MEDPROJ | TFL_TURRCAPS_PLAYERKILL;
- if (turret_stdproc_init("plasma_dual",0) == 0)
+ if (turret_stdproc_init("plasma_dual",0,"models/turrets/base.md3","models/turrets/plasmad.md3") == 0)
{
remove(self);
return;
@@ -178,8 +178,8 @@
//self.firecheck_flags |= (TFL_FIRECHECK_AFF | TFL_FIRECHECK_VERIFIED);
//self.firecheck_flags |= TFL_FIRECHECK_AFF;
- setmodel(self,"models/turrets/base.md3");
- setmodel(self.tur_head,"models/turrets/plasmad.md3");
+ //setmodel(self,"models/turrets/base.md3");
+ //setmodel(self.tur_head,"models/turrets/plasmad.md3");
if (!turret_tag_setup())
Modified: trunk/data/qcsrc/server/tturrets/units/unit_tessla.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_tessla.qc 2009-08-26 18:24:59 UTC (rev 7536)
+++ trunk/data/qcsrc/server/tturrets/units/unit_tessla.qc 2009-08-26 19:06:39 UTC (rev 7537)
@@ -144,15 +144,15 @@
self.aim_flags = TFL_AIM_NO;
self.track_flags = TFL_TRACK_NO;
- if (turret_stdproc_init("tesla_std",0) == 0)
+ if (turret_stdproc_init("tesla_std",0,"models/turrets/tesla_base.md3","models/turrets/tesla_head.md3") == 0)
{
remove(self);
return;
}
+ setsize(self,'-48 -48 0','48 48 96');
+ //setmodel(self,"models/turrets/tesla_base.md3");
+ //setmodel(self.tur_head,"models/turrets/tesla_head.md3");
- setmodel(self,"models/turrets/tesla_base.md3");
- setmodel(self.tur_head,"models/turrets/tesla_head.md3");
-
self.target_validate_flags = TFL_TARGETSELECT_PLAYERS | TFL_TARGETSELECT_MISSILES |
TFL_TARGETSELECT_RANGELIMTS | TFL_TARGETSELECT_TEAMCHECK;
Modified: trunk/data/qcsrc/server/tturrets/units/unit_walker.qc
===================================================================
--- trunk/data/qcsrc/server/tturrets/units/unit_walker.qc 2009-08-26 18:24:59 UTC (rev 7536)
+++ trunk/data/qcsrc/server/tturrets/units/unit_walker.qc 2009-08-26 19:06:39 UTC (rev 7537)
@@ -35,7 +35,7 @@
.entity wkr_spawn;
#define WALKER_MIN '-70 -70 5'
-#define WALKER_MAX '70 70 70'
+#define WALKER_MAX '70 70 90'
#define WALKER_PATH(s,e) pathlib_astar(s,e)
@@ -939,11 +939,12 @@
self.turret_diehook = walker_diehook;
self.ticrate = 0.05;
- if (turret_stdproc_init("walker_std",0) == 0)
+ if (turret_stdproc_init("walker_std",FALSE,"models/turrets/walker_body.md3","models/turrets/walker_head_minigun.md3") == 0)
{
remove(self);
return;
}
+ setsize(self.tur_head,'0 0 0','0 0 0');
self.walker_verbs_move = spawn();
self.walker_verbs_attack = spawn();
@@ -966,8 +967,8 @@
self.solid = SOLID_SLIDEBOX;
self.takedamage = DAMAGE_AIM;
- setmodel(self,"models/turrets/walker_body.md3");
- setmodel(self.tur_head,"models/turrets/walker_head_minigun.md3");
+ //setmodel(self,"models/turrets/walker_body.md3");
+ //setmodel(self.tur_head,"models/turrets/walker_head_minigun.md3");
setmodel(self.wkr_spawn,"models/turrets/walker_spawn.md3");
setattachment(self.tur_head,self,"tag_head");
More information about the nexuiz-commits
mailing list