r4226 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Fri Aug 29 02:07:35 EDT 2008
Author: div0
Date: 2008-08-29 02:07:32 -0400 (Fri, 29 Aug 2008)
New Revision: 4226
Modified:
trunk/data/qcsrc/server/defs.qh
trunk/data/qcsrc/server/domination.qc
trunk/data/qcsrc/server/g_triggers.qc
trunk/data/qcsrc/server/keyhunt.qc
trunk/data/qcsrc/server/miscfunctions.qc
trunk/data/qcsrc/server/runematch.qc
trunk/data/qcsrc/server/t_plats.qc
trunk/data/qcsrc/server/t_quake.qc
trunk/data/qcsrc/server/t_teleporters.qc
trunk/data/qcsrc/server/teamplay.qc
Log:
add field .nottargeted to override targetname checks (for misc_follow on anything)
Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh 2008-08-28 18:27:09 UTC (rev 4225)
+++ trunk/data/qcsrc/server/defs.qh 2008-08-29 06:07:32 UTC (rev 4226)
@@ -338,8 +338,6 @@
float default_player_alpha;
float default_weapon_alpha;
-.float has_zoomed;
-
.float() customizeentityforclient;
.float cvar_cl_handicap;
.float cvar_cl_zoomfactor;
Modified: trunk/data/qcsrc/server/domination.qc
===================================================================
--- trunk/data/qcsrc/server/domination.qc 2008-08-28 18:27:09 UTC (rev 4225)
+++ trunk/data/qcsrc/server/domination.qc 2008-08-29 06:07:32 UTC (rev 4226)
@@ -40,7 +40,7 @@
local float old_delay, old_team, real_team;
// now that the delay has expired, switch to the latest team to lay claim to this point
- head = self.aiment;
+ head = self.owner;
real_team = self.cnt;
self.cnt = -1;
@@ -170,7 +170,7 @@
self.team = self.goalentity.team; // this stores the PREVIOUS team!
self.cnt = other.team;
- self.aiment = head; // team to switch to after the delay
+ self.owner = head; // team to switch to after the delay
self.dmg_inflictor = other;
// self.state = 1;
Modified: trunk/data/qcsrc/server/g_triggers.qc
===================================================================
--- trunk/data/qcsrc/server/g_triggers.qc 2008-08-28 18:27:09 UTC (rev 4225)
+++ trunk/data/qcsrc/server/g_triggers.qc 2008-08-29 06:07:32 UTC (rev 4226)
@@ -474,7 +474,7 @@
{
if(self.noise)
precache_sound (self.noise);
- if(self.targetname)
+ IFTARGETED
self.use = target_speaker_use;
else
ambientsound (self.origin, self.noise, VOL_BASE, ATTN_STATIC);
@@ -567,7 +567,7 @@
self.model = "net_entity";
if(!self.cnt)
self.cnt = particleeffectnum(self.mdl);
- if(self.targetname != "")
+ IFTARGETED
{
self.use = pointparticles_use;
if(self.spawnflags & 1)
@@ -854,7 +854,7 @@
self.modelindex = 1;
self.model = "net_entity";
- if(self.targetname != "")
+ IFTARGETED
{
self.use = laser_use;
if(self.spawnflags & 1)
Modified: trunk/data/qcsrc/server/keyhunt.qc
===================================================================
--- trunk/data/qcsrc/server/keyhunt.qc 2008-08-28 18:27:09 UTC (rev 4225)
+++ trunk/data/qcsrc/server/keyhunt.qc 2008-08-29 06:07:32 UTC (rev 4226)
@@ -245,7 +245,6 @@
setattachment(key, world, "");
key.angles_y += key.owner.angles_y;
#endif
- key.aiment = world;
key.flags = FL_ITEM;
key.solid = SOLID_TRIGGER;
key.movetype = MOVETYPE_TOSS;
Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc 2008-08-28 18:27:09 UTC (rev 4225)
+++ trunk/data/qcsrc/server/miscfunctions.qc 2008-08-29 06:07:32 UTC (rev 4226)
@@ -1260,3 +1260,6 @@
}
initialize_entity_first = world;
}
+
+.float nottargeted;
+#define IFTARGETED if(!self.nottargeted && self.targetname != "")
Modified: trunk/data/qcsrc/server/runematch.qc
===================================================================
--- trunk/data/qcsrc/server/runematch.qc 2008-08-28 18:27:09 UTC (rev 4225)
+++ trunk/data/qcsrc/server/runematch.qc 2008-08-29 06:07:32 UTC (rev 4226)
@@ -199,7 +199,6 @@
setattachment(self, world, "");
self.movetype = MOVETYPE_FOLLOW;
- self.aiment = other;
self.view_ofs = other.origin;
setorigin(self, '0 0 0');
Modified: trunk/data/qcsrc/server/t_plats.qc
===================================================================
--- trunk/data/qcsrc/server/t_plats.qc 2008-08-28 18:27:09 UTC (rev 4225)
+++ trunk/data/qcsrc/server/t_plats.qc 2008-08-29 06:07:32 UTC (rev 4226)
@@ -208,7 +208,7 @@
plat_spawn_inside_trigger (); // the "start moving" trigger
- if (self.targetname)
+ IFTARGETED
{
self.state = 4;
self.use = plat_use;
@@ -221,105 +221,10 @@
};
-/*
void() train_next;
-void() func_train_find;
-
-void train_blocked()
-{
- if (time < self.attack_finished_single)
- return;
- self.attack_finished_single = time + 0.5;
-};
-void train_use()
-{
- if (self.think != func_train_find)
- return;
- train_next();
-};
-
void train_wait()
{
- if (self.wait)
- {
- self.nextthink = self.ltime + self.wait;
- sound (self, CHAN_TRIGGER, self.noise, VOL_BASE, ATTN_NORM);
- }
- else
- self.nextthink = self.ltime + 0.1;
-
self.think = train_next;
-};
-
-void train_next()
-{
- local entity targ;
-
- targ = find (world, targetname, self.target);
- self.target = targ.target;
- if (!self.target)
- objerror ("train_next: no next target");
- if (targ.wait)
- self.wait = targ.wait;
- else
- self.wait = 0;
- sound (self, CHAN_TRIGGER, self.noise1, VOL_BASE, ATTN_NORM);
- SUB_CalcMove (targ.origin - self.mins, self.speed, train_wait);
-};
-
-void func_train_find()
-{
- local entity targ;
-
- targ = find (world, targetname, self.target);
- self.target = targ.target;
- setorigin (self, targ.origin - self.mins);
- if (!self.targetname)
- { // not triggered, so start immediately
- self.nextthink = self.ltime + 0.1;
- self.think = train_next;
- }
-};
-
-
-void spawnfunc_func_train()
-{
- if (!self.speed)
- self.speed = 100;
- if (!self.target)
- objerror ("func_train without a target");
-
- if (self.sounds == 0)
- {
- self.noise = ("misc/null.wav");
- precache_sound ("misc/null.wav");
- self.noise1 = ("misc/null.wav");
- precache_sound ("misc/null.wav");
- }
-
- if (self.sounds == 1)
- {
- self.noise = ("plats/train2.wav");
- precache_sound ("plats/train2.wav");
- self.noise1 = ("plats/train1.wav");
- precache_sound ("plats/train1.wav");
- }
-
- self.blocked = train_blocked;
- self.use = train_use;
- self.classname = "train";
-
- InitMovingBrushTrigger();
- self.effects |= EF_LOWPRECISION;
- self.nextthink = self.ltime + 0.1;
- self.think = func_train_find;
-};
-*/
-
-void() train_next;
-void train_wait()
-{
- self.think = train_next;
self.nextthink = self.ltime + self.wait;
};
@@ -978,7 +883,7 @@
if (self.health)
starte.health = self.health;
- if (self.targetname)
+ IFTARGETED
starte.targetname = self.targetname;
if (self.message != "")
starte.message = self.message;
@@ -995,7 +900,7 @@
if (self.health)
return;
- if (self.targetname)
+ IFTARGETED
return;
if (self.items)
return;
@@ -1070,11 +975,6 @@
self.blocked = door_blocked;
self.use = door_use;
- if(self.targetname == "") {
- self.spawnflags = 0;
- self.dmg = 0;
- }
-
if(self.spawnflags & 8)
self.dmg = 10000;
@@ -1258,12 +1158,12 @@
void fd_secret_done()
{
- if (!self.targetname || self.spawnflags&SECRET_YES_SHOOT)
+ if (self.spawnflags&SECRET_YES_SHOOT)
{
self.health = 10000;
self.takedamage = DAMAGE_YES;
//self.th_pain = fd_secret_use;
- }
+ }
if (self.noise3 != "")
sound(self, CHAN_TRIGGER, self.noise3, VOL_BASE, ATTN_NORM);
};
@@ -1337,7 +1237,10 @@
self.blocked = secret_blocked;
self.speed = 50;
self.use = fd_secret_use;
- if ( !self.targetname || self.spawnflags&SECRET_YES_SHOOT)
+ IFTARGETED
+ self.spawnflags |= SECRET_YES_SHOOT;
+
+ if(self.spawnflags&SECRET_YES_SHOOT)
{
self.health = 10000;
self.takedamage = DAMAGE_YES;
Modified: trunk/data/qcsrc/server/t_quake.qc
===================================================================
--- trunk/data/qcsrc/server/t_quake.qc 2008-08-28 18:27:09 UTC (rev 4225)
+++ trunk/data/qcsrc/server/t_quake.qc 2008-08-29 06:07:32 UTC (rev 4226)
@@ -52,5 +52,6 @@
trace_dphittexturename = "";
require_spawnfunc_prefix = 1;
self.movetypesteplandevent = SUB_Null;
+ self.viewzoom = 0;
}
Modified: trunk/data/qcsrc/server/t_teleporters.qc
===================================================================
--- trunk/data/qcsrc/server/t_teleporters.qc 2008-08-28 18:27:09 UTC (rev 4225)
+++ trunk/data/qcsrc/server/t_teleporters.qc 2008-08-29 06:07:32 UTC (rev 4226)
@@ -92,7 +92,10 @@
//setorigin (self, self.origin + '0 0 27'); // To fix a mappers' habit as old as Quake
setorigin (self, self.origin);
- if (!self.targetname)
+ IFTARGETED
+ {
+ }
+ else
objerror ("Teleport destination without a targetname");
}
Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc 2008-08-28 18:27:09 UTC (rev 4225)
+++ trunk/data/qcsrc/server/teamplay.qc 2008-08-29 06:07:32 UTC (rev 4226)
@@ -161,7 +161,7 @@
void InitGameplayMode()
{
- float fraglimit_override, timelimit_override, capturelimit_override;
+ float fraglimit_override, timelimit_override;
VoteReset();
@@ -352,7 +352,6 @@
void PrintWelcomeMessage(entity pl)
{
string s, mutator, modifications;
- float p;
/*if(self.welcomemessage_time > time)
return;
More information about the nexuiz-commits
mailing list