r3747 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Tue Jul 1 01:28:40 EDT 2008
Author: div0
Date: 2008-07-01 01:28:38 -0400 (Tue, 01 Jul 2008)
New Revision: 3747
Modified:
trunk/data/qcsrc/server/bots.qc
trunk/data/qcsrc/server/builtins.qh
trunk/data/qcsrc/server/campaign.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/cl_player.qc
trunk/data/qcsrc/server/cl_weapons.qc
trunk/data/qcsrc/server/cl_weaponsystem.qc
trunk/data/qcsrc/server/ctf.qc
trunk/data/qcsrc/server/defs.qh
trunk/data/qcsrc/server/domination.qc
trunk/data/qcsrc/server/g_casings.qc
trunk/data/qcsrc/server/g_damage.qc
trunk/data/qcsrc/server/g_decors.qc
trunk/data/qcsrc/server/g_lights.qc
trunk/data/qcsrc/server/g_subs.qc
trunk/data/qcsrc/server/g_tetris.qc
trunk/data/qcsrc/server/g_triggers.qc
trunk/data/qcsrc/server/g_violence.qc
trunk/data/qcsrc/server/g_world.qc
trunk/data/qcsrc/server/havocbot.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/t_halflife.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/t_teleporters.qc
trunk/data/qcsrc/server/teamplay.qc
trunk/data/qcsrc/server/w_crylink.qc
trunk/data/qcsrc/server/w_electro.qc
trunk/data/qcsrc/server/w_grenadelauncher.qc
trunk/data/qcsrc/server/w_hagar.qc
trunk/data/qcsrc/server/w_laser.qc
trunk/data/qcsrc/server/w_nex.qc
trunk/data/qcsrc/server/w_rocketlauncher.qc
trunk/data/qcsrc/server/w_shotgun.qc
trunk/data/qcsrc/server/w_uzi.qc
Log:
change all function declarations (except builtins and data types) to ANSI C-like syntax, to help source code cross-reference tools.
Modified: trunk/data/qcsrc/server/bots.qc
===================================================================
--- trunk/data/qcsrc/server/bots.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/bots.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -4,7 +4,7 @@
vector stepheightvec;
float navigation_testtracewalk;
-float(entity e, vector start, vector m1, vector m2, vector end, float movemode) tracewalk =
+float tracewalk(entity e, vector start, vector m1, vector m2, vector end, float movemode)
{
local vector org;
local vector move;
@@ -177,7 +177,7 @@
// 'end' vector is the place it aims for,
// returns TRUE only if it hit targ (don't target non-solid entities)
vector findtrajectory_velocity;
-float(vector org, vector m1, vector m2, entity targ, float shotspeed, float shotspeedupward, float maxtime, float shotdelay, entity ignore) findtrajectorywithleading =
+float findtrajectorywithleading(vector org, vector m1, vector m2, entity targ, float shotspeed, float shotspeedupward, float maxtime, float shotdelay, entity ignore)
{
local float c, savesolid, shottime;
local vector dir, end, v;
@@ -304,7 +304,7 @@
.vector lag5_vec3;
.vector lag5_vec4;
-void() lag_update =
+void lag_update()
{
if (self.lag1_time) if (time > self.lag1_time) {self.lag_func(self.lag1_time, self.lag1_float1, self.lag1_float2, self.lag1_entity1, self.lag1_vec1, self.lag1_vec2, self.lag1_vec3, self.lag1_vec4);self.lag1_time = 0;}
if (self.lag2_time) if (time > self.lag2_time) {self.lag_func(self.lag2_time, self.lag2_float1, self.lag2_float2, self.lag2_entity1, self.lag2_vec1, self.lag2_vec2, self.lag2_vec3, self.lag2_vec4);self.lag2_time = 0;}
@@ -313,7 +313,7 @@
if (self.lag5_time) if (time > self.lag5_time) {self.lag_func(self.lag5_time, self.lag5_float1, self.lag5_float2, self.lag5_entity1, self.lag5_vec1, self.lag5_vec2, self.lag5_vec3, self.lag5_vec4);self.lag5_time = 0;}
};
-float(float t, float f1, float f2, entity e1, vector v1, vector v2, vector v3, vector v4) lag_additem =
+float lag_additem(float t, float f1, float f2, entity e1, vector v1, vector v2, vector v3, vector v4)
{
if (self.lag1_time == 0) {self.lag1_time = t;self.lag1_float1 = f1;self.lag1_float2 = f2;self.lag1_entity1 = e1;self.lag1_vec1 = v1;self.lag1_vec2 = v2;self.lag1_vec3 = v3;self.lag1_vec4 = v4;return TRUE;}
if (self.lag2_time == 0) {self.lag2_time = t;self.lag2_float1 = f1;self.lag2_float2 = f2;self.lag2_entity1 = e1;self.lag2_vec1 = v1;self.lag2_vec2 = v2;self.lag2_vec3 = v3;self.lag2_vec4 = v4;return TRUE;}
@@ -382,7 +382,7 @@
float WAYPOINTFLAG_NORELINK = 1048576;
// add a new link to the spawnfunc_waypoint, replacing the furthest link it already has
-void(entity from, entity to) waypoint_addlink =
+void waypoint_addlink(entity from, entity to)
{
local float c;
@@ -461,7 +461,7 @@
// relink this spawnfunc_waypoint
// (precompile a list of all reachable waypoints from this spawnfunc_waypoint)
// (SLOW!)
-void() waypoint_think =
+void waypoint_think()
{
local entity e;
local vector sv, sm1, sm2, ev, em1, em2, dv;
@@ -527,7 +527,7 @@
navigation_testtracewalk = 0;
};
-void(entity wp) waypoint_clearlinks =
+void waypoint_clearlinks(entity wp)
{
// clear links to other waypoints
local float f;
@@ -539,7 +539,7 @@
};
// tell a spawnfunc_waypoint to relink
-void(entity wp) waypoint_schedulerelink =
+void waypoint_schedulerelink(entity wp)
{
if (wp == world)
return;
@@ -574,7 +574,7 @@
// create a new spawnfunc_waypoint and automatically link it to other waypoints, and link
// them back to it as well
// (suitable for spawnfunc_waypoint editor)
-entity(vector m1, vector m2, float f) waypoint_spawn =
+entity waypoint_spawn(vector m1, vector m2, float f)
{
local entity w;
local vector org;
@@ -665,7 +665,7 @@
};
// spawnfunc_waypoint map entity
-void() spawnfunc_waypoint =
+void spawnfunc_waypoint()
{
setorigin(self, self.origin);
// schedule a relink after other waypoints have had a chance to spawn
@@ -674,7 +674,7 @@
};
// remove a spawnfunc_waypoint, and schedule all neighbors to relink
-void(entity e) waypoint_remove =
+void waypoint_remove(entity e)
{
// tell all linked waypoints that they need to relink
waypoint_schedulerelink(e.wp00);
@@ -714,7 +714,7 @@
};
// empties the map of waypoints
-void() waypoint_removeall =
+void waypoint_removeall()
{
local entity head, next;
head = findchain(classname, "waypoint");
@@ -728,7 +728,7 @@
// tell all waypoints to relink
// (is this useful at all?)
-void() waypoint_schedulerelinkall =
+void waypoint_schedulerelinkall()
{
local entity head;
head = findchain(classname, "waypoint");
@@ -741,7 +741,7 @@
// save waypoints to gamedir/data/maps/mapname.waypoints
// TODO: support saving wayboxes
-void() waypoint_saveall =
+void waypoint_saveall()
{
local string filename, s;
local float file, c;
@@ -783,7 +783,7 @@
};
// load waypoints from file
-float() waypoint_loadall =
+float waypoint_loadall()
{
local string filename, s;
local float file, cwp, cwb, fl;
@@ -833,7 +833,7 @@
return cwp + cwb;
};
-void(entity e) waypoint_spawnforitem =
+void waypoint_spawnforitem(entity e)
{
local entity w;
local vector org;
@@ -869,7 +869,7 @@
e.nearestwaypoint = waypoint_spawn(org, org, WAYPOINTFLAG_GENERATED | WAYPOINTFLAG_ITEM);
};
-void(entity e, vector destination, float timetaken) waypoint_spawnforteleporter =
+void waypoint_spawnforteleporter(entity e, vector destination, float timetaken)
{
local entity w;
local entity dw;
@@ -893,7 +893,7 @@
/////////////////////////////////////////////////////////////////////////////
// completely empty the goal stack, used when deciding where to go
-void() navigation_clearroute =
+void navigation_clearroute()
{
self.goalcurrent = world;
self.goalstack01 = world;
@@ -931,7 +931,7 @@
// add a new goal at the beginning of the stack
// (in other words: add a new prerequisite before going to the later goals)
-void(entity e) navigation_pushroute =
+void navigation_pushroute(entity e)
{
self.goalstack31 = self.goalstack30;
self.goalstack30 = self.goalstack29;
@@ -970,7 +970,7 @@
// remove first goal from stack
// (in other words: remove a prerequisite for reaching the later goals)
// (used when a spawnfunc_waypoint is reached)
-void() navigation_poproute =
+void navigation_poproute()
{
self.goalcurrent = self.goalstack01;
self.goalstack01 = self.goalstack02;
@@ -1007,7 +1007,7 @@
};
// find the spawnfunc_waypoint near a dynamic goal such as a dropped weapon
-entity(entity player, float walkfromwp) navigation_findnearestwaypoint =
+entity navigation_findnearestwaypoint(entity player, float walkfromwp)
{
local entity waylist, w, best;
local float dist, bestdist;
@@ -1079,7 +1079,7 @@
}
// finds the waypoints near the bot initiating a navigation query
-float(entity waylist, float maxdist) navigation_markroutes_nearestwaypoints =
+float navigation_markroutes_nearestwaypoints(entity waylist, float maxdist)
{
local entity head;
local vector v, m1, m2, diff;
@@ -1124,7 +1124,7 @@
}
// updates a path link if a spawnfunc_waypoint link is better than the current one
-void(entity w, entity wp, float cost2, vector p) navigation_markroutes_checkwaypoint =
+void navigation_markroutes_checkwaypoint(entity w, entity wp, float cost2, vector p)
{
local vector m1;
local vector m2;
@@ -1150,7 +1150,7 @@
};
// queries the entire spawnfunc_waypoint network for pathes leading away from the bot
-void() navigation_markroutes =
+void navigation_markroutes()
{
local entity w, wp, waylist;
local float searching, cost, cost2;
@@ -1225,7 +1225,7 @@
// updates the best goal according to a weighted calculation of travel cost and item value of a new proposed item
.void() havocbot_role;
void() havocbot_role_ctf_offense;
-void(entity e, float f, float rangebias) navigation_routerating =
+void navigation_routerating(entity e, float f, float rangebias)
{
if (!e)
return;
@@ -1258,7 +1258,7 @@
};
// replaces the goal stack with the path to a given item
-void(entity e) navigation_routetogoal =
+void navigation_routetogoal(entity e)
{
// if already going to this goal, don't stop
//if (self.goalentity == e)
@@ -1300,7 +1300,7 @@
// removes any currently touching waypoints from the goal stack
// (this is how bots detect if they have reached a goal)
-void() navigation_poptouchedgoals =
+void navigation_poptouchedgoals()
{
local vector org, m1, m2;
org = self.origin;// + self.velocity * 0.1;
@@ -1311,7 +1311,7 @@
}
// begin a goal selection session (queries spawnfunc_waypoint network)
-void() navigation_goalrating_start =
+void navigation_goalrating_start()
{
navigation_bestrating = -1;
navigation_bestgoal = world;
@@ -1319,7 +1319,7 @@
};
// ends a goal selection session (updates goal stack to the best goal)
-void() navigation_goalrating_end =
+void navigation_goalrating_end()
{
if (self.havocbot_role == havocbot_role_ctf_offense)
dprint(navigation_bestgoal.classname, " (with rating ", ftos(navigation_bestrating), ")\n");
@@ -1373,7 +1373,7 @@
const float BOTSKINS = 19;
const float BOTNAMES = 32;
-string(float r) bot_namefornumber =
+string bot_namefornumber(float r)
{
if (r < 1) return "Thunderstorm";
if (r < 2) return "Darkness";
@@ -1409,7 +1409,7 @@
return "Flatline";
};
-string(float r) bot_skinfornumber =
+string bot_skinfornumber(float r)
{
if (r < 1) {self.playermodel = "models/player/carni.zym" ;self.playerskin = "0";return "Carni" ;}
else if (r < 2) {self.playermodel = "models/player/carni.zym" ;self.playerskin = "1";return "Armored Carni" ;}
@@ -1431,7 +1431,7 @@
else {self.playermodel = "models/player/visitant.zym" ;self.playerskin = "0";return "Fricka" ;}
};
-void() bot_setnameandstuff =
+void bot_setnameandstuff()
{
local string name, prefix, suffix;
local float r, b, shirt, pants;
@@ -1497,7 +1497,7 @@
self.netname = name;
};
-void() bot_endgame =
+void bot_endgame()
{
local entity e;
//dprint("bot_endgame\n");
@@ -1511,7 +1511,7 @@
};
float bot_ignore_bots; // let bots not attack other bots (only works in non-teamplay)
-float(entity e) bot_shouldattack =
+float bot_shouldattack(entity e)
{
if (e.team == self.team)
{
@@ -1534,7 +1534,7 @@
return TRUE;
};
-void(float t, float f1, float f2, entity e1, vector v1, vector v2, vector v3, vector v4) bot_lagfunc =
+void bot_lagfunc(float t, float f1, float f2, entity e1, vector v1, vector v2, vector v3, vector v4)
{
self.bot_aimtarg = e1;
self.bot_aimlatency = self.ping; // FIXME? Shouldn't this be in the lag item?
@@ -1563,7 +1563,7 @@
.vector bot_4th_order_aimfilter;
.vector bot_5th_order_aimfilter;
.vector bot_olddesiredang;
-float(vector v, float maxfiredeviation) bot_aimdir =
+float bot_aimdir(vector v, float maxfiredeviation)
{
/*
local float snapcos;
@@ -1738,13 +1738,13 @@
return self.bot_canfire && (time < self.bot_firetimer);
};
-vector(vector targorigin, vector targvelocity, float shotspeed, float shotdelay) bot_shotlead =
+vector bot_shotlead(vector targorigin, vector targvelocity, float shotspeed, float shotdelay)
{
// Try to add code here that predicts gravity effect here, no clue HOW to though ... well not yet atleast...
return targorigin + targvelocity * (shotdelay + vlen(targorigin - shotorg) / shotspeed);
};
-float(float shotspeed, float shotspeedupward, float maxshottime, float applygravity) bot_aim =
+float bot_aim(float shotspeed, float shotspeedupward, float maxshottime, float applygravity)
{
local float f, r;
local vector v;
@@ -1802,7 +1802,7 @@
};
// TODO: move this painintensity code to the player damage code
-void() bot_think =
+void bot_think()
{
if (self.bot_nextthink > time)
return;
@@ -1867,7 +1867,7 @@
float bot_strategytoken_taken;
entity player_list;
.entity nextplayer;
-void() bot_relinkplayerlist =
+void bot_relinkplayerlist()
{
local entity e;
local entity prevbot;
@@ -1899,7 +1899,7 @@
void() havocbot_setupbot;
float JoinBestTeam(entity pl, float only_return_best, float forcebestteam);
-void() bot_clientconnect =
+void bot_clientconnect()
{
if (clienttype(self) != CLIENTTYPE_BOT)
return;
@@ -1916,7 +1916,7 @@
self.bot_offsetskill=random()-0.5;
};
-entity() bot_spawn =
+entity bot_spawn()
{
local entity oldself, bot;
bot = spawnclient();
@@ -1934,7 +1934,7 @@
};
void CheckAllowedTeams(entity for_whom); void GetTeamCounts(entity other); float c1, c2, c3, c4;
-void() bot_removefromlargestteam =
+void bot_removefromlargestteam()
{
local float besttime, bestcount, thiscount;
local entity best, head;
@@ -1975,7 +1975,7 @@
dropclient(best);
};
-void() bot_removenewest =
+void bot_removenewest()
{
local float besttime;
local entity best, head;
@@ -2005,7 +2005,7 @@
};
float botframe_waypointeditorlightningtime;
-void() botframe_showwaypointlinks =
+void botframe_showwaypointlinks()
{
local entity player, head, w;
if (time < botframe_waypointeditorlightningtime)
@@ -2062,7 +2062,7 @@
};
entity botframe_dangerwaypoint;
-void(float maxupdate) botframe_updatedangerousobjects =
+void botframe_updatedangerousobjects(float maxupdate)
{
local entity head, bot_dodgelist;
local vector m1, m2, v;
@@ -2106,7 +2106,7 @@
float autoskill_nextthink;
.float totalfrags_lastcheck;
-void(float factor) autoskill =
+void autoskill(float factor)
{
float bestbot;
float bestplayer;
@@ -2158,7 +2158,7 @@
head.totalfrags_lastcheck = head.totalfrags;
}
-void() bot_serverframe =
+void bot_serverframe()
{
float realplayers, bots, activerealplayers;
entity head;
Modified: trunk/data/qcsrc/server/builtins.qh
===================================================================
--- trunk/data/qcsrc/server/builtins.qh 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/builtins.qh 2008-07-01 05:28:38 UTC (rev 3747)
@@ -19,10 +19,10 @@
entity find (entity start, .string fld, string match) = #18;
//string precache_sound (string s) = #19;
string precache_model (string s) = #20;
-//void(entity client, string s)stuffcmd = #21;
+void(entity client, string s) stuffcmd = #21;
entity findradius (vector org, float rad) = #22;
void bprint (string s, ...) = #23;
-//void(entity client, string s) sprint = #24;
+void(entity client, string s) sprint = #24;
//void dprint (string s, ...) = #25; // aliased in util.qh
string ftos (float f) = #26;
string vtos (vector v) = #27;
@@ -42,7 +42,7 @@
float pointcontents (vector v) = #41;
float fabs (float f) = #43;
-//vector(entity e, float speed) aim = #44;
+vector(entity e, float speed) aim = #44;
float cvar (string s) = #45;
void localcmd (string s) = #46;
entity nextent (entity e) = #47;
@@ -50,8 +50,14 @@
void ChangeYaw (void) = #49;
vector vectoangles (vector v) = #51;
-//void(float to, float f) WriteByte = #52;
-//void(float to, float f) WriteCoord = #56;
+void(float to, float f) WriteByte = #52;
+void(float to, float f) WriteChar = #53;
+void(float to, float f) WriteShort = #54;
+void(float to, float f) WriteLong = #55;
+void(float to, float f) WriteCoord = #56;
+void(float to, float f) WriteAngle = #57;
+void(float to, string s) WriteString = #58;
+void(float to, entity s) WriteEntity = #59;
void movetogoal (float step) = #67;
string precache_file (string s) = #68;
void makestatic (entity e) = #69;
@@ -63,3 +69,4 @@
string precache_model2 (string s) = #75;
string precache_sound2 (string s) = #76;
string precache_file2 (string s) = #77;
+void(entity e) setspawnparms = #78;
Modified: trunk/data/qcsrc/server/campaign.qc
===================================================================
--- trunk/data/qcsrc/server/campaign.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/campaign.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -9,14 +9,14 @@
string campaign_index_var;
float checkrules_equality;
-void(string s) CampaignBailout =
+void CampaignBailout(string s)
{
cvar_set("g_campaign", "0");
ServerConsoleEcho(strcat("campaign initialization failed: ", s), TRUE);
return;
}
-void() CampaignPreInit =
+void CampaignPreInit()
{
float baseskill;
string title;
@@ -44,7 +44,7 @@
}
string GetMapname();
-void() CampaignPostInit =
+void CampaignPostInit()
{
// now some sanity checks
string thismapname, wantedmapname;
@@ -106,7 +106,7 @@
}
}
-void() CampaignPreIntermission =
+void CampaignPreIntermission()
{
entity head;
float won;
@@ -159,7 +159,7 @@
}
}
-void() CampaignPostIntermission =
+void CampaignPostIntermission()
{
// NOTE: campaign_won is 0 or 1, that is, points to the next level
@@ -181,7 +181,7 @@
-void(float n) CampaignLevelWarp =
+void CampaignLevelWarp(float n)
{
if(!sv_cheats)
return;
Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/cl_client.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -17,7 +17,7 @@
relocate_spawnpoint();
}
-void() spawnpoint_use =
+void spawnpoint_use()
{
if(teams_matter)
if(have_team_spawns)
@@ -1154,7 +1154,7 @@
}
.float BUTTON_CHAT;
-void() ChatBubbleThink =
+void ChatBubbleThink()
{
self.nextthink = time;
if (!self.owner.modelindex || self.owner.chatbubbleentity != self)
@@ -1170,7 +1170,7 @@
self.model = "";
};
-void() UpdateChatBubble =
+void UpdateChatBubble()
{
if (!self.modelindex)
return;
@@ -1191,7 +1191,7 @@
}
-void() TeamBubbleThink =
+void TeamBubbleThink()
{
self.nextthink = time;
if (!self.owner.modelindex || self.owner.teambubbleentity != self)
@@ -1213,7 +1213,7 @@
return (self.owner != other && self.owner.team == other.team && other.killcount > -666);
}
-void() UpdateTeamBubble =
+void UpdateTeamBubble()
{
if (!self.modelindex || !cvar("teamplay"))
return;
@@ -1238,7 +1238,7 @@
// LordHavoc: this hack will be removed when proper _pants/_shirt layers are
// added to the model skins
-/*void() UpdateColorModHack =
+/*void UpdateColorModHack()
{
local float c;
c = self.clientcolors & 15;
Modified: trunk/data/qcsrc/server/cl_impulse.qc
===================================================================
--- trunk/data/qcsrc/server/cl_impulse.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/cl_impulse.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -21,7 +21,7 @@
}
// from dpmod
-void(entity e, vector v) printsurfaceinfo =
+void printsurfaceinfo(entity e, vector v)
{
local float surfnum, numpoints, vnum;
local string s;
Modified: trunk/data/qcsrc/server/cl_physics.qc
===================================================================
--- trunk/data/qcsrc/server/cl_physics.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/cl_physics.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -81,7 +81,7 @@
player_setanim(self.anim_jump, FALSE, TRUE, TRUE);
}
-void() CheckWaterJump =
+void CheckWaterJump()
{
local vector start, end;
Modified: trunk/data/qcsrc/server/cl_player.qc
===================================================================
--- trunk/data/qcsrc/server/cl_player.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/cl_player.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -66,7 +66,7 @@
}
float animparseerror;
-vector(float animfile) animparseline =
+vector animparseline(float animfile)
{
local string line;
local float c;
@@ -89,7 +89,7 @@
return anim;
};
-void() player_setupanimsformodel =
+void player_setupanimsformodel()
{
local string animfilename;
local float animfile;
@@ -158,7 +158,7 @@
player_setanim(self.anim_idle, TRUE, FALSE, TRUE);
};
-void(vector anim, float looping, float override, float restart) player_setanim =
+void player_setanim(vector anim, float looping, float override, float restart)
{
if (!restart)
if (anim_x == self.animstate_startframe)
@@ -175,7 +175,7 @@
self.frame = self.animstate_startframe;
};
-void() player_updateframe =
+void player_updateframe()
{
if (time >= self.animstate_endtime)
{
Modified: trunk/data/qcsrc/server/cl_weapons.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weapons.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/cl_weapons.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -1,7 +1,7 @@
// generic weapons table
// add new weapons here
-float(float wpn, float wrequest) weapon_action =
+float weapon_action(float wpn, float wrequest)
{
if (wpn == WEP_LASER)
return w_laser(wrequest);
@@ -162,7 +162,7 @@
};
// next weapon
-void() W_NextWeapon =
+void W_NextWeapon()
{
local float weaponwant, maxtries;
@@ -190,7 +190,7 @@
};
// prev weapon
-void() W_PreviousWeapon =
+void W_PreviousWeapon()
{
local float weaponwant, maxtries;
@@ -218,7 +218,7 @@
};
// Bringed back weapon frame
-void() W_WeaponFrame =
+void W_WeaponFrame()
{
if((arena_roundbased && time < warmup) || ((time < restart_countdown) && !cvar("sv_ready_restart_after_countdown")))
return;
Modified: trunk/data/qcsrc/server/cl_weaponsystem.qc
===================================================================
--- trunk/data/qcsrc/server/cl_weaponsystem.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/cl_weaponsystem.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -22,7 +22,7 @@
// this function calculates w_shotorg and w_shotdir based on the weapon model
// offset, trueaim and antilag, and won't put w_shotorg inside a wall.
// make sure you call makevectors first (FIXME?)
-void(entity ent, vector vecs, float antilag, float recoil, string snd) W_SetupShot =
+void W_SetupShot(entity ent, vector vecs, float antilag, float recoil, string snd)
{
float nudge = 1; // added to traceline target and subtracted from result
local vector trueaimpoint;
@@ -197,7 +197,7 @@
}
.string weaponname;
-void() CL_Weaponentity_Think =
+void CL_Weaponentity_Think()
{
self.nextthink = time;
if (intermission_running)
@@ -250,7 +250,7 @@
LaserTarget_Think();
};
-void() CL_ExteriorWeaponentity_Think =
+void CL_ExteriorWeaponentity_Think()
{
float tag_found;
self.nextthink = time;
@@ -296,7 +296,7 @@
};
// spawning weaponentity for client
-void() CL_SpawnWeaponentity =
+void CL_SpawnWeaponentity()
{
self.weaponentity = spawn();
self.weaponentity.solid = SOLID_NOT;
@@ -322,7 +322,7 @@
self.exteriorweaponentity.nextthink = time;
};
-float(entity cl, float wpn, float andammo, float complain) client_hasweapon =
+float client_hasweapon(entity cl, float wpn, float andammo, float complain)
{
local float itemcode, f;
local entity oldself;
@@ -365,7 +365,7 @@
};
// Weapon subs
-void() w_clear =
+void w_clear()
{
if (self.weapon != -1)
self.weapon = 0;
@@ -377,7 +377,7 @@
}
};
-void() w_ready =
+void w_ready()
{
if (self.weaponentity)
self.weaponentity.state = WS_READY;
@@ -410,7 +410,7 @@
};
// Setup weapon for client (after this raise frame will be launched)
-void(float windex, string wname, float hudammo) weapon_setup =
+void weapon_setup(float windex, string wname, float hudammo)
{
self.items = self.items - (self.items & (IT_SHELLS | IT_NAILS | IT_ROCKETS | IT_CELLS));
self.items = self.items | hudammo;
@@ -421,7 +421,7 @@
};
// perform weapon to attack (weaponstate and attack_finished check is here)
-float(float secondary, float attacktime) weapon_prepareattack =
+float weapon_prepareattack(float secondary, float attacktime)
{
//if sv_ready_restart_after_countdown is set, don't allow the player to shoot
//if all players readied up and the countdown is running
@@ -459,7 +459,7 @@
return TRUE;
};
-void(float fr, float t, void() func) weapon_thinkf =
+void weapon_thinkf(float fr, float t, void() func)
{
if (fr >= 0)
{
@@ -513,12 +513,12 @@
}
};
-void(float spd, vector org) weapon_boblayer1 =
+void weapon_boblayer1(float spd, vector org)
{
// VorteX: haste can be added here
};
-vector(vector pvelocity, vector mvelocity) W_CalculateProjectileVelocity =
+vector W_CalculateProjectileVelocity(vector pvelocity, vector mvelocity)
{
vector mdirection;
float mspeed;
@@ -589,7 +589,7 @@
return outvelocity;
}
-void(entity missile) W_SetupProjectileVelocity =
+void W_SetupProjectileVelocity(entity missile)
{
if(missile.owner == world)
error("Unowned missile");
@@ -597,7 +597,7 @@
missile.velocity = W_CalculateProjectileVelocity(missile.owner.velocity, missile.velocity);
}
-void(float wepcode, float minammo) weapon_register =
+void weapon_register(float wepcode, float minammo)
{
string s;
float itemcode;
Modified: trunk/data/qcsrc/server/ctf.qc
===================================================================
--- trunk/data/qcsrc/server/ctf.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/ctf.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -30,7 +30,7 @@
void() FlagThink;
void() FlagTouch;
-void() place_flag =
+void place_flag()
{
if(!self.t_width)
self.t_width = 0.1; // frame animation rate
@@ -76,7 +76,7 @@
GameLogEcho(s, FALSE);
}
-void(entity e) RegenFlag =
+void RegenFlag(entity e)
{
setattachment(e, world, "");
e.movetype = MOVETYPE_NONE;
@@ -91,7 +91,7 @@
e.flags = FL_ITEM; // clear FL_ONGROUND and any other junk
};
-void(entity e) ReturnFlag =
+void ReturnFlag(entity e)
{
if (e.owner)
if (e.owner.flagcarried == e)
@@ -106,7 +106,7 @@
RegenFlag(e);
};
-void(entity e) DropFlag =
+void DropFlag(entity e)
{
local entity p;
@@ -165,7 +165,7 @@
self.frame = 0;
}
-void() FlagThink =
+void FlagThink()
{
local entity e;
@@ -223,7 +223,7 @@
}
};
-void() FlagTouch =
+void FlagTouch()
{
if(gameover) return;
@@ -378,7 +378,7 @@
"angle"
viewing angle when spawning
*/
-void() spawnfunc_info_player_team1 =
+void spawnfunc_info_player_team1()
{
self.team = COLOR_TEAM1; // red
spawnfunc_info_player_deathmatch();
@@ -393,7 +393,7 @@
"angle"
viewing angle when spawning
*/
-void() spawnfunc_info_player_team2 =
+void spawnfunc_info_player_team2()
{
self.team = COLOR_TEAM2; // blue
spawnfunc_info_player_deathmatch();
@@ -408,7 +408,7 @@
"angle"
viewing angle when spawning
*/
-void() spawnfunc_info_player_team3 =
+void spawnfunc_info_player_team3()
{
self.team = COLOR_TEAM3; // purple
spawnfunc_info_player_deathmatch();
@@ -423,7 +423,7 @@
"angle"
viewing angle when spawning
*/
-void() spawnfunc_info_player_team4 =
+void spawnfunc_info_player_team4()
{
self.team = COLOR_TEAM4; // yellow
spawnfunc_info_player_deathmatch();
@@ -457,7 +457,7 @@
(default ctf/respawn.wav)
*/
-void() spawnfunc_item_flag_team1 =
+void spawnfunc_item_flag_team1()
{
if (!g_ctf)
{
@@ -540,7 +540,7 @@
(default ctf/respawn.wav)
*/
-void() spawnfunc_item_flag_team2 =
+void spawnfunc_item_flag_team2()
{
if (!g_ctf)
{
@@ -613,7 +613,7 @@
*/
-void() spawnfunc_ctf_team =
+void spawnfunc_ctf_team()
{
if (!g_ctf)
{
@@ -640,7 +640,7 @@
};
// spawn some default teams if the map is not set up for ctf
-void() ctf_spawnteams =
+void ctf_spawnteams()
{
float numteams;
@@ -650,7 +650,7 @@
ctf_spawnteam("Blue", COLOR_TEAM2 - 1);
};
-void() ctf_delayedinit =
+void ctf_delayedinit()
{
self.think = SUB_Remove;
self.nextthink = time;
@@ -659,7 +659,7 @@
ctf_spawnteams();
};
-void() ctf_init =
+void ctf_init()
{
local entity e;
e = spawn();
@@ -668,7 +668,7 @@
flagcaptimerecord = stof(db_get(ServerProgsDB, strcat(GetMapname(), "/captimerecord/time")));
};
-void(entity flag, float shift) ctf_setstatus2 =
+void ctf_setstatus2(entity flag, float shift)
{
if (flag.cnt == FLAG_CARRY)
if (flag.owner == self)
@@ -683,7 +683,7 @@
}
};
-void() ctf_setstatus =
+void ctf_setstatus()
{
self.items = self.items - (self.items & IT_RED_FLAG_TAKEN);
self.items = self.items - (self.items & IT_RED_FLAG_LOST);
Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/defs.qh 2008-07-01 05:28:38 UTC (rev 3747)
@@ -30,9 +30,9 @@
float bots_would_leave;
float lms_lowest_lives;
float lms_next_place;
-float() LMS_NewPlayerLives;
+float LMS_NewPlayerLives();
-void(entity player, float f) UpdateFrags;
+void UpdateFrags(entity player, float f);
.float totalfrags;
float team1_score, team2_score, team3_score, team4_score;
@@ -128,7 +128,7 @@
.vector anim_backleft; // player running back and left
void() player_setupanimsformodel;
-void(vector anim, float looping, float override, float restart) player_setanim;
+void player_setanim(vector anim, float looping, float override, float restart);
.string mdl;
@@ -170,10 +170,10 @@
.entity exteriorweaponentity;
.float switchweapon;
.float autoswitch;
-float(float wpn, float wrequest) weapon_action;
-float(entity cl, float wpn, float andammo, float complain) client_hasweapon;
-void() w_clear;
-void() w_ready;
+float weapon_action(float wpn, float wrequest);
+float client_hasweapon(entity cl, float wpn, float andammo, float complain);
+void w_clear();
+void w_ready();
// VorteX: standalone think for weapons, so normal think on weaponentity can be reserved by weaponflashes (which needs update even player dies)
.float weapon_nextthink;
.void() weapon_think;
@@ -213,19 +213,7 @@
float WEP_FIRST = 1;
float WEP_LAST = 9;
-void(entity client, string s) stuffcmd = #21;
-void(entity client, string s) sprint = #24;
-vector(entity e, float sped) aim = #44;
-void(entity client, string s) centerprint_builtin = #73;
-void(entity e) setspawnparms = #78;
-void(float to, float f) WriteByte = #52;
-void(float to, float f) WriteChar = #53;
-void(float to, float f) WriteShort = #54;
-void(float to, float f) WriteLong = #55;
-void(float to, float f) WriteCoord = #56;
-void(float to, float f) WriteAngle = #57;
-void(float to, string s) WriteString = #58;
-void(float to, entity s) WriteEntity = #59;
+void(entity client, string s) centerprint_builtin = #73;
.vector dest1, dest2;
float gameover;
Modified: trunk/data/qcsrc/server/domination.qc
===================================================================
--- trunk/data/qcsrc/server/domination.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/domination.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -96,7 +96,7 @@
self.frame = 0;
}
-void() dompointthink =
+void dompointthink()
{
local entity head;
local float waittime;
@@ -157,7 +157,7 @@
}
};
-void() dompointtouch =
+void dompointtouch()
{
local entity head;
if (other.classname != "player")
@@ -227,7 +227,7 @@
(this is a global sound, like "Red team has captured a control point")
*/
-void() spawnfunc_dom_team =
+void spawnfunc_dom_team()
{
if(!g_domination)
{
@@ -249,7 +249,7 @@
self.team = self.cnt + 1;
};
-void() dom_controlpoint_setup =
+void dom_controlpoint_setup()
{
local entity head;
// find the spawnfunc_dom_team representing unclaimed points
@@ -486,7 +486,7 @@
/*QUAKED spawnfunc_dom_controlpoint (0 .5 .8) (-16 -16 -24) (16 16 32)
Control point for Domination gameplay.
*/
-void() spawnfunc_dom_controlpoint =
+void spawnfunc_dom_controlpoint()
{
if(!g_domination)
{
@@ -532,7 +532,7 @@
self = oldself;
};
-void(vector org) dom_spawnpoint =
+void dom_spawnpoint(vector org)
{
local entity oldself;
oldself = self;
@@ -546,7 +546,7 @@
};
// spawn some default teams if the map is not set up for domination
-void() dom_spawnteams =
+void dom_spawnteams()
{
float numteams;
@@ -561,7 +561,7 @@
dom_spawnteam("", 0, "models/domination/dom_unclaimed.md3", 0, "", "", "");
};
-void() dom_delayedinit =
+void dom_delayedinit()
{
local entity head;
@@ -593,7 +593,7 @@
}
};
-void() dom_init =
+void dom_init()
{
local entity e;
// we have to precache default models/sounds even if they might not be
Modified: trunk/data/qcsrc/server/g_casings.qc
===================================================================
--- trunk/data/qcsrc/server/g_casings.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/g_casings.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -1,4 +1,4 @@
-void() casingtouch =
+void casingtouch()
{
if (trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)
{
@@ -14,7 +14,7 @@
//self.dest = self.origin - self.groundentity.origin;
};
-void() casingthink =
+void casingthink()
{
local float p;
self.nextthink = time + 0.1;
@@ -42,7 +42,7 @@
};
// knock loose the casing when disturbed
-void() casingknockedloosefunc =
+void casingknockedloosefunc()
{
self.movetype = MOVETYPE_BOUNCE;
self.flags = self.flags - (self.flags & FL_ONGROUND);
@@ -51,7 +51,7 @@
self.touch = casingtouch;
};
-void(vector org, vector vel, float randomvel, vector ang, vector avel, float randomavel, float casingtype) SpawnCasing =
+void SpawnCasing(vector org, vector vel, float randomvel, vector ang, vector avel, float randomavel, float casingtype)
{
local entity e;
if (cvar("temp1") & 2048)
Modified: trunk/data/qcsrc/server/g_damage.qc
===================================================================
--- trunk/data/qcsrc/server/g_damage.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/g_damage.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -40,7 +40,7 @@
return 1;
}
-void(entity player, float f) UpdateFrags =
+void UpdateFrags(entity player, float f)
{
player.frags += f;
player.totalfrags += f;
Modified: trunk/data/qcsrc/server/g_decors.qc
===================================================================
--- trunk/data/qcsrc/server/g_decors.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/g_decors.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -8,7 +8,7 @@
//void(vector org, float bodydamage, float armordamage, vector vel, float damgtype) genericbleedfunc;
// removes the oldest decors each frame to maintain a certain maximum decors
-void() decorframe =
+void decorframe()
{
local entity estart, e, b1, b2, b3, b4, b5, b6, b7, b8, b9, b10;
local float bt1, bt2, bt3, bt4, bt5, bt6, bt7, bt8, bt9, bt10, iterations;
@@ -173,7 +173,7 @@
}
};
-entity() newdecor =
+entity newdecor()
{
local entity e;
numdecors++;
@@ -182,7 +182,7 @@
return e;
};
-void(entity e) removedecor =
+void removedecor(entity e)
{
numdecors--;
remove(e);
@@ -190,7 +190,7 @@
// used for various little bouncing debris to avoid getting stuck in the air
-void() DecorThink =
+void DecorThink()
{
self.nextthink = time;
self.flags = self.flags - (self.flags & FL_ONGROUND);
@@ -200,7 +200,7 @@
.float createdtime;
-void() InitDecors =
+void InitDecors()
{
// different number of decors in multi-player (to avoid lag on modems)
if (maxclients > 1)
Modified: trunk/data/qcsrc/server/g_lights.qc
===================================================================
--- trunk/data/qcsrc/server/g_lights.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/g_lights.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -28,14 +28,14 @@
"NOSHADOW" will not cast shadows in realtime lighting mode
"FOLLOW" will follow the entity which "targetname" matches "target"
*/
-void() dynlight_think =
+void dynlight_think()
{
if(!self.owner)
remove(self);
self.nextthink = 0.1;
};
-void() dynlight_find_aiment =
+void dynlight_find_aiment()
{
local entity targ;
@@ -49,7 +49,7 @@
self.nextthink = 0.1;
self.think = dynlight_think;
};
-void() dynlight_find_path =
+void dynlight_find_path()
{
local entity targ;
@@ -59,14 +59,14 @@
self.nextthink = self.ltime + 0.1;
self.think = train_next;
};
-void() dynlight_use =
+void dynlight_use()
{
if (self.light_lev == 0)
self.light_lev = self.lefty;
else
self.light_lev = 0;
};
-void() dynlight =
+void dynlight()
{
local entity targ;
Modified: trunk/data/qcsrc/server/g_subs.qc
===================================================================
--- trunk/data/qcsrc/server/g_subs.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/g_subs.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -1,4 +1,4 @@
-void() SUB_Null = {};
+void SUB_Null() {};
void(vector destangle, float tspeed, void() func) SUB_CalcAngleMove;
void() SUB_CalcMoveDone;
@@ -368,7 +368,7 @@
================
*/
-void() SetMovedir =
+void SetMovedir()
{
if (self.movedir != '0 0 0')
self.movedir = normalize(self.movedir);
@@ -388,7 +388,7 @@
self.angles = '0 0 0';
};
-void() InitTrigger =
+void InitTrigger()
{
// trigger angles are used for one-way touches. An angle of 0 is assumed
// to mean no restrictions, so use a yaw of 360 instead.
@@ -402,7 +402,7 @@
self.model = "";
};
-void() InitSolidBSPTrigger =
+void InitSolidBSPTrigger()
{
// trigger angles are used for one-way touches. An angle of 0 is assumed
// to mean no restrictions, so use a yaw of 360 instead.
Modified: trunk/data/qcsrc/server/g_tetris.qc
===================================================================
--- trunk/data/qcsrc/server/g_tetris.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/g_tetris.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -51,7 +51,7 @@
*********************************
*/
-void (float ln, float vl) SetLine =
+void SetLine(float ln, float vl)
{
if (ln == 1)
self.line1 = vl;
@@ -95,7 +95,7 @@
self.line20 = vl;
};
-float (float ln) GetLine =
+float GetLine(float ln)
{
if (ln == 1)
return self.line1;
@@ -141,7 +141,7 @@
return 0;
};
-float(float x, float dat) GetXBlock =
+float GetXBlock(float x, float dat)
{
if (x == 1)
return dat & 3;
@@ -167,7 +167,7 @@
return 0;
};
-float(float x, float dat, float new) SetXBlock =
+float SetXBlock(float x, float dat, float new)
{
if (x == 1)
return (dat - (dat & 3)) | new;
@@ -194,12 +194,12 @@
};
-float(float x, float y) GetSquare =
+float GetSquare(float x, float y)
{
return GetXBlock(x, GetLine(y));
};
-void (float x, float y, float val) SetSquare =
+void SetSquare(float x, float y, float val)
{
float dat;
@@ -210,7 +210,7 @@
-vector(float pc) PieceShape =
+vector PieceShape(float pc)
{
/*
@@ -275,7 +275,7 @@
}
// do x 1..4 and y 1..4 in case of rotation
-float(float x, float y, float rot, float pc) PieceMetric =
+float PieceMetric(float x, float y, float rot, float pc)
{
float t;
vector piece_dat;
@@ -327,7 +327,7 @@
// remove warnings by adding underscores, i hate warnings, warnings suck
// --blub
-void(float _c1, float _c2, float _c3, float _c4, float c5, float c6) p6 =
+void p6(float _c1, float _c2, float _c3, float _c4, float c5, float c6)
{
WriteChar(MSG_ONE, _c1);
WriteChar(MSG_ONE, _c2);
@@ -337,7 +337,7 @@
WriteChar(MSG_ONE, c6);
};
-float(float num, float dig) pnum =
+float pnum(float num, float dig)
{
local float f, i;
if (num < 0)
@@ -359,7 +359,7 @@
return dig;
};
-void (float ln) DrawLine =
+void DrawLine(float ln)
{
float x, d;
WriteChar(MSG_ONE, TET_BORDER);
@@ -375,7 +375,7 @@
WriteChar(MSG_ONE, TET_BORDER);
}
-void (float pc, float ln) DrawPiece =
+void DrawPiece(float pc, float ln)
{
float x, d, piece_ln, pcolor;
vector piece_dat;
@@ -399,7 +399,7 @@
}
WriteChar(MSG_ONE, TET_SPACE); // pad to 6
}
-void() Draw_Tetris =
+void Draw_Tetris()
{
float i;
msg_entity = self;
@@ -457,7 +457,7 @@
*/
// reset the game
-void() ResetTetris =
+void ResetTetris()
{
float i;
@@ -469,7 +469,7 @@
};
-void () Tet_GameOver =
+void Tet_GameOver()
{
centerprint(self, "Game Over");
self.tetris_on = 0;
@@ -486,18 +486,18 @@
*********************************
*/
-float() RandomPiece =
+float RandomPiece()
{
return floor(random() * PIECES) + 1;
};
-void(float n) TetAddScore =
+void TetAddScore(float n)
{
self.tet_score = self.tet_score + n;
if (self.tet_score > tet_high_score)
tet_high_score = self.tet_score;
};
-float CheckMetrics(float piece, float orgx, float orgy, float rot) =
+float CheckMetrics(float piece, float orgx, float orgy, float rot) /*FIXDECL*/
{
// check to see if the piece, if moved to the locations will overlap
@@ -522,7 +522,7 @@
return TRUE;
}
-void ClearPiece(float piece, float orgx, float orgy, float rot) =
+void ClearPiece(float piece, float orgx, float orgy, float rot) /*FIXDECL*/
{
float x, y;
@@ -541,7 +541,7 @@
}
}
}
-void CementPiece(float piece, float orgx, float orgy, float rot) =
+void CementPiece(float piece, float orgx, float orgy, float rot) /*FIXDECL*/
{
float pcolor;
float x, y;
@@ -568,7 +568,7 @@
float LINE_LOW = 349525;
float LINE_HIGH = 699050; // above number times 2
-void() CompletedLines =
+void CompletedLines()
{
float y, cleared, ln;
@@ -588,7 +588,7 @@
TetAddScore(cleared * cleared * 10);
};
-void(float keyss) HandleGame =
+void HandleGame(float keyss)
{
// first off, we need to see if we need a new piece
@@ -669,7 +669,7 @@
*/
-void(float imp) TetrisImpulses =
+void TetrisImpulses(float imp)
{
if (imp == 200)
{
@@ -682,7 +682,7 @@
};
-float() TetrisPreFrame =
+float TetrisPreFrame()
{
if (!self.tetris_on)
return 0;
@@ -694,11 +694,11 @@
return 1;
};
-float(float v) frik_anglemoda =
+float frik_anglemoda(float v)
{
return v - floor(v/360) * 360;
};
-float (float y1, float y2) angcompa =
+float angcompa(float y1, float y2)
{
y1 = frik_anglemoda(y1);
y2 = frik_anglemoda(y2);
@@ -713,7 +713,7 @@
};
-float() TetrisPostFrame =
+float TetrisPostFrame()
{
vector mov;
float keysa, norm;
Modified: trunk/data/qcsrc/server/g_triggers.qc
===================================================================
--- trunk/data/qcsrc/server/g_triggers.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/g_triggers.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -1,7 +1,7 @@
void() SUB_UseTargets;
-void() DelayThink =
+void DelayThink()
{
activator = self.enemy;
SUB_UseTargets ();
@@ -27,7 +27,7 @@
==============================
*/
-void() SUB_UseTargets =
+void SUB_UseTargets()
{
local entity t, stemp, otemp, act;
@@ -105,7 +105,7 @@
-void() spawnfunc_trigger_reactivate =
+void spawnfunc_trigger_reactivate()
{
self.solid = SOLID_TRIGGER;
};
@@ -116,7 +116,7 @@
float SPAWNFLAG_NOTOUCH = 1;
// the wait time has passed, so set back up for another activation
-void() multi_wait =
+void multi_wait()
{
if (self.max_health)
{
@@ -130,7 +130,7 @@
// the trigger was just touched/killed/used
// self.enemy should be set to the activator so it can be held through a delay
// so wait for the delay time before firing
-void() multi_trigger =
+void multi_trigger()
{
if (self.nextthink > time)
{
@@ -170,13 +170,13 @@
}
};
-void() multi_use =
+void multi_use()
{
self.enemy = activator;
multi_trigger();
};
-void() multi_touch =
+void multi_touch()
{
if (other.classname != "player")
return;
@@ -222,7 +222,7 @@
4)
set "message" to text string
*/
-void() spawnfunc_trigger_multiple =
+void spawnfunc_trigger_multiple()
{
if (self.sounds == 1)
{
@@ -279,7 +279,7 @@
4)
set "message" to text string
*/
-void() spawnfunc_trigger_once =
+void spawnfunc_trigger_once()
{
self.wait = -1;
spawnfunc_trigger_multiple();
@@ -290,7 +290,7 @@
/*QUAKED spawnfunc_trigger_relay (.5 .5 .5) (-8 -8 -8) (8 8 8)
This fixed size trigger cannot be touched, it can only be fired by other events. It can contain killtargets, targets, delays, and messages.
*/
-void() spawnfunc_trigger_relay =
+void spawnfunc_trigger_relay()
{
self.use = SUB_UseTargets;
};
@@ -312,7 +312,7 @@
//=============================================================================
-void() counter_use =
+void counter_use()
{
self.count = self.count - 1;
if (self.count < 0)
@@ -349,7 +349,7 @@
After the counter has been triggered "count" times (default 2), it will fire all of it's targets and remove itself.
*/
-void() spawnfunc_trigger_counter =
+void spawnfunc_trigger_counter()
{
self.wait = -1;
if (!self.count)
@@ -359,7 +359,7 @@
};
.float triggerhurttime;
-void() spawnfunc_hurt_touch =
+void spawnfunc_hurt_touch()
{
if (!other.owner)
{
@@ -384,7 +384,7 @@
set dmg to damage amount
defalt dmg = 5
*/
-void() spawnfunc_trigger_hurt =
+void spawnfunc_trigger_hurt()
{
InitTrigger ();
self.touch = spawnfunc_hurt_touch;
@@ -394,10 +394,10 @@
self.message = "was in the wrong place.";
};
-//void() target_speaker_use = {sound(self, CHAN_VOICE, self.noise, 1, 1);}
-//void() spawnfunc_target_speaker = {self.use = target_speaker_use;}
+//void target_speaker_use() {sound(self, CHAN_VOICE, self.noise, 1, 1);}
+//void spawnfunc_target_speaker() {self.use = target_speaker_use;}
-void() spawnfunc_target_speaker =
+void spawnfunc_target_speaker()
{
if(self.noise) {
precache_sound (self.noise);
@@ -413,7 +413,7 @@
/*
-void() sparksthink =
+void sparksthink()
{
self.nextthink = time + 0.1;
@@ -423,7 +423,7 @@
}
-void() func_sparks =
+void func_sparks()
{
self.think = sparksthink;
self.nextthink = time + 0.2;
@@ -446,7 +446,7 @@
}
}
*/
-void() rain_think =
+void rain_think()
{
self.nextthink = time + 0.1;
te_particlerain(self.absmin, self.absmax, self.dest, self.count, self.cnt);
@@ -471,7 +471,7 @@
"count"
adjusts density, this many particles fall every second for a 1024x1024 area, default is 2000
*/
-void() spawnfunc_func_rain =
+void spawnfunc_func_rain()
{
self.dest = self.velocity;
self.velocity = '0 0 0';
@@ -502,7 +502,7 @@
};
-void() snow_think =
+void snow_think()
{
self.nextthink = time + 0.1 + random() * 0.05;
te_particlesnow(self.absmin, self.absmax, self.dest, self.count, self.cnt);
@@ -526,7 +526,7 @@
"count"
adjusts density, this many particles fall every second for a 1024x1024 area, default is 2000
*/
-void() spawnfunc_func_snow =
+void spawnfunc_func_snow()
{
self.dest = self.velocity;
self.velocity = '0 0 0';
@@ -558,7 +558,7 @@
void FireRailgunBullet (vector start, vector end, float bdamage, float bforce, float deathtype);
-void() misc_laser_think =
+void misc_laser_think()
{
vector o;
if(!self.state)
@@ -605,7 +605,7 @@
"wait"
delay between sending the particle effect
*/
-void() spawnfunc_misc_laser =
+void spawnfunc_misc_laser()
{
if(self.mdl)
{
Modified: trunk/data/qcsrc/server/g_violence.qc
===================================================================
--- trunk/data/qcsrc/server/g_violence.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/g_violence.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -35,7 +35,7 @@
.float gibrandom;
.float gibmodelindex;
-float() Gib_customizeentityforclient =
+float Gib_customizeentityforclient()
{
if(self.classname == "player") // the eye
{
Modified: trunk/data/qcsrc/server/g_world.qc
===================================================================
--- trunk/data/qcsrc/server/g_world.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/g_world.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -366,7 +366,7 @@
remove(self);
}
-float( string pFilename ) TryFile =
+float TryFile( string pFilename )
{
local float lHandle;
dprint("TryFile(\"", pFilename, "\")\n");
@@ -531,7 +531,7 @@
return strhasword(cvar_string("g_maplist_mostrecent"), m);
}
-float(float position, float pass) Map_Check =
+float Map_Check(float position, float pass)
{
string filename;
string map_next;
@@ -562,7 +562,7 @@
return 0;
}
-void(string nextmapname) Map_Goto_SetStr =
+void Map_Goto_SetStr(string nextmapname)
{
if(getmapname_stored != "")
strunzone(getmapname_stored);
@@ -572,13 +572,13 @@
getmapname_stored = strzone(nextmapname);
}
-void(float position) Map_Goto_SetFloat =
+void Map_Goto_SetFloat(float position)
{
cvar_set("g_maplist_index", ftos(position));
Map_Goto_SetStr(argv(position));
}
-void() GameResetCfg =
+void GameResetCfg()
{
#ifdef MAPINFO
// settings persist, except...
@@ -596,7 +596,7 @@
#endif
};
-void() Map_Goto =
+void Map_Goto()
{
Map_MarkAsRecent(getmapname_stored);
GameResetCfg();
@@ -699,7 +699,7 @@
return -1;
}
-void() Maplist_Init =
+void Maplist_Init()
{
string temp;
temp = cvar_string("g_maplist");
@@ -729,7 +729,7 @@
// isn't chosen in the first pass that should have been
}
-string() GetNextMap =
+string GetNextMap()
{
float nextMap;
@@ -759,7 +759,7 @@
return "";
};
-float() DoNextMapOverride =
+float DoNextMapOverride()
{
if(cvar("g_campaign"))
{
@@ -814,7 +814,7 @@
return FALSE;
};
-void() GotoNextMap =
+void GotoNextMap()
{
//local string nextmap;
//local float n, nummaps;
@@ -864,7 +864,7 @@
void() MapVote_Start;
void() MapVote_Think;
float mapvote_initialized;
-void() IntermissionThink =
+void IntermissionThink()
{
FixIntermissionClient(self);
@@ -896,7 +896,7 @@
============
*/
/*
-entity() FindIntermission =
+entity FindIntermission()
{
local entity spot;
local float cyc;
@@ -944,7 +944,7 @@
===============================================================================
*/
-void(float final) DumpStats =
+void DumpStats(float final)
{
local float file;
local string s;
@@ -1055,7 +1055,7 @@
go to the next level for deathmatch
only called if a time or frag limit has expired
*/
-void() NextLevel =
+void NextLevel()
{
float minTotalFrags;
float maxTotalFrags;
@@ -1132,7 +1132,7 @@
============
*/
.float fogtime;
-void() CheckRules_Player =
+void CheckRules_Player()
{
if (gameover) // someone else quit the game already
return;
@@ -1160,7 +1160,7 @@
float checkrules_overtimewarning;
float checkrules_overtimeend;
-void() InitiateOvertime =
+void InitiateOvertime()
{
if(!checkrules_overtimeend)
checkrules_overtimeend = time + 60 * cvar("timelimit_maxovertime");
@@ -1171,7 +1171,7 @@
float WINNING_NEVER = 2; // no winner, enter overtime if time limit is reached
float WINNING_STARTOVERTIME = 3; // no winner, enter overtime NOW
-float(float fraglimitreached, float equality) GetWinningCode =
+float GetWinningCode(float fraglimitreached, float equality)
{
if(equality)
if(fraglimitreached)
@@ -1186,7 +1186,7 @@
}
// set the .winning flag for exactly those players with a given field value
-void(.float field, float value) SetWinners =
+void SetWinners(.float field, float value)
{
entity head;
FOR_EACH_PLAYER(head)
@@ -1194,7 +1194,7 @@
}
// set the .winning flag for those players with a given field value
-void(.float field, float value) AddWinners =
+void AddWinners(.float field, float value)
{
entity head;
FOR_EACH_PLAYER(head)
@@ -1203,7 +1203,7 @@
}
// clear frags for all players but the team given (when they ran out of spawnpoints)
-void(.float field, float value) ClearFragsForEveryoneBut =
+void ClearFragsForEveryoneBut(.float field, float value)
{
entity head;
FOR_EACH_PLAYER(head)
@@ -1212,7 +1212,7 @@
}
// clear the .winning flags
-void(void) ClearWinners =
+void ClearWinners(void)
{
entity head;
FOR_EACH_PLAYER(head)
@@ -1221,7 +1221,7 @@
// Onslaught winning condition:
// game terminates if only one team has a working generator (or none)
-float() WinningCondition_Onslaught =
+float WinningCondition_Onslaught()
{
entity head;
local float t1, t2, t3, t4;
@@ -1255,7 +1255,7 @@
return WINNING_NO;
}
-float() LMS_NewPlayerLives =
+float LMS_NewPlayerLives()
{
float fl;
fl = cvar("fraglimit");
@@ -1276,7 +1276,7 @@
// Assault winning condition: If the attackers triggered a round end (by fulfilling all objectives)
// they win. Otherwise the defending team wins once the timelimit passes.
void assault_new_round();
-float() WinningCondition_Assault =
+float WinningCondition_Assault()
{
local float status;
status = WINNING_NO;
@@ -1327,7 +1327,7 @@
// LMS winning condition: game terminates if and only if there's at most one
// one player who's living lives. Top two scores being equal cancels the time
// limit.
-float() WinningCondition_LMS =
+float WinningCondition_LMS()
{
entity head;
float have_player;
@@ -1416,7 +1416,7 @@
// DM winning condition: game terminates if a player reached the fraglimit,
// unless the first two players have the same score. The latter case also
// breaks the time limit.
-float(float fraglimit) WinningCondition_MaxIndividualScore =
+float WinningCondition_MaxIndividualScore(float fraglimit)
{
float checkrules_oldleaderfrags;
entity head;
@@ -1454,7 +1454,7 @@
return GetWinningCode(fraglimit && checkrules_leaderfrags >= fraglimit, checkrules_equality);
}
-float(float fraglimit) WinningConditionBase_Teamplay =
+float WinningConditionBase_Teamplay(float fraglimit)
{
tdm_old_score = tdm_max_score;
tdm_max_score = max4(team1_score, team2_score, team3_score, team4_score);
@@ -1500,7 +1500,7 @@
// TDM winning condition: game terminates if a team's score sum reached the
// fraglimit, unless the first two teams have the same total score. The latter
// case also breaks the time limit.
-float(float fraglimit) WinningCondition_MaxTeamSum =
+float WinningCondition_MaxTeamSum(float fraglimit)
{
entity head;
@@ -1524,7 +1524,7 @@
// DOM/CTF winning condition: game terminates if the max of a team's players'
// score reached the fraglimit, unless the first two teams have the same
// maximum score. The latter case also breaks the time limit.
-float(float fraglimit) WinningCondition_MaxTeamMax =
+float WinningCondition_MaxTeamMax(float fraglimit)
{
entity head;
@@ -1752,7 +1752,7 @@
Exit deathmatch games upon conditions
============
*/
-void() CheckRules_World =
+void CheckRules_World()
{
local float status;
local float timelimit;
Modified: trunk/data/qcsrc/server/havocbot.qc
===================================================================
--- trunk/data/qcsrc/server/havocbot.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/havocbot.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -3,7 +3,7 @@
void() havocbot_chooserole;
.float havocbot_keyboardskill;
-vector() havocbot_dodge =
+vector havocbot_dodge()
{
// LordHavoc: disabled because this is too expensive
return '0 0 0';
@@ -62,7 +62,7 @@
//.vector bot_dodgevector;
//.float bot_dodgevector_time;
//.float bot_dodgevector_jumpbutton;
-void() havocbot_movetogoal =
+void havocbot_movetogoal()
{
local vector destorg;
local vector diff;
@@ -253,7 +253,7 @@
.float havocbot_chooseenemy_finished;
.float havocbot_stickenemy;
-void() havocbot_chooseenemy =
+void havocbot_chooseenemy()
{
local entity head, best;
local float rating, bestrating;
@@ -321,7 +321,7 @@
};
float(entity e) w_getbestweapon;
-void() havocbot_chooseweapon =
+void havocbot_chooseweapon()
{
// TODO: clean this up by moving it to weapon code
if(self.enemy.classname!="player")
@@ -416,7 +416,7 @@
};
.float nextaim;
-void() havocbot_aim =
+void havocbot_aim()
{
local vector selfvel, enemyvel;
if (time < self.nextaim)
@@ -437,7 +437,7 @@
};
.float bot_chooseweapontime;
-void() havocbot_ai =
+void havocbot_ai()
{
if (bot_strategytoken == self)
if (!bot_strategytoken_taken)
@@ -492,7 +492,7 @@
havocbot_movetogoal();
};
-void() havocbot_setupbot =
+void havocbot_setupbot()
{
self.bot_ai = havocbot_ai;
// will be updated by think code
Modified: trunk/data/qcsrc/server/havocbot_roles.qc
===================================================================
--- trunk/data/qcsrc/server/havocbot_roles.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/havocbot_roles.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -5,12 +5,12 @@
.void() havocbot_role;
float bot_ignore_bots;
-float(entity e) canreach =
+float canreach(entity e)
{
return vlen(self.origin - e.origin) < 1500;
}
-void(float ratingscale, vector org, float sradius) havocbot_goalrating_items =
+void havocbot_goalrating_items(float ratingscale, vector org, float sradius)
{
local entity head;
local float t;
@@ -33,7 +33,7 @@
}
};
-void(float ratingscale, vector org, float sradius) havocbot_goalrating_controlpoints =
+void havocbot_goalrating_controlpoints(float ratingscale, vector org, float sradius)
{
local entity head;
head = findchain(classname, "dom_controlpoint");
@@ -56,7 +56,7 @@
// LordHavoc: this function was already unused, but for waypoints to be a
// useful goal the bots would have to seek out the least-recently-visited
// ones, not the closest
-void(float ratingscale, vector org, float sradius) havocbot_goalrating_waypoints =
+void havocbot_goalrating_waypoints(float ratingscale, vector org, float sradius)
{
local entity head;
head = findchain(classname, "waypoint");
@@ -69,7 +69,7 @@
};
*/
-void(float ratingscale, vector org, float sradius) havocbot_goalrating_enemyplayers =
+void havocbot_goalrating_enemyplayers(float ratingscale, vector org, float sradius)
{
local entity head;
local float t, noteam;
@@ -101,7 +101,7 @@
void() havocbot_role_ctf_offense;
void() havocbot_role_ctf_interceptor;
-void(float ratingscale, vector org, float sradius) havocbot_goalrating_ctf_carrieritems =
+void havocbot_goalrating_ctf_carrieritems(float ratingscale, vector org, float sradius)
{
local entity head;
local float t;
@@ -127,7 +127,7 @@
entity ctf_worldflaglist;
.entity ctf_worldflagnext;
-void(float ratingscale) havocbot_goalrating_ctf_ourflag =
+void havocbot_goalrating_ctf_ourflag(float ratingscale)
{
local entity head;
head = ctf_worldflaglist;
@@ -141,7 +141,7 @@
navigation_routerating(head, ratingscale, 10000);
};
-void(float ratingscale) havocbot_goalrating_ctf_enemyflag =
+void havocbot_goalrating_ctf_enemyflag(float ratingscale)
{
local entity head;
head = ctf_worldflaglist;
@@ -155,12 +155,12 @@
navigation_routerating(head, ratingscale, 10000);
};
-void(float ratingscale) havocbot_goalrating_ctf_enemybase =
+void havocbot_goalrating_ctf_enemybase(float ratingscale)
{
// div0: needs a change in the CTF code
};
-void(float ratingscale) havocbot_goalrating_ctf_ourstolenflag =
+void havocbot_goalrating_ctf_ourstolenflag(float ratingscale)
{
local entity head;
head = ctf_worldflaglist;
@@ -175,7 +175,7 @@
navigation_routerating(head, ratingscale, 10000);
};
-void(float ratingscale) havocbot_goalrating_ctf_droppedflags =
+void havocbot_goalrating_ctf_droppedflags(float ratingscale)
{
local entity head;
head = ctf_worldflaglist;
@@ -191,7 +191,7 @@
//role rogue: (is this used?)
//pick up items and dropped flags (with big rating boost to dropped flags)
-void() havocbot_role_ctf_rogue =
+void havocbot_role_ctf_rogue()
{
if (self.bot_strategytime < time)
{
@@ -208,7 +208,7 @@
//pick up armor and health
//go to our flag spot
.float bot_cantfindflag;
-void() havocbot_role_ctf_carrier =
+void havocbot_role_ctf_carrier()
{
if (self.flagcarried == world)
{
@@ -241,7 +241,7 @@
//if our flag taken, change role to interceptor
//(60-90 second timer) change role to middle
//go to enemy flag
-void() havocbot_role_ctf_offense =
+void havocbot_role_ctf_offense()
{
local entity f;
if (self.flagcarried)
@@ -295,7 +295,7 @@
//if our flag is back, change role to previous role
//follow our flag
//go to least recently visited area
-void() havocbot_role_ctf_interceptor =
+void havocbot_role_ctf_interceptor()
{
local entity f;
if (self.flagcarried)
@@ -340,7 +340,7 @@
//if see flag (of either team) follow it (this has many implications)
//(10-20 second timer) change role to defense or offense
//go to least recently visited area
-void() havocbot_role_ctf_middle =
+void havocbot_role_ctf_middle()
{
local entity f;
if (self.flagcarried)
@@ -403,7 +403,7 @@
//if our flag taken, change role to interceptor
//(30-50 second timer) change role to middle
//move to nearest unclaimed defense spot
-void() havocbot_role_ctf_defense =
+void havocbot_role_ctf_defense()
{
local entity f;
if (self.flagcarried)
@@ -483,7 +483,7 @@
// CTF:
// choose a role according to the situation
void() havocbot_role_dm;
-void() havocbot_chooserole_ctf =
+void havocbot_chooserole_ctf()
{
local float r;
dprint("choose CTF role...\n");
@@ -503,7 +503,7 @@
//DOM:
//go to best items, or control points you don't own
-void() havocbot_role_dom =
+void havocbot_role_dom()
{
if (self.bot_strategytime < time)
{
@@ -519,7 +519,7 @@
//DM:
//go to best items
-void() havocbot_role_dm =
+void havocbot_role_dm()
{
if (self.bot_strategytime < time)
{
@@ -532,12 +532,12 @@
}
};
-void() havocbot_chooserole_dm =
+void havocbot_chooserole_dm()
{
self.havocbot_role = havocbot_role_dm;
};
-void() havocbot_chooserole_dom =
+void havocbot_chooserole_dom()
{
self.havocbot_role = havocbot_role_dom;
};
@@ -549,7 +549,7 @@
entity kh_worldkeylist;
.entity kh_worldkeynext;
-void(float ratingscale_team, float ratingscale_dropped, float ratingscale_enemy) havocbot_goalrating_kh =
+void havocbot_goalrating_kh(float ratingscale_team, float ratingscale_dropped, float ratingscale_enemy)
{
local entity head;
for (head = kh_worldkeylist; head; head = head.kh_worldkeynext)
@@ -580,7 +580,7 @@
void() havocbot_role_kh_defense;
void() havocbot_role_kh_offense;
void() havocbot_role_kh_freelancer;
-void() havocbot_role_kh_carrier =
+void havocbot_role_kh_carrier()
{
if (!(self.items & IT_KEY1))
{
@@ -605,7 +605,7 @@
}
}
-void() havocbot_role_kh_defense =
+void havocbot_role_kh_defense()
{
if (self.items & IT_KEY1)
{
@@ -644,7 +644,7 @@
}
};
-void() havocbot_role_kh_offense =
+void havocbot_role_kh_offense()
{
if (self.items & IT_KEY1)
{
@@ -684,7 +684,7 @@
}
};
-void() havocbot_role_kh_freelancer =
+void havocbot_role_kh_freelancer()
{
if (self.items & IT_KEY1)
{
@@ -736,7 +736,7 @@
-void() havocbot_chooserole_kh =
+void havocbot_chooserole_kh()
{
local float r;
r = random() * 3;
@@ -748,7 +748,7 @@
self.havocbot_role = havocbot_role_kh_freelancer;
};
-void() havocbot_chooserole =
+void havocbot_chooserole()
{
dprint("choose a role...\n");
navigation_routetogoal(world);
Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/miscfunctions.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -120,7 +120,7 @@
centerprint(head, s);
}
-void(string s, float check_dangerous) ServerConsoleEcho =
+void ServerConsoleEcho(string s, float check_dangerous)
{
local string ch;
if (checkextension("DP_SV_PRINT"))
@@ -146,7 +146,7 @@
}
}
-void(string s, float check_dangerous) GameLogEcho =
+void GameLogEcho(string s, float check_dangerous)
{
string fn;
float matches;
@@ -179,13 +179,13 @@
}
}
-void() GameLogInit =
+void GameLogInit()
{
logfile_open = 0;
// will be opened later
}
-void() GameLogClose =
+void GameLogClose()
{
if(logfile_open && logfile >= 0)
{
@@ -228,7 +228,7 @@
// IT WILL MOST PROBABLY DESTROY _ALL_ OTHER TEMP
// STRINGS AND TAKE QUITE LONG. haystack and needle MUST
// BE CONSTANT OR strzoneD!
-float(string haystack, string needle, float offset) strstr =
+float strstr(string haystack, string needle, float offset)
{
float len, endpos;
string found;
@@ -248,7 +248,7 @@
float NUM_NEAREST_ENTITIES = 4;
entity nearest_entity[NUM_NEAREST_ENTITIES];
float nearest_length[NUM_NEAREST_ENTITIES];
-entity(vector point, .string field, string value, vector axismod) findnearest =
+entity findnearest(vector point, .string field, string value, vector axismod)
{
entity localhead;
float i;
@@ -328,14 +328,14 @@
return nearest_entity[0];
}
-void() spawnfunc_target_location =
+void spawnfunc_target_location()
{
self.classname = "target_location";
// location name in netname
// eventually support: count, teamgame selectors, line of sight?
};
-void() spawnfunc_info_location =
+void spawnfunc_info_location()
{
self.classname = "target_location";
self.message = self.netname;
@@ -360,7 +360,7 @@
return ret;
}
-string(string msg) formatmessage =
+string formatmessage(string msg)
{
float p;
float n;
@@ -701,7 +701,7 @@
return p.netname;
}
-vector(vector m1, vector m2) randompos =
+vector randompos(vector m1, vector m2)
{
local vector v;
m2 = m2 - m1;
@@ -712,10 +712,10 @@
};
// requires that m2>m1 in all coordinates, and that m4>m3
-float(vector m1, vector m2, vector m3, vector m4) boxesoverlap = {return m2_x >= m3_x && m1_x <= m4_x && m2_y >= m3_y && m1_y <= m4_y && m2_z >= m3_z && m1_z <= m4_z;};
+float boxesoverlap(vector m1, vector m2, vector m3, vector m4) {return m2_x >= m3_x && m1_x <= m4_x && m2_y >= m3_y && m1_y <= m4_y && m2_z >= m3_z && m1_z <= m4_z;};
// requires the same, but is a stronger condition
-float(vector smins, vector smaxs, vector bmins, vector bmaxs) boxinsidebox = {return smins_x >= bmins_x && smaxs_x <= bmaxs_x && smins_y >= bmins_y && smaxs_y <= bmaxs_y && smins_z >= bmins_z && smaxs_z <= bmaxs_z;};
+float boxinsidebox(vector smins, vector smaxs, vector bmins, vector bmaxs) {return smins_x >= bmins_x && smaxs_x <= bmaxs_x && smins_y >= bmins_y && smaxs_y <= bmaxs_y && smins_z >= bmins_z && smaxs_z <= bmaxs_z;};
float g_pickup_shells;
float g_pickup_shells_max;
Modified: trunk/data/qcsrc/server/mode_onslaught.qc
===================================================================
--- trunk/data/qcsrc/server/mode_onslaught.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/mode_onslaught.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -14,7 +14,7 @@
float ons_sprite_cp_dfnd_red, ons_sprite_cp_dfnd_blue;
float ons_sprite_gen_red, ons_sprite_gen_blue, ons_sprite_gen_shielded;
-void() onslaught_updatelinks =
+void onslaught_updatelinks()
{
local entity l, links;
local float stop, t1, t2, t3, t4;
@@ -309,7 +309,7 @@
return 0;
}
-void() onslaught_generator_think =
+void onslaught_generator_think()
{
local float d;
local entity e;
@@ -334,7 +334,7 @@
}
};
-void() onslaught_generator_deaththink =
+void onslaught_generator_deaththink()
{
local vector org;
if (self.count > 0)
@@ -353,7 +353,7 @@
}
};
-void(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force) onslaught_generator_damage =
+void onslaught_generator_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
{
if (damage <= 0)
return;
@@ -414,7 +414,7 @@
};
// update links after a delay
-void() onslaught_generator_delayed =
+void onslaught_generator_delayed()
{
onslaught_updatelinks();
// now begin normal thinking
@@ -494,7 +494,7 @@
"team" - team that owns this generator (5 = red, 14 = blue, etc), MUST BE SET.
"targetname" - name that spawnfunc_onslaught_link entities will use to target this.
*/
-void() spawnfunc_onslaught_generator =
+void spawnfunc_onslaught_generator()
{
if (!g_onslaught)
{
@@ -579,7 +579,7 @@
self.sprite.waypointsprite_for_player = onslaught_generator_waypointsprite_for_player;
};
-void() onslaught_generator_reset =
+void onslaught_generator_reset()
{
self.team = self.team_saved;
self.lasthealth = self.max_health = self.health = cvar("g_onslaught_gen_health");
@@ -593,7 +593,7 @@
self.nextthink = time + 0.2;
}
-void(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force) onslaught_controlpoint_icon_damage =
+void onslaught_controlpoint_icon_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
{
entity oself;
if (damage <= 0)
@@ -647,7 +647,7 @@
}
};
-void() onslaught_controlpoint_icon_think =
+void onslaught_controlpoint_icon_think()
{
self.nextthink = time + 0.1;
if (time > self.pain_finished + 1)
@@ -661,7 +661,7 @@
self.colormod = '1 1 1' * (2 - bound(0, (self.pain_finished - time) / 10, 1));
};
-void() onslaught_controlpoint_icon_buildthink =
+void onslaught_controlpoint_icon_buildthink()
{
local entity oself;
@@ -689,7 +689,7 @@
self.colormod = '1 1 1' * (2 - bound(0, (self.pain_finished - time) / 10, 1));
};
-void() onslaught_controlpoint_touch =
+void onslaught_controlpoint_touch()
{
local entity e;
float a;
@@ -734,7 +734,7 @@
"target" - target any entities that are tied to this control point, such as vehicles and buildable structure entities.
"message" - name of this control point (should reflect the location in the map, such as "center bridge", "north tower", etc)
*/
-void() spawnfunc_onslaught_controlpoint =
+void spawnfunc_onslaught_controlpoint()
{
local entity e;
if (!g_onslaught)
@@ -778,7 +778,7 @@
self.sprite.waypointsprite_for_player = onslaught_controlpoint_waypointsprite_for_player;
};
-void() onslaught_controlpoint_reset =
+void onslaught_controlpoint_reset()
{
if(self.goalentity && self.goalentity != world)
remove(self.goalentity);
@@ -799,7 +799,7 @@
SUB_UseTargets(); // to reset the structures, playerspawns etc.
}
-void() onslaught_link_delayed =
+void onslaught_link_delayed()
{
self.goalentity = find(world, targetname, self.target);
self.enemy = find(world, targetname, self.target2);
@@ -819,7 +819,7 @@
"target" - first control point.
"target2" - second control point.
*/
-void() spawnfunc_onslaught_link =
+void spawnfunc_onslaught_link()
{
if (!g_onslaught)
{
Modified: trunk/data/qcsrc/server/t_halflife.qc
===================================================================
--- trunk/data/qcsrc/server/t_halflife.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/t_halflife.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -6,36 +6,36 @@
.float rendermode;
.vector rendercolor;
-void() spawnfunc_weapon_crossbow = {};
-void() spawnfunc_weapon_handgrenade = {};
-void() spawnfunc_ammo_crossbow = {};
-void() spawnfunc_ammo_9mmclip = {};
-void() spawnfunc_ammo_gaussclip = {};
-void() spawnfunc_weapon_rpg = {};
-void() spawnfunc_weapon_357 = {};
-void() ammo_ARgrenades = {};
-void() spawnfunc_item_battery = {};
-void() spawnfunc_ammo_rpgclip = {};
-void() weapon_9mmAR = {};
-void() spawnfunc_weapon_tripmine = {};
-void() spawnfunc_weapon_snark = {};
-void() spawnfunc_ammo_buckshot = {};
-void() ammo_9mmAR = {};
-void() spawnfunc_ammo_357 = {};
-void() spawnfunc_weapon_gauss = {};
-void() spawnfunc_weapon_hornetgun = {};
-//void() spawnfunc_weapon_shotgun = {};
-void() spawnfunc_item_healthkit = {};
-void() spawnfunc_item_longjump = {};
-void() spawnfunc_item_antidote = {};
-void() spawnfunc_func_recharge = {};
-void() spawnfunc_info_node = {};
-void() spawnfunc_env_sound = {};
-void() spawnfunc_light_spot = {};
-void() spawnfunc_func_healthcharger = {};
+void spawnfunc_weapon_crossbow() {};
+void spawnfunc_weapon_handgrenade() {};
+void spawnfunc_ammo_crossbow() {};
+void spawnfunc_ammo_9mmclip() {};
+void spawnfunc_ammo_gaussclip() {};
+void spawnfunc_weapon_rpg() {};
+void spawnfunc_weapon_357() {};
+void ammo_ARgrenades() {};
+void spawnfunc_item_battery() {};
+void spawnfunc_ammo_rpgclip() {};
+void weapon_9mmAR() {};
+void spawnfunc_weapon_tripmine() {};
+void spawnfunc_weapon_snark() {};
+void spawnfunc_ammo_buckshot() {};
+void ammo_9mmAR() {};
+void spawnfunc_ammo_357() {};
+void spawnfunc_weapon_gauss() {};
+void spawnfunc_weapon_hornetgun() {};
+//void spawnfunc_weapon_shotgun() {};
+void spawnfunc_item_healthkit() {};
+void spawnfunc_item_longjump() {};
+void spawnfunc_item_antidote() {};
+void spawnfunc_func_recharge() {};
+void spawnfunc_info_node() {};
+void spawnfunc_env_sound() {};
+void spawnfunc_light_spot() {};
+void spawnfunc_func_healthcharger() {};
-void() func_ladder_touch =
+void func_ladder_touch()
{
if (other.classname != "player")
return;
@@ -43,13 +43,13 @@
other.ladder_entity = self;
};
-void() spawnfunc_func_ladder =
+void spawnfunc_func_ladder()
{
InitTrigger ();
self.touch = func_ladder_touch;
};
-void() spawnfunc_func_water =
+void spawnfunc_func_water()
{
self.solid = SOLID_TRIGGER;
setmodel (self, self.model); // set size and link into world, precision set by mapper
Modified: trunk/data/qcsrc/server/t_items.qc
===================================================================
--- trunk/data/qcsrc/server/t_items.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/t_items.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -214,16 +214,17 @@
// Savage: used for item garbage-collection
// TODO: perhaps nice special effect?
-void RemoveItem(void) = {
+void RemoveItem(void) /*FIXDECL*/
+{
remove(self);
}
// pickup evaluation functions
// these functions decide how desirable an item is to the bots
-float(entity player, entity item) generic_pickupevalfunc = {return item.bot_pickupbasevalue;};
+float generic_pickupevalfunc(entity player, entity item) {return item.bot_pickupbasevalue;};
-float(entity player, entity item) weapon_pickupevalfunc =
+float weapon_pickupevalfunc(entity player, entity item)
{
// if we already have the weapon, rate it 1/5th normal value
if ((player.items & item.items) == item.items)
@@ -231,7 +232,7 @@
return item.bot_pickupbasevalue;
};
-float(entity player, entity item) commodity_pickupevalfunc =
+float commodity_pickupevalfunc(entity player, entity item)
{
float c;
c = 0;
Modified: trunk/data/qcsrc/server/t_jumppads.qc
===================================================================
--- trunk/data/qcsrc/server/t_jumppads.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/t_jumppads.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -20,7 +20,7 @@
jump time
*/
-vector(vector org, entity tgt, float ht) trigger_push_calculatevelocity =
+vector trigger_push_calculatevelocity(vector org, entity tgt, float ht)
{
local float grav, sdist, zdist, vs, vz, jumpheight, trajsign;
local vector sdir, torg;
@@ -99,7 +99,7 @@
return sdir * vs + '0 0 1' * vz;
}
-void() trigger_push_touch =
+void trigger_push_touch()
{
// FIXME: add a .float for whether an entity should be tossed by jumppads
if (other.classname != "player")
@@ -171,7 +171,7 @@
.vector dest;
-void() trigger_push_findtarget =
+void trigger_push_findtarget()
{
local entity e;
local vector org;
@@ -222,7 +222,7 @@
* values to target a point on the ceiling.
* movedir: if target is not set, this * speed * 10 is the velocity to be reached.
*/
-void() spawnfunc_trigger_push =
+void spawnfunc_trigger_push()
{
if (self.angles != '0 0 0')
SetMovedir ();
@@ -249,6 +249,6 @@
self.nextthink = time + 0.2;
};
-void() spawnfunc_target_push = {};
-void() spawnfunc_info_notnull = {};
-void() spawnfunc_target_position = {};
+void spawnfunc_target_push() {};
+void spawnfunc_info_notnull() {};
+void spawnfunc_target_position() {};
Modified: trunk/data/qcsrc/server/t_plats.qc
===================================================================
--- trunk/data/qcsrc/server/t_plats.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/t_plats.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -16,7 +16,7 @@
void() plat_crush;
float PLAT_LOW_TRIGGER = 1;
-void() plat_spawn_inside_trigger =
+void plat_spawn_inside_trigger()
{
local entity trigger;
local vector tmin, tmax;
@@ -47,7 +47,7 @@
setsize (trigger, tmin, tmax);
};
-void() plat_hit_top =
+void plat_hit_top()
{
sound (self, CHAN_VOICE, self.noise1, 1, ATTN_NORM);
self.state = 1;
@@ -55,27 +55,27 @@
self.nextthink = self.ltime + 3;
};
-void() plat_hit_bottom =
+void plat_hit_bottom()
{
sound (self, CHAN_VOICE, self.noise1, 1, ATTN_NORM);
self.state = 2;
};
-void() plat_go_down =
+void plat_go_down()
{
sound (self, CHAN_VOICE, self.noise, 1, ATTN_NORM);
self.state = 3;
SUB_CalcMove (self.pos2, self.speed, plat_hit_bottom);
};
-void() plat_go_up =
+void plat_go_up()
{
sound (self, CHAN_VOICE, self.noise, 1, ATTN_NORM);
self.state = 4;
SUB_CalcMove (self.pos1, self.speed, plat_hit_top);
};
-void() plat_center_touch =
+void plat_center_touch()
{
if (other.classname != "player")
return;
@@ -90,7 +90,7 @@
self.nextthink = self.ltime + 1; // delay going down
};
-void() plat_outside_touch =
+void plat_outside_touch()
{
if (other.classname != "player")
return;
@@ -103,7 +103,7 @@
plat_go_down ();
};
-void() plat_trigger_use =
+void plat_trigger_use()
{
if (self.think)
return; // allready activated
@@ -111,7 +111,7 @@
};
-void() plat_crush =
+void plat_crush()
{
if((self.spawnflags & 4) && (other.takedamage != DAMAGE_NO)) { // KIll Kill Kill!!
Damage (other, self, self, 10000, DEATH_HURTTRIGGER, other.origin, '0 0 0');
@@ -132,7 +132,7 @@
}
};
-void() plat_use =
+void plat_use()
{
self.use = SUB_Null;
if (self.state != 4)
@@ -143,8 +143,8 @@
.string sound1, sound2;
-void() spawnfunc_path_corner = { };
-void() spawnfunc_func_plat =
+void spawnfunc_path_corner() { };
+void spawnfunc_func_plat()
{
if (!self.t_length)
self.t_length = 80;
@@ -228,20 +228,20 @@
void() train_next;
void() func_train_find;
-void() train_blocked =
+void train_blocked()
{
if (time < self.attack_finished_single)
return;
self.attack_finished_single = time + 0.5;
};
-void() train_use =
+void train_use()
{
if (self.think != func_train_find)
return;
train_next();
};
-void() train_wait =
+void train_wait()
{
if (self.wait)
{
@@ -254,7 +254,7 @@
self.think = train_next;
};
-void() train_next =
+void train_next()
{
local entity targ;
@@ -270,7 +270,7 @@
SUB_CalcMove (targ.origin - self.mins, self.speed, train_wait);
};
-void() func_train_find =
+void func_train_find()
{
local entity targ;
@@ -285,7 +285,7 @@
};
-void() spawnfunc_func_train =
+void spawnfunc_func_train()
{
if (!self.speed)
self.speed = 100;
@@ -324,13 +324,13 @@
*/
void() train_next;
-void() train_wait =
+void train_wait()
{
self.think = train_next;
self.nextthink = self.ltime + self.wait;
};
-void() train_next =
+void train_next()
{
local entity targ;
targ = find(world, targetname, self.target);
@@ -346,7 +346,7 @@
SUB_CalcMove(targ.origin - self.mins, self.speed, train_wait);
};
-void() func_train_find =
+void func_train_find()
{
local entity targ;
targ = find(world, targetname, self.target);
@@ -361,7 +361,7 @@
speed : speed the train moves (can be overridden by each spawnfunc_path_corner)
target : targetname of first spawnfunc_path_corner (starts here)
*/
-void() spawnfunc_func_train =
+void spawnfunc_func_train()
{
if (!self.target)
objerror("func_train without a target");
@@ -383,7 +383,7 @@
-void() rotating_blocked =
+void rotating_blocked()
{
if(self.dmg && other.takedamage != DAMAGE_NO) {
@@ -408,7 +408,7 @@
dmgtime : See above.
*/
-void() spawnfunc_func_rotating =
+void spawnfunc_func_rotating()
{
if (self.noise)
{
@@ -453,7 +453,7 @@
.float height;
.float phase;
-void() func_bobbing_controller_think =
+void func_bobbing_controller_think()
{
local vector v;
self.nextthink = time + 0.1;
@@ -464,7 +464,7 @@
self.owner.velocity = (v - self.owner.origin) * 10;
};
-void() bobbing_blocked =
+void bobbing_blocked()
{
// no need to duplicate code
rotating_blocked();
@@ -479,7 +479,7 @@
dmg : Do this mutch dmg every .dmgtime intervall when blocked
dmgtime : See above.
*/
-void() spawnfunc_func_bobbing =
+void spawnfunc_func_bobbing()
{
local entity controller;
if (self.noise)
@@ -537,7 +537,7 @@
void() button_wait;
void() button_return;
-void() button_wait =
+void button_wait()
{
self.state = STATE_TOP;
self.nextthink = self.ltime + self.wait;
@@ -547,12 +547,12 @@
self.frame = 1; // use alternate textures
};
-void() button_done =
+void button_done()
{
self.state = STATE_BOTTOM;
};
-void() button_return =
+void button_return()
{
self.state = STATE_DOWN;
SUB_CalcMove (self.pos1, self.speed, button_done);
@@ -562,13 +562,13 @@
};
-void() button_blocked =
+void button_blocked()
{
// do nothing, just don't come all the way back out
};
-void() button_fire =
+void button_fire()
{
self.health = self.max_health;
self.takedamage = DAMAGE_NO; // will be reset upon return
@@ -584,7 +584,7 @@
};
-void() button_use =
+void button_use()
{
// if (activator.classname != "player")
// {
@@ -595,7 +595,7 @@
button_fire ();
};
-void() button_touch =
+void button_touch()
{
// if (activator.classname != "player")
// {
@@ -612,7 +612,7 @@
button_fire ();
};
-void(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force) button_damage =
+void button_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
{
self.health = self.health - damage;
if (self.health <= 0)
@@ -643,7 +643,7 @@
2) metallic click
3) in-out
*/
-void() spawnfunc_func_button =
+void spawnfunc_func_button()
{
SetMovedir ();
@@ -708,7 +708,7 @@
void() door_go_down;
void() door_go_up;
-void() door_blocked =
+void door_blocked()
{
if((self.spawnflags & 4) && (other.takedamage != DAMAGE_NO)) { // KIll Kill Kill!!
@@ -748,7 +748,7 @@
};
-void() door_hit_top =
+void door_hit_top()
{
if (self.noise1 != "")
sound (self, CHAN_VOICE, self.noise1, 1, ATTN_NORM);
@@ -759,14 +759,14 @@
self.nextthink = self.ltime + self.wait;
};
-void() door_hit_bottom =
+void door_hit_bottom()
{
if (self.noise1 != "")
sound (self, CHAN_VOICE, self.noise1, 1, ATTN_NORM);
self.state = STATE_BOTTOM;
};
-void() door_go_down =
+void door_go_down()
{
if (self.noise2 != "")
sound (self, CHAN_VOICE, self.noise2, 1, ATTN_NORM);
@@ -780,7 +780,7 @@
SUB_CalcMove (self.pos1, self.speed, door_hit_bottom);
};
-void() door_go_up =
+void door_go_up()
{
if (self.state == STATE_UP)
return; // allready going up
@@ -808,7 +808,7 @@
=============================================================================
*/
-void() door_fire =
+void door_fire()
{
local entity oself;
local entity starte;
@@ -845,7 +845,7 @@
};
-void() door_use =
+void door_use()
{
local entity oself;
@@ -865,7 +865,7 @@
};
-void() door_trigger_touch =
+void door_trigger_touch()
{
if (other.health < 1)
return;
@@ -881,7 +881,7 @@
};
-void(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force) door_damage =
+void door_damage(entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force)
{
local entity oself;
self.health = self.health - damage;
@@ -904,7 +904,7 @@
Prints messages
================
*/
-void() door_touch =
+void door_touch()
{
if (other.classname != "player")
return;
@@ -930,7 +930,7 @@
*/
-entity(vector fmins, vector fmaxs) spawn_field =
+entity spawn_field(vector fmins, vector fmaxs)
{
local entity trigger;
local vector t1, t2;
@@ -949,7 +949,7 @@
};
-float (entity e1, entity e2) EntitiesTouching =
+float EntitiesTouching(entity e1, entity e2)
{
if (e1.mins_x > e2.maxs_x)
return FALSE;
@@ -974,7 +974,7 @@
=============
*/
-void() LinkDoors =
+void LinkDoors()
{
local entity t, starte;
local vector cmins, cmaxs;
@@ -1077,7 +1077,7 @@
*/
-void() spawnfunc_func_door =
+void spawnfunc_func_door()
{
//if (!self.deathtype) // map makers can override this
// self.deathtype = " got in the way";
@@ -1178,7 +1178,7 @@
float SECRET_YES_SHOOT = 16; // shootable even if targeted
-void () fd_secret_use =
+void fd_secret_use()
{
local float temp;
@@ -1227,7 +1227,7 @@
};
// Wait after first movement...
-void () fd_secret_move1 =
+void fd_secret_move1()
{
self.nextthink = self.ltime + 1.0;
self.think = fd_secret_move2;
@@ -1236,7 +1236,7 @@
};
// Start moving sideways w/sound...
-void () fd_secret_move2 =
+void fd_secret_move2()
{
if (self.noise2 != "")
sound(self, CHAN_VOICE, self.noise2, 1, ATTN_NORM);
@@ -1244,7 +1244,7 @@
};
// Wait here until time to go back...
-void () fd_secret_move3 =
+void fd_secret_move3()
{
if (self.noise3 != "")
sound(self, CHAN_VOICE, self.noise3, 1, ATTN_NORM);
@@ -1256,7 +1256,7 @@
};
// Move backward...
-void () fd_secret_move4 =
+void fd_secret_move4()
{
if (self.noise2 != "")
sound(self, CHAN_VOICE, self.noise2, 1, ATTN_NORM);
@@ -1264,7 +1264,7 @@
};
// Wait 1 second...
-void () fd_secret_move5 =
+void fd_secret_move5()
{
self.nextthink = self.ltime + 1.0;
self.think = fd_secret_move6;
@@ -1272,14 +1272,14 @@
sound(self, CHAN_VOICE, self.noise3, 1, ATTN_NORM);
};
-void () fd_secret_move6 =
+void fd_secret_move6()
{
if (self.noise2 != "")
sound(self, CHAN_VOICE, self.noise2, 1, ATTN_NORM);
SUB_CalcMove(self.oldorigin, self.speed, fd_secret_done);
};
-void () fd_secret_done =
+void fd_secret_done()
{
if (!self.targetname || self.spawnflags&SECRET_YES_SHOOT)
{
@@ -1291,7 +1291,7 @@
sound(self, CHAN_VOICE, self.noise3, 1, ATTN_NORM);
};
-void () secret_blocked =
+void secret_blocked()
{
if (time < self.attack_finished_single)
return;
@@ -1306,7 +1306,7 @@
Prints messages
================
*/
-void() secret_touch =
+void secret_touch()
{
if (activator.classname != "player")
return;
@@ -1341,7 +1341,7 @@
3) base
*/
-void () spawnfunc_func_door_secret =
+void spawnfunc_func_door_secret()
{
/*if (!self.deathtype) // map makers can override this
self.deathtype = " got in the way";*/
Modified: trunk/data/qcsrc/server/t_teleporters.qc
===================================================================
--- trunk/data/qcsrc/server/t_teleporters.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/t_teleporters.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -1,4 +1,4 @@
-void() tdeath_touch =
+void tdeath_touch()
{
if (other == self.owner)
return;
@@ -28,7 +28,7 @@
}
// org2 is where they will return to if the teleport fails
-void(vector org, entity death_owner, vector org2) spawn_tdeath =
+void spawn_tdeath(vector org, entity death_owner, vector org2)
{
local entity death;
Modified: trunk/data/qcsrc/server/teamplay.qc
===================================================================
--- trunk/data/qcsrc/server/teamplay.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/teamplay.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -10,7 +10,8 @@
float audit_teams_time;
-float() IsTeamBalanceForced = {
+float IsTeamBalanceForced()
+{
if(intermission_running)
return 0; // no rebalancing whatsoever please
if(!cvar("teamplay"))
@@ -75,7 +76,7 @@
void runematch_init();
void tdm_init();
-void(entity pl) LogTeamchange =
+void LogTeamchange(entity pl)
{
string str;
if(!cvar("sv_eventlog"))
@@ -1308,7 +1309,7 @@
-/*void(entity e, float first) UpdateTeamScore =
+/*void UpdateTeamScore(entity e, float first)
{
clientno = e.FIXME;
if(first)
@@ -1342,7 +1343,7 @@
};
// spawn some default teams if the map is not set up for tdm
-void() tdm_spawnteams =
+void tdm_spawnteams()
{
float numteams;
@@ -1356,7 +1357,7 @@
tdm_spawnteam("Pink", COLOR_TEAM4-1);
};
-void() tdm_delayedinit =
+void tdm_delayedinit()
{
self.think = SUB_Remove;
self.nextthink = time;
@@ -1365,7 +1366,7 @@
tdm_spawnteams();
};
-void() tdm_init =
+void tdm_init()
{
local entity e;
e = spawn();
Modified: trunk/data/qcsrc/server/w_crylink.qc
===================================================================
--- trunk/data/qcsrc/server/w_crylink.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/w_crylink.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -195,7 +195,7 @@
}
*/
-float(float req) w_crylink =
+float w_crylink(float req)
{
if (req == WR_AIM)
{
Modified: trunk/data/qcsrc/server/w_electro.qc
===================================================================
--- trunk/data/qcsrc/server/w_electro.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/w_electro.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -165,7 +165,7 @@
}
.float bot_secondary_electromooth;
-float(float req) w_electro =
+float w_electro(float req)
{
if (req == WR_AIM)
{
Modified: trunk/data/qcsrc/server/w_grenadelauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_grenadelauncher.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/w_grenadelauncher.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -148,7 +148,7 @@
}
.float bot_secondary_grenademooth;
-float(float req) w_glauncher =
+float w_glauncher(float req)
{
if (req == WR_AIM)
{
Modified: trunk/data/qcsrc/server/w_hagar.qc
===================================================================
--- trunk/data/qcsrc/server/w_hagar.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/w_hagar.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -156,7 +156,7 @@
missile.flags = FL_PROJECTILE;
}
-float(float req) w_hagar =
+float w_hagar(float req)
{
if (req == WR_AIM)
if (random()>0.15)
Modified: trunk/data/qcsrc/server/w_laser.qc
===================================================================
--- trunk/data/qcsrc/server/w_laser.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/w_laser.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -75,7 +75,7 @@
missile.flags = FL_PROJECTILE;
}
-float(float req) w_laser =
+float w_laser(float req)
{
local float r1;
local float r2;
Modified: trunk/data/qcsrc/server/w_nex.qc
===================================================================
--- trunk/data/qcsrc/server/w_nex.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/w_nex.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -119,7 +119,7 @@
self.minstagib_nextthink = time + 1;
}
-float(float req) w_nex =
+float w_nex(float req)
{
if (req == WR_AIM)
self.BUTTON_ATCK = bot_aim(1000000, 0, 1, FALSE);
Modified: trunk/data/qcsrc/server/w_rocketlauncher.qc
===================================================================
--- trunk/data/qcsrc/server/w_rocketlauncher.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/w_rocketlauncher.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -283,7 +283,7 @@
flash.effects = flash2.effects = EF_ADDITIVE | EF_FULLBRIGHT | EF_LOWPRECISION;
}
-float(float req) w_rlauncher =
+float w_rlauncher(float req)
{
if (req == WR_AIM)
{
Modified: trunk/data/qcsrc/server/w_shotgun.qc
===================================================================
--- trunk/data/qcsrc/server/w_shotgun.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/w_shotgun.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -84,18 +84,18 @@
}
// weapon frames
-void() shotgun_fire2_03 =
+void shotgun_fire2_03()
{
W_Shotgun_Attack2();
weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_shotgun_secondary_animtime"), w_ready);
}
-void() shotgun_fire2_02 =
+void shotgun_fire2_02()
{
W_Shotgun_Attack2();
weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_shotgun_secondary_animtime"), shotgun_fire2_03);
}
-float(float req) w_shotgun =
+float w_shotgun(float req)
{
if (req == WR_AIM)
if(vlen(self.origin-self.enemy.origin)>200)
Modified: trunk/data/qcsrc/server/w_uzi.qc
===================================================================
--- trunk/data/qcsrc/server/w_uzi.qc 2008-06-30 19:37:50 UTC (rev 3746)
+++ trunk/data/qcsrc/server/w_uzi.qc 2008-07-01 05:28:38 UTC (rev 3747)
@@ -75,7 +75,7 @@
}
// weapon frames
-void() uzi_fire1_02 =
+void uzi_fire1_02()
{
if(self.weapon != self.switchweapon) // abort immediately if switching
{
@@ -101,7 +101,7 @@
weapon_thinkf(WFRAME_FIRE1, cvar("g_balance_uzi_sustained_refire"), w_ready);
};
-float(float req) w_uzi =
+float w_uzi(float req)
{
if (req == WR_AIM)
if(vlen(self.origin-self.enemy.origin) < 3000 - bound(0, skill, 10) * 200)
More information about the nexuiz-commits
mailing list