[nexuiz-commits] r8550 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Jan 25 12:03:42 EST 2010
Author: div0
Date: 2010-01-25 12:03:41 -0500 (Mon, 25 Jan 2010)
New Revision: 8550
Added:
trunk/data/qcsrc/server/cheats.qc
trunk/data/qcsrc/server/cheats.qh
Modified:
trunk/data/qcsrc/server/cl_impulse.qc
trunk/data/qcsrc/server/progs.src
Log:
Factor "impulse" cheats out of cl_impulse.qc
Added: trunk/data/qcsrc/server/cheats.qc
===================================================================
--- trunk/data/qcsrc/server/cheats.qc (rev 0)
+++ trunk/data/qcsrc/server/cheats.qc 2010-01-25 17:03:41 UTC (rev 8550)
@@ -0,0 +1,214 @@
+void CopyBody(float keepvelocity);
+
+.float maycheat;
+float sv_cheats;
+float autocvar_sv_cheats;
+
+#define CHIMPULSE_SPEEDRUN_INIT 30
+#define CHIMPULSE_GIVE_ALL 99
+#define CHIMPULSE_CLONE_MOVING 140
+#define CHIMPULSE_SPEEDRUN 141
+#define CHIMPULSE_CLONE_STANDING 142
+#define CHIMPULSE_TELEPORT 143
+#define CHIMPULSE_R00T 148
+
+float CheatsAllowed(float i, string cmd) // the cheat gets passed as argument for possible future ACL checking
+{
+ if(i == CHIMPULSE_CLONE_MOVING || i == CHIMPULSE_CLONE_STANDING)
+ if(self.lip < sv_clones)
+ return 1;
+ if(self.maycheat)
+ return 1;
+ if(sv_cheats && autocvar_sv_cheats)
+ return 1;
+ if(autocvar_sv_cheats)
+ sprint(self, "Cheats are not yet allowed, and will be activated at next map change.\n");
+ return 0;
+}
+
+float CheatImpulse(float i)
+{
+ if not(CheatsAllowed(i, string_null))
+ return 0;
+ switch(i)
+ {
+ float wep;
+ entity e, e2;
+ vector org;
+
+ case CHIMPULSE_SPEEDRUN_INIT: // deploy personal waypoint
+ if(!self.personal)
+ {
+ self.personal = spawn();
+ self.personal.classname = "personal_wp";
+ }
+ self.personal.origin = self.origin;
+ self.personal.v_angle = self.v_angle;
+ self.personal.velocity = self.velocity;
+ self.personal.ammo_rockets = self.ammo_rockets;
+ self.personal.ammo_nails = self.ammo_nails;
+ self.personal.ammo_cells = self.ammo_cells;
+ self.personal.ammo_shells = self.ammo_shells;
+ self.personal.ammo_fuel = self.ammo_fuel;
+ self.personal.health = self.health;
+ self.personal.armorvalue = self.armorvalue;
+ self.personal.weapons = self.weapons;
+ self.personal.items = self.items;
+ self.personal.pauserotarmor_finished = self.pauserotarmor_finished;
+ self.personal.pauserothealth_finished = self.pauserothealth_finished;
+ self.personal.pauserotfuel_finished = self.pauserotfuel_finished;
+ self.personal.pauseregen_finished = self.pauseregen_finished;
+ self.personal.strength_finished = self.strength_finished;
+ self.personal.invincible_finished = self.invincible_finished;
+ self.personal.teleport_time = time;
+ return 1;
+ case CHIMPULSE_CLONE_MOVING:
+ makevectors (self.v_angle);
+ self.velocity = self.velocity + v_forward * 300;
+ CopyBody(1);
+ self.lip += 1;
+ self.velocity = self.velocity - v_forward * 300;
+ return 1;
+ case CHIMPULSE_CLONE_STANDING:
+ CopyBody(0);
+ self.lip += 1;
+ return 1;
+ case CHIMPULSE_GIVE_ALL:
+ self.weapons |= WEPBIT_ALL;
+ self.items |= IT_UNLIMITED_AMMO;
+ self.ammo_shells = g_pickup_shells_max;
+ self.ammo_nails = g_pickup_nails_max;
+ self.ammo_rockets = g_pickup_rockets_max;
+ self.ammo_cells = g_pickup_cells_max;
+ self.ammo_fuel = g_pickup_fuel_max;
+ self.health = g_pickup_healthsmall_max;
+ self.armorvalue = g_pickup_armorsmall_max;
+ self.pauserotarmor_finished = time + cvar("g_balance_pause_armor_rot_spawn");
+ self.pauserothealth_finished = time + cvar("g_balance_pause_health_rot_spawn");
+ self.pauserotfuel_finished = time + cvar("g_balance_pause_fuel_rot_spawn");
+ self.pauseregen_finished = time + cvar("g_balance_pause_health_regen_spawn");
+ // precache weapon models/sounds
+ wep = WEP_FIRST;
+ while (wep <= WEP_LAST)
+ {
+ weapon_action(wep, WR_PRECACHE);
+ wep = wep + 1;
+ }
+ return 1;
+ case CHIMPULSE_SPEEDRUN:
+ if(self.personal)
+ {
+ self.speedrunning = TRUE;
+ tracebox(self.personal.origin, self.mins, self.maxs, self.personal.origin, MOVE_WORLDONLY, self);
+ if(trace_startsolid)
+ {
+ sprint(self, "Cannot move there, cheater - only waypoints set using g_waypointsprite_personal work\n");
+ }
+ else
+ {
+ // Abort speedrun, teleport back
+ setorigin(self, self.personal.origin);
+ self.oldvelocity = self.velocity = self.personal.velocity;
+ self.angles = self.personal.v_angle;
+ self.fixangle = TRUE;
+ if(self.flagcarried)
+ {
+ bprint("The ", self.flagcarried.netname, " was returned to base by its carrier\n");
+ ReturnFlag(self.flagcarried);
+ }
+ }
+ if(g_ctf)
+ {
+ self.ammo_rockets = 999;
+ self.ammo_nails = 999;
+ self.ammo_cells = 999;
+ self.ammo_shells = 999;
+ self.ammo_fuel = 999;
+ self.health = start_health;
+ self.armorvalue = start_armorvalue;
+ self.weapons |= weaponsInMap;
+ self.pauserotarmor_finished = time + cvar("g_balance_pause_armor_rot_spawn");
+ self.pauserothealth_finished = time + cvar("g_balance_pause_health_rot_spawn");
+ self.pauserotfuel_finished = time + cvar("g_balance_pause_fuel_rot_spawn");
+ self.pauseregen_finished = time + cvar("g_balance_pause_health_regen_spawn");
+ self.strength_finished = 0;
+ self.invincible_finished = 0;
+ }
+ else
+ {
+ self.ammo_rockets = self.personal.ammo_rockets;
+ self.ammo_nails = self.personal.ammo_nails;
+ self.ammo_cells = self.personal.ammo_cells;
+ self.ammo_shells = self.personal.ammo_shells;
+ self.ammo_fuel = self.personal.ammo_fuel;
+ self.health = self.personal.health;
+ self.armorvalue = self.personal.armorvalue;
+ self.weapons = self.personal.weapons;
+ self.items = self.personal.items;
+ self.pauserotarmor_finished = time + self.personal.pauserotarmor_finished - self.personal.teleport_time;
+ self.pauserothealth_finished = time + self.personal.pauserothealth_finished - self.personal.teleport_time;
+ self.pauserotfuel_finished = time + self.personal.pauserotfuel_finished - self.personal.teleport_time;
+ self.pauseregen_finished = time + self.personal.pauseregen_finished - self.personal.teleport_time;
+ self.strength_finished = time + self.personal.strength_finished - self.personal.teleport_time;
+ self.invincible_finished = time + self.personal.invincible_finished - self.personal.teleport_time;
+ }
+ return 1;
+ }
+ else if(self.deadflag != DEAD_NO)
+ sprint(self, "UR DEAD AHAHAH))\n");
+ else
+ sprint(self, "No waypoint set, cheater (use g_waypointsprite_personal to set one)\n");
+ return 0;
+ case CHIMPULSE_TELEPORT:
+ if(MoveToRandomMapLocation(self, DPCONTENTS_SOLID | DPCONTENTS_CORPSE | DPCONTENTS_PLAYERCLIP, DPCONTENTS_SLIME | DPCONTENTS_LAVA | DPCONTENTS_SKY | DPCONTENTS_BODY | DPCONTENTS_DONOTENTER, Q3SURFACEFLAG_SKY, ((sv_cheats >= 2) ? 100000 : 100), 1024, 256))
+ {
+ self.angles_x = -self.angles_x;
+ self.fixangle = TRUE;
+ self.velocity = '0 0 0';
+ return 1;
+ }
+ else
+ sprint(self, "Emergency teleport could not find a good location, forget it!\n");
+ return 0;
+ case CHIMPULSE_R00T:
+ FOR_EACH_PLAYER(e)
+ {
+ if( e.playermodel == "models/player/jeandarc.zym"
+ || e.playermodel == "models/player/pyria.zym"
+ || e.playermodel == "models/player/skadi.zym"
+ || (e.playermodel == "models/player/specop.zym" && random() < 0.5) // you never know
+ || e.playermodel == "models/player/visitant.zym")
+ {
+ makevectors(e.angles);
+ traceline(e.origin, e.origin + v_right * 256, MOVE_NORMAL, e);
+ }
+ else
+ {
+ org_x = random();
+ org_y = random();
+ org_z = 0;
+ org = normalize(org);
+ traceline(e.origin, e.origin + org * 256, MOVE_NORMAL, e); // random direction
+ }
+
+ org = findbetterlocation(trace_endpos, 12);
+
+ e2 = spawn();
+ setorigin(e2, org);
+ pointparticles(particleeffectnum("rocket_explode"), org, '0 0 0', 1);
+ sound(e2, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
+ RadiusDamage(e2, e, 1000, 0, 128, e, 500, DEATH_CHEAT, world);
+ remove(e2);
+ }
+ print("404 Sportsmanship not found.\n");
+ return 1;
+ }
+ return 0;
+}
+
+float CheatCommand(string cmd)
+{
+ if not(CheatsAllowed(0, cmd))
+ return 0;
+ return 0;
+}
Added: trunk/data/qcsrc/server/cheats.qh
===================================================================
--- trunk/data/qcsrc/server/cheats.qh (rev 0)
+++ trunk/data/qcsrc/server/cheats.qh 2010-01-25 17:03:41 UTC (rev 8550)
@@ -0,0 +1,2 @@
+float CheatImpulse(float i);
+float CheatCommand(string cmd);
Modified: trunk/data/qcsrc/server/cl_impulse.qc
===================================================================
--- trunk/data/qcsrc/server/cl_impulse.qc 2010-01-25 14:11:46 UTC (rev 8549)
+++ trunk/data/qcsrc/server/cl_impulse.qc 2010-01-25 17:03:41 UTC (rev 8550)
@@ -1,58 +1,3 @@
-void CopyBody(float keepvelocity);
-
-// changes by LordHavoc on 03/30/04
-// cleaned up dummy code
-// dummies are now removed eventually after being gibbed (norespawn = TRUE)
-// dummy impulse now checks sv_cheats to prevent players from overwhelming server with dummies
-// dummies now use player code where possible
-
-void player_anim (void);
-void DummyThink(void)
-{
- self.think = DummyThink;
- self.nextthink = time;
- SV_PlayerPhysics();
- PlayerPreThink();
- //player_anim();
- PlayerPostThink();
-}
-
-// from dpmod
-void printsurfaceinfo(entity e, vector v)
-{
- local float surfnum, numpoints, vnum;
- local string s;
- local vector n;
- surfnum = getsurfacenearpoint(e, v);
- if (surfnum >= 0)
- {
- sprint(self, "texture: ");
- s = getsurfacetexture(e, surfnum);
- sprint(self, s);
- sprint(self, " normal: ");
- n = getsurfacenormal(e, surfnum);
- sprint(self, vtos(n));
- sprint(self, " ");
- numpoints = getsurfacenumpoints(e, surfnum);
- sprint(self, ftos(numpoints));
- sprint(self, " verts:");
- vnum = 0;
- while (vnum < numpoints)
- {
- sprint(self, " ");
- n = getsurfacepoint(e, surfnum, vnum);
- sprint(self, vtos(n));
- vnum = vnum + 1;
- }
- sprint(self, " point tested: ");
- sprint(self, vtos(v));
- sprint(self, " nearest point on surface: ");
- n = getsurfaceclippedpoint(e, surfnum, v);
- sprint(self, vtos(n));
- sprint(self, "\n");
- }
-};
-
/*
* Impulse map:
*
@@ -79,8 +24,6 @@
* 141: ctf speedrun
* 142: fixed clone
* 143: emergency teleport
- * 144: printsurfaceinfo
- * 145: distance
* 148: unfairly eliminate
*
* TODO:
@@ -96,7 +39,6 @@
vector org;
float i;
float m;
- float wep;
entity e, e2;
imp = self.impulse;
@@ -107,8 +49,11 @@
if (timeoutStatus == 2) //don't allow any impulses while the game is paused
return;
- if (imp >= 1 && imp <= 9)
+ if(CheatImpulse(imp))
{
+ }
+ else if (imp >= 1 && imp <= 9)
+ {
// weapon switching impulses
if(self.deadflag == DEAD_NO)
W_NextWeaponOnImpulse(imp);
@@ -192,33 +137,6 @@
WaypointSprite_UpdateTeamRadar(wp, RADARICON_WAYPOINT, '0 1 1');
WaypointSprite_Ping(wp);
}
- if(sv_cheats)
- {
- if(!self.personal)
- {
- self.personal = spawn();
- self.personal.classname = "personal_wp";
- }
- self.personal.origin = self.origin;
- self.personal.v_angle = self.v_angle;
- self.personal.velocity = self.velocity;
- self.personal.ammo_rockets = self.ammo_rockets;
- self.personal.ammo_nails = self.ammo_nails;
- self.personal.ammo_cells = self.ammo_cells;
- self.personal.ammo_shells = self.ammo_shells;
- self.personal.ammo_fuel = self.ammo_fuel;
- self.personal.health = self.health;
- self.personal.armorvalue = self.armorvalue;
- self.personal.weapons = self.weapons;
- self.personal.items = self.items;
- self.personal.pauserotarmor_finished = self.pauserotarmor_finished;
- self.personal.pauserothealth_finished = self.pauserothealth_finished;
- self.personal.pauserotfuel_finished = self.pauserotfuel_finished;
- self.personal.pauseregen_finished = self.pauseregen_finished;
- self.personal.strength_finished = self.strength_finished;
- self.personal.invincible_finished = self.invincible_finished;
- self.personal.teleport_time = time;
- }
sprint(self, "personal waypoint spawned at location\n");
break;
case 31:
@@ -335,183 +253,6 @@
break;
}
}
- else if(imp >= 140 && imp <= 149 || imp == 99) // 10 cheats ought to be enough for anyone
- {
- if(self.deadflag == DEAD_NO)
- {
- if(sv_cheats || self.maycheat || (self.lip < sv_clones))
- {
- switch(imp)
- {
- case 140:
- makevectors (self.v_angle);
- self.velocity = self.velocity + v_forward * 300;
- CopyBody(1);
- self.lip += 1;
- self.velocity = self.velocity - v_forward * 300;
- break;
- case 142:
- CopyBody(0);
- self.lip += 1;
- break;
- }
- }
-
- if(sv_cheats || self.maycheat)
- {
- switch(imp)
- {
- case 99:
- self.weapons |= WEPBIT_ALL;
- self.items |= IT_UNLIMITED_AMMO;
- self.ammo_shells = g_pickup_shells_max;
- self.ammo_nails = g_pickup_nails_max;
- self.ammo_rockets = g_pickup_rockets_max;
- self.ammo_cells = g_pickup_cells_max;
- self.ammo_fuel = g_pickup_fuel_max;
- self.health = g_pickup_healthsmall_max;
- self.armorvalue = g_pickup_armorsmall_max;
- self.pauserotarmor_finished = time + cvar("g_balance_pause_armor_rot_spawn");
- self.pauserothealth_finished = time + cvar("g_balance_pause_health_rot_spawn");
- self.pauserotfuel_finished = time + cvar("g_balance_pause_fuel_rot_spawn");
- self.pauseregen_finished = time + cvar("g_balance_pause_health_regen_spawn");
- // precache weapon models/sounds
- wep = WEP_FIRST;
- while (wep <= WEP_LAST)
- {
- weapon_action(wep, WR_PRECACHE);
- wep = wep + 1;
- }
- break;
- case 141:
- if(self.personal)
- {
- self.speedrunning = TRUE;
- tracebox(self.personal.origin, self.mins, self.maxs, self.personal.origin, MOVE_WORLDONLY, self);
- if(trace_startsolid)
- {
- sprint(self, "Cannot move there, cheater - only waypoints set using g_waypointsprite_personal work\n");
- }
- else
- {
- // Abort speedrun, teleport back
- setorigin(self, self.personal.origin);
- self.oldvelocity = self.velocity = self.personal.velocity;
- self.angles = self.personal.v_angle;
- self.fixangle = TRUE;
- if(self.flagcarried)
- {
- bprint("The ", self.flagcarried.netname, " was returned to base by its carrier\n");
- ReturnFlag(self.flagcarried);
- }
- }
- if(g_ctf)
- {
- self.ammo_rockets = 999;
- self.ammo_nails = 999;
- self.ammo_cells = 999;
- self.ammo_shells = 999;
- self.ammo_fuel = 999;
- self.health = start_health;
- self.armorvalue = start_armorvalue;
- self.weapons |= weaponsInMap;
- self.pauserotarmor_finished = time + cvar("g_balance_pause_armor_rot_spawn");
- self.pauserothealth_finished = time + cvar("g_balance_pause_health_rot_spawn");
- self.pauserotfuel_finished = time + cvar("g_balance_pause_fuel_rot_spawn");
- self.pauseregen_finished = time + cvar("g_balance_pause_health_regen_spawn");
- self.strength_finished = 0;
- self.invincible_finished = 0;
- }
- else
- {
- self.ammo_rockets = self.personal.ammo_rockets;
- self.ammo_nails = self.personal.ammo_nails;
- self.ammo_cells = self.personal.ammo_cells;
- self.ammo_shells = self.personal.ammo_shells;
- self.ammo_fuel = self.personal.ammo_fuel;
- self.health = self.personal.health;
- self.armorvalue = self.personal.armorvalue;
- self.weapons = self.personal.weapons;
- self.items = self.personal.items;
- self.pauserotarmor_finished = time + self.personal.pauserotarmor_finished - self.personal.teleport_time;
- self.pauserothealth_finished = time + self.personal.pauserothealth_finished - self.personal.teleport_time;
- self.pauserotfuel_finished = time + self.personal.pauserotfuel_finished - self.personal.teleport_time;
- self.pauseregen_finished = time + self.personal.pauseregen_finished - self.personal.teleport_time;
- self.strength_finished = time + self.personal.strength_finished - self.personal.teleport_time;
- self.invincible_finished = time + self.personal.invincible_finished - self.personal.teleport_time;
- }
- }
- else if(self.deadflag != DEAD_NO)
- sprint(self, "UR DEAD AHAHAH))\n");
- else
- sprint(self, "No waypoint set, cheater (use g_waypointsprite_personal to set one)\n");
- break;
- case 143:
- if(MoveToRandomMapLocation(self, DPCONTENTS_SOLID | DPCONTENTS_CORPSE | DPCONTENTS_PLAYERCLIP, DPCONTENTS_SLIME | DPCONTENTS_LAVA | DPCONTENTS_SKY | DPCONTENTS_BODY | DPCONTENTS_DONOTENTER, Q3SURFACEFLAG_SKY, ((sv_cheats >= 2) ? 100000 : 100), 1024, 256))
- {
- self.angles_x = -self.angles_x;
- self.fixangle = TRUE;
- self.velocity = '0 0 0';
- }
- else
- sprint(self, "Emergency teleport could not find a good location, forget it!\n");
- break;
- case 144:
- makevectors(self.v_angle);
- traceline(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * MAX_SHOT_DISTANCE, FALSE, self);
- if (trace_fraction < 1)
- printsurfaceinfo(trace_ent, trace_endpos);
- break;
- case 145:
- makevectors(self.v_angle);
- traceline(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * 65536, FALSE, self);
- sprint(self, strcat("distance: ", ftos(fabs(vlen(trace_endpos - (self.origin + self.view_ofs)))), "\n"));
- break;
- case 146:
- makevectors(self.v_angle);
- i = self.dphitcontentsmask;
- self.dphitcontentsmask = DPCONTENTS_OPAQUE;
- traceline(self.origin + self.view_ofs, self.origin + self.view_ofs + v_forward * 65536, FALSE, self);
- self.dphitcontentsmask = i;
- sprint(self, strcat("distance: ", ftos(fabs(vlen(trace_endpos - (self.origin + self.view_ofs)))), "\n"));
- pointparticles(particleeffectnum("fire_big"), trace_endpos, '0 0 0', 10);
- break;
- case 148:
- FOR_EACH_PLAYER(e)
- {
- if( e.playermodel == "models/player/jeandarc.zym"
- || e.playermodel == "models/player/pyria.zym"
- || e.playermodel == "models/player/skadi.zym"
- || (e.playermodel == "models/player/specop.zym" && random() < 0.5) // you never know
- || e.playermodel == "models/player/visitant.zym")
- {
- makevectors(e.angles);
- traceline(e.origin, e.origin + v_right * 256, MOVE_NORMAL, e);
- }
- else
- {
- org_x = random();
- org_y = random();
- org_z = 0;
- org = normalize(org);
- traceline(e.origin, e.origin + org * 256, MOVE_NORMAL, e); // random direction
- }
-
- org = findbetterlocation(trace_endpos, 12);
-
- e2 = spawn();
- setorigin(e2, org);
- pointparticles(particleeffectnum("rocket_explode"), org, '0 0 0', 1);
- sound(e2, CHAN_PROJECTILE, "weapons/rocket_impact.wav", VOL_BASE, ATTN_NORM);
- RadiusDamage(e2, e, 1000, 0, 128, e, 500, DEATH_CHEAT, world);
- remove(e2);
- }
- print("404 Sportsmanship not found.\n");
- break;
- }
- }
- }
- }
else if(imp >= 103 && imp <= 107)
{
if(cvar("g_waypointeditor"))
Modified: trunk/data/qcsrc/server/progs.src
===================================================================
--- trunk/data/qcsrc/server/progs.src 2010-01-25 14:11:46 UTC (rev 8549)
+++ trunk/data/qcsrc/server/progs.src 2010-01-25 17:03:41 UTC (rev 8550)
@@ -26,6 +26,7 @@
csqceffects.qc
anticheat.qh
+cheats.qh
portals.qh
@@ -163,3 +164,4 @@
playerdemo.qc
anticheat.qc
+cheats.qc
More information about the nexuiz-commits
mailing list