r3683 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Jun 3 01:43:04 EDT 2008
Author: div0
Date: 2008-06-03 01:43:04 -0400 (Tue, 03 Jun 2008)
New Revision: 3683
Modified:
trunk/data/qcsrc/server/arena.qc
trunk/data/qcsrc/server/assault.qc
trunk/data/qcsrc/server/bots.qc
trunk/data/qcsrc/server/cl_client.qc
trunk/data/qcsrc/server/cl_impulse.qc
trunk/data/qcsrc/server/cl_physics.qc
trunk/data/qcsrc/server/ctf.qc
trunk/data/qcsrc/server/domination.qc
trunk/data/qcsrc/server/g_world.qc
trunk/data/qcsrc/server/havocbot_roles.qc
trunk/data/qcsrc/server/miscfunctions.qc
trunk/data/qcsrc/server/mode_onslaught.qc
trunk/data/qcsrc/server/runematch.qc
trunk/data/qcsrc/server/t_items.qc
trunk/data/qcsrc/server/t_jumppads.qc
trunk/data/qcsrc/server/t_plats.qc
trunk/data/qcsrc/server/teamplay.qc
trunk/data/qcsrc/server/waypointsprites.qc
Log:
oops... huge bugs in the spawnfunc patch... it also changed them in strings, probably broke some classnames. MAny parts still worked fine, though.
Modified: trunk/data/qcsrc/server/arena.qc
===================================================================
--- trunk/data/qcsrc/server/arena.qc 2008-06-02 18:53:22 UTC (rev 3682)
+++ trunk/data/qcsrc/server/arena.qc 2008-06-03 05:43:04 UTC (rev 3683)
@@ -56,7 +56,7 @@
else if(self.classname == "rune")
{
if(self.owner)
- if(self.owner.classname != "spawnfunc_runematch_spawn_point")
+ if(self.owner.classname != "runematch_spawn_point")
DropAllRunes(self.owner);
rune_respawn();
}
@@ -65,7 +65,7 @@
if(self.health | g_keyhunt)
WaypointSprite_Kill(self);
}
- else if(self.classname == "spawnfunc_dom_controlpoint")
+ else if(self.classname == "dom_controlpoint")
{
dom_controlpoint_setup();
}
@@ -87,17 +87,17 @@
removedecor(self);
}
// TODO properly reset Onslaught
- else if(self.classname == "spawnfunc_onslaught_generator")
+ else if(self.classname == "onslaught_generator")
{
onslaught_generator_reset();
}
- else if(self.classname == "spawnfunc_onslaught_controlpoint")
+ else if(self.classname == "onslaught_controlpoint")
{
onslaught_controlpoint_reset();
}
// TODO properly reset Assault
// General teambased game modes
- else if(self.classname == "spawnfunc_info_player_deathmatch")
+ else if(self.classname == "info_player_deathmatch")
{
self.team = self.team_saved;
}
Modified: trunk/data/qcsrc/server/assault.qc
===================================================================
--- trunk/data/qcsrc/server/assault.qc 2008-06-02 18:53:22 UTC (rev 3682)
+++ trunk/data/qcsrc/server/assault.qc 2008-06-03 05:43:04 UTC (rev 3683)
@@ -67,7 +67,7 @@
-------- KEYS --------
targetname : point to e.g. next objective*/
void spawnfunc_target_objective() {
- self.classname = "spawnfunc_target_objective";
+ self.classname = "target_objective";
self.think = assault_objective_think;
self.use = assault_objective_use;
assault_objective_reset();
@@ -99,7 +99,7 @@
found = 0;
objective = find(world, targetname, self.target);
while(objective && found == 0) {
- if(objective.classname == "spawnfunc_target_objective") {
+ if(objective.classname == "target_objective") {
found = 1;
if(objective.health < ASSAULT_VALUE_INACTIVE) { // targeted objective is active
if(self.cnt == 1 && self.max_health >= ASSAULT_VALUE_INACTIVE) {
@@ -117,7 +117,7 @@
local entity ent;
ent = find(world, target, self.targetname);
if(ent) {
- if(ent.classname == "spawnfunc_func_assault_destructible")
+ if(ent.classname == "func_assault_destructible")
self.spawnflags = 2;
else
self.spawnflags = 1;
@@ -236,7 +236,7 @@
self.cnt = 0; // not yet activated
- self.classname = "spawnfunc_func_assault_destructible";
+ self.classname = "func_assault_destructible";
self.mdl = self.model;
setmodel(self, self.mdl);
@@ -252,7 +252,7 @@
notvisible = 0;
ent = find(world, targetname, self.target);
while(ent) {
- if(ent.classname == "spawnfunc_target_objective" && ent.health < 0)
+ if(ent.classname == "target_objective" && ent.health < 0)
notvisible = 1;
ent = find(ent, targetname, self.target);
}
@@ -269,7 +269,7 @@
}
void spawnfunc_func_assault_wall() {
- self.classname = "spawnfunc_func_assault_wall";
+ self.classname = "func_assault_wall";
self.mdl = self.model;
setmodel(self, self.mdl);
self.solid = SOLID_BSP;
@@ -293,7 +293,7 @@
cvar_set("timelimit", ftos(self.health/60));
self.winning = 0; // round not yet won by attackers
- self.classname = "spawnfunc_target_assault_roundend";
+ self.classname = "target_assault_roundend";
self.use = target_assault_roundend_use;
self.cnt = 0; // first round
}
@@ -305,7 +305,7 @@
void spawnfunc_target_assault_roundstart() {
assault_attacker_team = COLOR_TEAM1;
- self.classname = "spawnfunc_target_assault_roundstart";
+ self.classname = "target_assault_roundstart";
self.use = assault_roundstart_use;
self.think = assault_roundstart_use;
self.nextthink = time + 0.1;
@@ -340,7 +340,7 @@
assault_attacker_team = COLOR_TEAM1;
}
- ent = find(world, classname, "spawnfunc_info_player_deathmatch");
+ ent = find(world, classname, "info_player_deathmatch");
while (ent)
{
oldself = self;
@@ -352,11 +352,11 @@
}
self = oldself;
- ent = find(ent, classname, "spawnfunc_info_player_deathmatch");
+ ent = find(ent, classname, "info_player_deathmatch");
}
// reset all objectives
- ent = find(world, classname, "spawnfunc_target_objective");
+ ent = find(world, classname, "target_objective");
while (ent)
{
oldself = self;
@@ -364,11 +364,11 @@
assault_objective_reset();
self = oldself;
- ent = find(ent, classname, "spawnfunc_target_objective");
+ ent = find(ent, classname, "target_objective");
}
// reset round end triggers
- ent = find(world, classname, "spawnfunc_target_assault_roundend");
+ ent = find(world, classname, "target_assault_roundend");
while (ent)
{
oldself = self;
@@ -376,7 +376,7 @@
target_assault_roundend_reset();
self = oldself;
- ent = find(ent, classname, "spawnfunc_target_assault_roundend");
+ ent = find(ent, classname, "target_assault_roundend");
}
// reset all target_object_decrease
@@ -388,24 +388,24 @@
}
// reset all spawnfunc_func_assault_destructible
- ent = find(world, classname, "spawnfunc_func_assault_destructible");
+ ent = find(world, classname, "func_assault_destructible");
while (ent)
{
oldself = self;
self = ent;
assault_destructible_reset();
self = oldself;
- ent = find(ent, classname, "spawnfunc_func_assault_destructible");
+ ent = find(ent, classname, "func_assault_destructible");
}
- ent = find(world, classname, "spawnfunc_target_assault_roundstart");
+ ent = find(world, classname, "target_assault_roundstart");
while (ent)
{
oldself = self;
self = ent;
self.use();
self = oldself;
- ent = find(ent, classname, "spawnfunc_target_assault_roundstart");
+ ent = find(ent, classname, "target_assault_roundstart");
}
// actually restart round... how to do that?
Modified: trunk/data/qcsrc/server/bots.qc
===================================================================
--- trunk/data/qcsrc/server/bots.qc 2008-06-02 18:53:22 UTC (rev 3682)
+++ trunk/data/qcsrc/server/bots.qc 2008-06-03 05:43:04 UTC (rev 3683)
@@ -468,7 +468,7 @@
//dprint("waypoint_think wpisbox = ", ftos(self.wpisbox), "\n");
sm1 = self.origin + self.mins;
sm2 = self.origin + self.maxs;
- e = find(world, classname, "spawnfunc_waypoint");
+ e = find(world, classname, "waypoint");
stepheightvec = cvar("sv_stepheight") * '0 0 1';
while (e)
{
@@ -522,7 +522,7 @@
waypoint_addlink(e, self);
}
}
- e = find(e, classname, "spawnfunc_waypoint");
+ e = find(e, classname, "waypoint");
}
navigation_testtracewalk = 0;
};
@@ -578,16 +578,16 @@
{
local entity w;
local vector org;
- w = find(world, classname, "spawnfunc_waypoint");
+ w = find(world, classname, "waypoint");
while (w)
{
// if a matching spawnfunc_waypoint already exists, don't add a duplicate
if (boxesoverlap(m1, m2, w.absmin, w.absmax))
return w;
- w = find(w, classname, "spawnfunc_waypoint");
+ w = find(w, classname, "waypoint");
}
w = spawn();
- w.classname = "spawnfunc_waypoint";
+ w.classname = "waypoint";
w.wpflags = f;
setorigin(w, (m1 + m2) * 0.5);
setsize(w, m1 - w.origin, m2 - w.origin);
@@ -717,7 +717,7 @@
void() waypoint_removeall =
{
local entity head, next;
- head = findchain(classname, "spawnfunc_waypoint");
+ head = findchain(classname, "waypoint");
while (head)
{
next = head.chain;
@@ -731,7 +731,7 @@
void() waypoint_schedulerelinkall =
{
local entity head;
- head = findchain(classname, "spawnfunc_waypoint");
+ head = findchain(classname, "waypoint");
while (head)
{
waypoint_schedulerelink(head);
@@ -752,7 +752,7 @@
if (file >= 0)
{
c = 0;
- w = findchain(classname, "spawnfunc_waypoint");
+ w = findchain(classname, "waypoint");
while (w)
{
if (!(w.wpflags & WAYPOINTFLAG_GENERATED))
@@ -776,7 +776,7 @@
}
else
{
- bprint("spawnfunc_waypoint save to ");
+ bprint("waypoint save to ");
bprint(filename);
bprint(" failed\n");
}
@@ -826,7 +826,7 @@
}
else
{
- dprint("spawnfunc_waypoint load from ");
+ dprint("waypoint load from ");
dprint(filename);
dprint(" failed\n");
}
@@ -845,7 +845,7 @@
org_z = e.origin_z + e.mins_z - PL_MIN_z + 1;
e.nearestwaypointtimeout = time + 1000000000;
// don't spawn an item spawnfunc_waypoint if it already exists
- w = findchain(classname, "spawnfunc_waypoint");
+ w = findchain(classname, "waypoint");
while (w)
{
if (w.wpisbox)
@@ -1014,7 +1014,7 @@
local vector v, org, pm1, pm2;
pm1 = player.origin + PL_MIN;
pm2 = player.origin + PL_MAX;
- waylist = findchain(classname, "spawnfunc_waypoint");
+ waylist = findchain(classname, "waypoint");
// do two scans, because box test is cheaper
w = waylist;
while (w)
@@ -1155,7 +1155,7 @@
local entity w, wp, waylist;
local float searching, cost, cost2;
local vector p;
- w = waylist = findchain(classname, "spawnfunc_waypoint");
+ w = waylist = findchain(classname, "waypoint");
while (w)
{
w.wpconsidered = FALSE;
@@ -2069,7 +2069,7 @@
local float c, d, danger;
c = 0;
bot_dodgelist = findchainfloat(bot_dodge, TRUE);
- botframe_dangerwaypoint = find(botframe_dangerwaypoint, classname, "spawnfunc_waypoint");
+ botframe_dangerwaypoint = find(botframe_dangerwaypoint, classname, "waypoint");
while (botframe_dangerwaypoint != world)
{
danger = 0;
@@ -2095,7 +2095,7 @@
c = c + 1;
if (c >= maxupdate)
break;
- botframe_dangerwaypoint = find(botframe_dangerwaypoint, classname, "spawnfunc_waypoint");
+ botframe_dangerwaypoint = find(botframe_dangerwaypoint, classname, "waypoint");
}
};
Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc 2008-06-02 18:53:22 UTC (rev 3682)
+++ trunk/data/qcsrc/server/cl_client.qc 2008-06-03 05:43:04 UTC (rev 3683)
@@ -13,7 +13,7 @@
void spawnfunc_info_player_deathmatch (void)
{
- self.classname = "spawnfunc_info_player_deathmatch";
+ self.classname = "info_player_deathmatch";
relocate_spawnpoint();
}
@@ -51,7 +51,7 @@
local entity ent;
ent = find(world, targetname, spot.target);
while(ent) {
- if(ent.classname == "spawnfunc_target_objective")
+ if(ent.classname == "target_objective")
if(ent.health < 0 || ent.health >= ASSAULT_VALUE_INACTIVE)
spotactive = 0;
ent = find(ent, targetname, spot.target);
@@ -164,7 +164,7 @@
// get the list of players
playerlist = findchain(classname, "player");
// get the entire list of spots
- firstspot = findchain(classname, "spawnfunc_info_player_deathmatch");
+ firstspot = findchain(classname, "info_player_deathmatch");
// filter out the bad ones
// (note this returns the original list if none survived)
firstspot_new = Spawn_FilterOutBadSpots(firstspot, playerlist, 100, teamcheck);
Modified: trunk/data/qcsrc/server/cl_impulse.qc
===================================================================
--- trunk/data/qcsrc/server/cl_impulse.qc 2008-06-02 18:53:22 UTC (rev 3682)
+++ trunk/data/qcsrc/server/cl_impulse.qc 2008-06-03 05:43:04 UTC (rev 3683)
@@ -96,21 +96,21 @@
{
if(imp == 30)
{
- WaypointSprite_DeployPersonal("spawnfunc_waypoint", self.origin);
+ WaypointSprite_DeployPersonal("waypoint", self.origin);
self.personal_v_angle = self.v_angle;
self.personal_velocity = self.velocity;
sprint(self, "personal spawnfunc_waypoint spawned at location\n");
}
else if(imp == 31)
{
- WaypointSprite_DeployPersonal("spawnfunc_waypoint", self.cursor_trace_endpos);
+ WaypointSprite_DeployPersonal("waypoint", self.cursor_trace_endpos);
self.personal_v_angle = self.v_angle;
self.personal_velocity = '0 0 0';
sprint(self, "personal spawnfunc_waypoint spawned at crosshair\n");
}
else if(imp == 32 && vlen(self.death_origin))
{
- WaypointSprite_DeployPersonal("spawnfunc_waypoint", self.death_origin);
+ WaypointSprite_DeployPersonal("waypoint", self.death_origin);
self.personal_v_angle = self.v_angle;
self.personal_velocity = '0 0 0';
sprint(self, "personal spawnfunc_waypoint spawned at death location\n");
Modified: trunk/data/qcsrc/server/cl_physics.qc
===================================================================
--- trunk/data/qcsrc/server/cl_physics.qc 2008-06-02 18:53:22 UTC (rev 3682)
+++ trunk/data/qcsrc/server/cl_physics.qc 2008-06-03 05:43:04 UTC (rev 3683)
@@ -296,7 +296,7 @@
self.velocity_z = self.velocity_z + self.gravity * sv_gravity * frametime;
else
self.velocity_z = self.velocity_z + sv_gravity * frametime;
- if (self.ladder_entity.classname == "spawnfunc_func_water")
+ if (self.ladder_entity.classname == "func_water")
{
f = vlen(wishvel);
if (f > self.ladder_entity.speed)
Modified: trunk/data/qcsrc/server/ctf.qc
===================================================================
--- trunk/data/qcsrc/server/ctf.qc 2008-06-02 18:53:22 UTC (rev 3682)
+++ trunk/data/qcsrc/server/ctf.qc 2008-06-03 05:43:04 UTC (rev 3683)
@@ -383,7 +383,7 @@
self.team = COLOR_TEAM1; // red
spawnfunc_info_player_deathmatch();
};
-//self.team = 4;self.classname = "spawnfunc_info_player_start";spawnfunc_info_player_start();};
+//self.team = 4;self.classname = "info_player_start";spawnfunc_info_player_start();};
/*QUAKED spawnfunc_info_player_team2 (1 0 0) (-16 -16 -24) (16 16 24)
CTF Starting point for a player in
@@ -398,7 +398,7 @@
self.team = COLOR_TEAM2; // blue
spawnfunc_info_player_deathmatch();
};
-//self.team = 13;self.classname = "spawnfunc_info_player_start";spawnfunc_info_player_start();};
+//self.team = 13;self.classname = "info_player_start";spawnfunc_info_player_start();};
/*QUAKED spawnfunc_info_player_team3 (1 0 0) (-16 -16 -24) (16 16 24)
CTF Starting point for a player in
@@ -620,7 +620,7 @@
remove(self);
return;
}
- self.classname = "spawnfunc_ctf_team";
+ self.classname = "ctf_team";
self.team = self.cnt + 1;
};
@@ -630,7 +630,7 @@
local entity oldself;
oldself = self;
self = spawn();
- self.classname = "spawnfunc_ctf_team";
+ self.classname = "ctf_team";
self.netname = teamname;
self.cnt = teamcolor;
@@ -655,7 +655,7 @@
self.think = SUB_Remove;
self.nextthink = time;
// if no teams are found, spawn defaults
- if (find(world, classname, "spawnfunc_ctf_team") == world)
+ if (find(world, classname, "ctf_team") == world)
ctf_spawnteams();
};
Modified: trunk/data/qcsrc/server/domination.qc
===================================================================
--- trunk/data/qcsrc/server/domination.qc 2008-06-02 18:53:22 UTC (rev 3682)
+++ trunk/data/qcsrc/server/domination.qc 2008-06-03 05:43:04 UTC (rev 3683)
@@ -166,9 +166,9 @@
return;
// only valid teams can claim it
- head = find(world, classname, "spawnfunc_dom_team");
+ head = find(world, classname, "dom_team");
while (head && head.team != other.team)
- head = find(head, classname, "spawnfunc_dom_team");
+ head = find(head, classname, "dom_team");
if (!head || head.netname == "" || head == self.goalentity)
return;
@@ -186,9 +186,9 @@
//self.think = dompoint_captured;
// go to neutral team in the mean time
- head = find(world, classname, "spawnfunc_dom_team");
+ head = find(world, classname, "dom_team");
while (head && head.netname != "")
- head = find(head, classname, "spawnfunc_dom_team");
+ head = find(head, classname, "dom_team");
if(head == world)
return;
@@ -239,7 +239,7 @@
precache_sound(self.noise);
if (self.noise1 != "")
precache_sound(self.noise1);
- self.classname = "spawnfunc_dom_team";
+ self.classname = "dom_team";
setmodel(self, self.model); // precision not needed
self.mdl = self.model;
self.dmg = self.modelindex;
@@ -253,9 +253,9 @@
{
local entity head;
// find the spawnfunc_dom_team representing unclaimed points
- head = find(world, classname, "spawnfunc_dom_team");
+ head = find(world, classname, "dom_team");
while(head && head.netname != "")
- head = find(head, classname, "spawnfunc_dom_team");
+ head = find(head, classname, "dom_team");
if (!head)
objerror("no spawnfunc_dom_team with netname \"\" found\n");
@@ -308,7 +308,7 @@
totalteams = 0;
// first find out what teams are allowed
- head = find(world, classname, "spawnfunc_dom_team");
+ head = find(world, classname, "dom_team");
while(head)
{
if(head.netname != "")
@@ -332,7 +332,7 @@
c4 = 0;
}
}
- head = find(head, classname, "spawnfunc_dom_team");
+ head = find(head, classname, "dom_team");
}
// make sure there are at least 2 teams to join
@@ -510,7 +510,7 @@
local entity oldself;
oldself = self;
self = spawn();
- self.classname = "spawnfunc_dom_team";
+ self.classname = "dom_team";
self.netname = teamname;
self.cnt = teamcolor;
self.model = pointmodel;
@@ -537,7 +537,7 @@
local entity oldself;
oldself = self;
self = spawn();
- self.classname = "spawnfunc_dom_controlpoint";
+ self.classname = "dom_controlpoint";
self.think = spawnfunc_dom_controlpoint;
self.nextthink = time;
self.origin = org;
@@ -568,10 +568,10 @@
self.think = SUB_Remove;
self.nextthink = time;
// if no teams are found, spawn defaults
- if (find(world, classname, "spawnfunc_dom_team") == world)
+ if (find(world, classname, "dom_team") == world)
dom_spawnteams();
// if no control points are found, spawn defaults
- if (find(world, classname, "spawnfunc_dom_controlpoint") == world)
+ if (find(world, classname, "dom_controlpoint") == world)
{
// here follow default domination points for each map
/*
@@ -583,11 +583,11 @@
*/
{
// if no supported map was found, make every deathmatch spawn a point
- head = find(world, classname, "spawnfunc_info_player_deathmatch");
+ head = find(world, classname, "info_player_deathmatch");
while (head)
{
dom_spawnpoint(head.origin);
- head = find(head, classname, "spawnfunc_info_player_deathmatch");
+ head = find(head, classname, "info_player_deathmatch");
}
}
}
Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc 2008-06-02 18:53:22 UTC (rev 3682)
+++ trunk/data/qcsrc/server/g_world.qc 2008-06-03 05:43:04 UTC (rev 3683)
@@ -891,7 +891,7 @@
}
// then look for the start position
- spot = find (world, classname, "spawnfunc_info_player_start");
+ spot = find (world, classname, "info_player_start");
if (spot)
return spot;
@@ -901,7 +901,7 @@
return spot;
// then look for the start position
- spot = find (world, classname, "spawnfunc_info_player_deathmatch");
+ spot = find (world, classname, "info_player_deathmatch");
if (spot)
return spot;
@@ -1185,7 +1185,7 @@
local float t1, t2, t3, t4;
// first check if the game has ended
t1 = t2 = t3 = t4 = 0;
- head = find(world, classname, "spawnfunc_onslaught_generator");
+ head = find(world, classname, "onslaught_generator");
while (head)
{
if (head.health > 0)
@@ -1195,7 +1195,7 @@
if (head.team == COLOR_TEAM3) t3 = 1;
if (head.team == COLOR_TEAM4) t4 = 1;
}
- head = find(head, classname, "spawnfunc_onslaught_generator");
+ head = find(head, classname, "onslaught_generator");
}
if (t1 + t2 + t3 + t4 < 2)
{
@@ -1250,7 +1250,7 @@
}
local entity ent;
- ent = find(world, classname, "spawnfunc_target_assault_roundend");
+ ent = find(world, classname, "target_assault_roundend");
if(ent)
{
if(ent.winning) // round end has been triggered by attacking team
@@ -1657,7 +1657,7 @@
team4_score = 1;
}
- for(head = world; (head = find(head, classname, "spawnfunc_info_player_deathmatch")) != world; )
+ for(head = world; (head = find(head, classname, "info_player_deathmatch")) != world; )
{
if(head.team == COLOR_TEAM1)
team1_score = 1;
Modified: trunk/data/qcsrc/server/havocbot_roles.qc
===================================================================
--- trunk/data/qcsrc/server/havocbot_roles.qc 2008-06-02 18:53:22 UTC (rev 3682)
+++ trunk/data/qcsrc/server/havocbot_roles.qc 2008-06-03 05:43:04 UTC (rev 3683)
@@ -36,7 +36,7 @@
void(float ratingscale, vector org, float sradius) havocbot_goalrating_controlpoints =
{
local entity head;
- head = findchain(classname, "spawnfunc_dom_controlpoint");
+ head = findchain(classname, "dom_controlpoint");
while (head)
{
if (vlen(head.origin - org) < sradius)
@@ -59,7 +59,7 @@
void(float ratingscale, vector org, float sradius) havocbot_goalrating_waypoints =
{
local entity head;
- head = findchain(classname, "spawnfunc_waypoint");
+ head = findchain(classname, "waypoint");
while (head)
{
if (vlen(head.origin - org) < sradius && vlen(head.origin - org) > 100)
Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc 2008-06-02 18:53:22 UTC (rev 3682)
+++ trunk/data/qcsrc/server/miscfunctions.qc 2008-06-03 05:43:04 UTC (rev 3683)
@@ -303,14 +303,14 @@
void() spawnfunc_target_location =
{
- self.classname = "spawnfunc_target_location";
+ self.classname = "target_location";
// location name in netname
// eventually support: count, teamgame selectors, line of sight?
};
void() spawnfunc_info_location =
{
- self.classname = "spawnfunc_target_location";
+ self.classname = "target_location";
self.message = self.netname;
};
@@ -319,7 +319,7 @@
entity loc;
string ret;
ret = "somewhere";
- loc = findnearest(p, classname, "spawnfunc_target_location", '1 1 1');
+ loc = findnearest(p, classname, "target_location", '1 1 1');
if(loc)
{
ret = loc.message;
Modified: trunk/data/qcsrc/server/mode_onslaught.qc
===================================================================
--- trunk/data/qcsrc/server/mode_onslaught.qc 2008-06-02 18:53:22 UTC (rev 3682)
+++ trunk/data/qcsrc/server/mode_onslaught.qc 2008-06-03 05:43:04 UTC (rev 3683)
@@ -20,9 +20,9 @@
local float stop, t1, t2, t3, t4;
// first check if the game has ended
dprint("--- updatelinks ---\n");
- links = findchain(classname, "spawnfunc_onslaught_link");
+ links = findchain(classname, "onslaught_link");
// mark generators as being shielded and networked
- l = findchain(classname, "spawnfunc_onslaught_generator");
+ l = findchain(classname, "onslaught_generator");
while (l)
{
if (l.iscaptured)
@@ -34,7 +34,7 @@
l = l.chain;
}
// mark points as shielded and not networked
- l = findchain(classname, "spawnfunc_onslaught_controlpoint");
+ l = findchain(classname, "onslaught_controlpoint");
while (l)
{
l.islinked = FALSE;
@@ -93,7 +93,7 @@
{
dprint(etos(l), " (link) is unshielding ", etos(l.enemy), " (point) because its team does not match ", etos(l.goalentity), " (point)\n");
l.enemy.isshielded = FALSE;
- if(l.goalentity.classname == "spawnfunc_onslaught_generator")
+ if(l.goalentity.classname == "onslaught_generator")
{
if(l.goalentity.team == COLOR_TEAM1)
l.enemy.isgenneighbor_red = TRUE;
@@ -112,7 +112,7 @@
{
dprint(etos(l), " (link) is unshielding ", etos(l.goalentity), " (point) because its team does not match ", etos(l.enemy), " (point)\n");
l.goalentity.isshielded = FALSE;
- if(l.enemy.classname == "spawnfunc_onslaught_generator")
+ if(l.enemy.classname == "onslaught_generator")
{
if(l.enemy.team == COLOR_TEAM1)
l.goalentity.isgenneighbor_red = TRUE;
@@ -131,7 +131,7 @@
l = l.chain;
}
// now update the takedamage and alpha variables on generator shields
- l = findchain(classname, "spawnfunc_onslaught_generator");
+ l = findchain(classname, "onslaught_generator");
while (l)
{
if (l.isshielded)
@@ -151,7 +151,7 @@
l = l.chain;
}
// now update the takedamage and alpha variables on control point icons
- l = findchain(classname, "spawnfunc_onslaught_controlpoint");
+ l = findchain(classname, "onslaught_controlpoint");
while (l)
{
if (l.isshielded)
@@ -178,7 +178,7 @@
}
// count generators owned by each team
t1 = t2 = t3 = t4 = 0;
- l = findchain(classname, "spawnfunc_onslaught_generator");
+ l = findchain(classname, "onslaught_generator");
while (l)
{
if (l.iscaptured)
@@ -219,7 +219,7 @@
// check to see if this player has a legitimate claim to capture this
// control point - more specifically that there is a captured path of
// points leading back to the team generator
- e = findchain(classname, "spawnfunc_onslaught_link");
+ e = findchain(classname, "onslaught_link");
while (e)
{
if (e.goalentity == cp)
@@ -321,7 +321,7 @@
// control points reduce the overtime duration.
sound(self, CHAN_AUTO, "sound/onslaught/generator_decay.wav", 1, ATTN_NORM);
d = 1;
- e = findchain(classname, "spawnfunc_onslaught_controlpoint");
+ e = findchain(classname, "onslaught_controlpoint");
while (e)
{
if (e.team != self.team)
Modified: trunk/data/qcsrc/server/runematch.qc
===================================================================
--- trunk/data/qcsrc/server/runematch.qc 2008-06-02 18:53:22 UTC (rev 3682)
+++ trunk/data/qcsrc/server/runematch.qc 2008-06-03 05:43:04 UTC (rev 3683)
@@ -102,7 +102,7 @@
float num;
entity e;
num = 0;
- e = findchain(classname, "spawnfunc_runematch_spawn_point");
+ e = findchain(classname, "runematch_spawn_point");
while(e)
{
num = num + 1;
@@ -118,9 +118,9 @@
e = world;
do
{
- e = find(e, classname, "spawnfunc_runematch_spawn_point");
+ e = find(e, classname, "runematch_spawn_point");
if(!e)
- e = find(e, classname, "spawnfunc_runematch_spawn_point");
+ e = find(e, classname, "runematch_spawn_point");
if(!e)
break;
@@ -187,7 +187,7 @@
return; // "notouch" time isn't finished
// detach from the spawn point you're on
- if(self.owner.classname == "spawnfunc_runematch_spawn_point")
+ if(self.owner.classname == "runematch_spawn_point")
{
self.owner.owner = world;
self.owner = world;
@@ -230,7 +230,7 @@
num = count_rune_spawnpoints();
r = ceil(random()*num);
- if(self.owner.classname == "spawnfunc_runematch_spawn_point")
+ if(self.owner.classname == "runematch_spawn_point")
{
self.owner.owner = world;
self.owner = world;
@@ -436,13 +436,13 @@
void spawn_default_runespawnpoints()
{
entity spot, e;
- spot = find(world, classname, "spawnfunc_info_player_deathmatch");
+ spot = find(world, classname, "info_player_deathmatch");
while(spot)
{
e = spawn();
- e.classname = "spawnfunc_runematch_spawn_point";
+ e.classname = "runematch_spawn_point";
e.origin = spot.origin;
- spot = find(spot, classname, "spawnfunc_info_player_deathmatch");
+ spot = find(spot, classname, "info_player_deathmatch");
}
}
Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc 2008-06-02 18:53:22 UTC (rev 3682)
+++ trunk/data/qcsrc/server/t_items.qc 2008-06-03 05:43:04 UTC (rev 3683)
@@ -789,7 +789,7 @@
}
// compatibility:
-void spawnfunc_item_quad (void) {self.classname = "spawnfunc_item_strength";spawnfunc_item_strength();}
+void spawnfunc_item_quad (void) {self.classname = "item_strength";spawnfunc_item_strength();}
void spawnfunc_misc_models (void)
{
Modified: trunk/data/qcsrc/server/t_jumppads.qc
===================================================================
--- trunk/data/qcsrc/server/t_jumppads.qc 2008-06-02 18:53:22 UTC (rev 3682)
+++ trunk/data/qcsrc/server/t_jumppads.qc 2008-06-03 05:43:04 UTC (rev 3683)
@@ -187,7 +187,7 @@
self.enemy = find(world, targetname, self.target);
if (!self.enemy)
{
- objerror("spawnfunc_trigger_push: target not found\n");
+ objerror("trigger_push: target not found\n");
remove(self);
return;
}
Modified: trunk/data/qcsrc/server/t_plats.qc
===================================================================
--- trunk/data/qcsrc/server/t_plats.qc 2008-06-02 18:53:22 UTC (rev 3682)
+++ trunk/data/qcsrc/server/t_plats.qc 2008-06-03 05:43:04 UTC (rev 3683)
@@ -290,7 +290,7 @@
if (!self.speed)
self.speed = 100;
if (!self.target)
- objerror ("spawnfunc_func_train without a target");
+ objerror ("func_train without a target");
if (self.sounds == 0)
{
@@ -364,7 +364,7 @@
void() spawnfunc_func_train =
{
if (!self.target)
- objerror("spawnfunc_func_train without a target");
+ objerror("func_train without a target");
if (!self.speed)
self.speed = 100;
Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc 2008-06-02 18:53:22 UTC (rev 3682)
+++ trunk/data/qcsrc/server/teamplay.qc 2008-06-03 05:43:04 UTC (rev 3683)
@@ -569,7 +569,7 @@
// onslaught is special
if(g_onslaught)
{
- head = findchain(classname, "spawnfunc_onslaught_generator");
+ head = findchain(classname, "onslaught_generator");
while (head)
{
if (head.team == COLOR_TEAM1) c1 = 0;
@@ -582,9 +582,9 @@
}
if(g_domination)
- teament_name = "spawnfunc_dom_team";
+ teament_name = "dom_team";
else if(g_ctf)
- teament_name = "spawnfunc_ctf_team";
+ teament_name = "ctf_team";
else if(g_tdm)
teament_name = "tdm_team";
else if(g_assault)
Modified: trunk/data/qcsrc/server/waypointsprites.qc
===================================================================
--- trunk/data/qcsrc/server/waypointsprites.qc 2008-06-02 18:53:22 UTC (rev 3682)
+++ trunk/data/qcsrc/server/waypointsprites.qc 2008-06-03 05:43:04 UTC (rev 3683)
@@ -248,7 +248,7 @@
if(spr != "")
setmodel(wp, strcat("models/sprites/", spr, ".sp2")); // precision set above
else
- wp.model = "spawnfunc_waypoint";
+ wp.model = "waypoint";
setsize(wp, '0 0 0', '0 0 0');
wp.waypointsprite_for_player = waypointsprite_for_player_default;
return wp;
More information about the nexuiz-commits
mailing list