[nexuiz-commits] r8555 - trunk/data/qcsrc/server
DONOTREPLY at icculus.org
DONOTREPLY at icculus.org
Mon Jan 25 12:05:49 EST 2010
Author: div0
Date: 2010-01-25 12:05:43 -0500 (Mon, 25 Jan 2010)
New Revision: 8555
Modified:
trunk/data/qcsrc/server/campaign.qc
trunk/data/qcsrc/server/cheats.qc
trunk/data/qcsrc/server/cheats.qh
trunk/data/qcsrc/server/cl_client.qc
trunk/data/qcsrc/server/clientcommands.qc
trunk/data/qcsrc/server/defs.qh
trunk/data/qcsrc/server/ent_cs.qc
trunk/data/qcsrc/server/gamecommand.qc
trunk/data/qcsrc/server/miscfunctions.qc
Log:
get rid of all cheat stuff from other files;
make sv_cheats global not used outside
when compiling with -DNOCHEATS, cheat code is not even compiled in
Modified: trunk/data/qcsrc/server/campaign.qc
===================================================================
--- trunk/data/qcsrc/server/campaign.qc 2010-01-25 17:05:08 UTC (rev 8554)
+++ trunk/data/qcsrc/server/campaign.qc 2010-01-25 17:05:43 UTC (rev 8555)
@@ -186,7 +186,7 @@
head = head.chain;
}
- if(won == 1 && lost == 0 && checkrules_equality == 0)
+ if(won == 1 && lost == 0 && checkrules_equality == 0 && cheatcount_total == 0)
{
campaign_won = 1;
bprint("The current level has been WON.\n");
@@ -241,8 +241,6 @@
void CampaignLevelWarp(float n)
{
- if(!sv_cheats)
- return;
CampaignFile_Unload();
CampaignFile_Load(n, 1);
if(campaign_entries)
Modified: trunk/data/qcsrc/server/cheats.qc
===================================================================
--- trunk/data/qcsrc/server/cheats.qc 2010-01-25 17:05:08 UTC (rev 8554)
+++ trunk/data/qcsrc/server/cheats.qc 2010-01-25 17:05:43 UTC (rev 8555)
@@ -1,5 +1,18 @@
void CopyBody(float keepvelocity);
+#ifdef NOCHEATS
+
+float CheatImpulse(float i) { return 0; }
+float CheatCommand(float argc) { return 0; }
+float CheatFrame() { return 0; }
+void CheatInit() { cheatcount_total = world.cheatcount; }
+void CheatShutdown() { }
+void CheatInitClient() { }
+void CheatShutdownClient() { }
+void Drag_MoveDrag(entity from, entity to) { }
+
+#else
+
.float maycheat;
float sv_cheats;
float autocvar_sv_cheats;
@@ -14,11 +27,28 @@
#define CHRAME_DRAG 1
+void CheatInit()
+{
+ sv_cheats = cvar("sv_cheats");
+}
+
+void CheatShutdown()
+{
+}
+
+void CheatInitClient()
+{
+}
+
+void CheatShutdownClient()
+{
+}
+
float CheatsAllowed(float i, float argc, float fr) // 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)
- goto allow;
+ return 1;
if(self.maycheat)
return 1;
if(sv_cheats && autocvar_sv_cheats)
@@ -213,6 +243,8 @@
return 1;
}
+void DragBox_Think();
+float drag_lastcnt;
float CheatCommand(float argc)
{
if not(CheatsAllowed(0, argc, 0))
@@ -530,6 +562,13 @@
for(e = world; (e = find(e, classname, "drag_digit")); )
remove(e);
goto cheated;
+ case "warp":
+ if(argc == 2) if(cvar("g_campaign"))
+ {
+ CampaignLevelWarp(stof(argv(1)));
+ goto cheated;
+ }
+ break;
case "god":
BITXOR_ASSIGN(self.flags, FL_GODMODE);
if(self.flags & FL_GODMODE)
@@ -842,3 +881,44 @@
}
}
+
+
+
+
+
+void DragBox_Think()
+{
+ if(self.aiment && self.enemy)
+ {
+ self.origin_x = (self.aiment.origin_x + self.enemy.origin_x) * 0.5;
+ self.origin_y = (self.aiment.origin_y + self.enemy.origin_y) * 0.5;
+ self.origin_z = (self.aiment.origin_z + self.enemy.origin_z) * 0.5;
+ self.maxs_x = fabs(self.aiment.origin_x - self.enemy.origin_x) * 0.5;
+ self.maxs_y = fabs(self.aiment.origin_y - self.enemy.origin_y) * 0.5;
+ self.maxs_z = fabs(self.aiment.origin_z - self.enemy.origin_z) * 0.5;
+ self.mins = -1 * self.maxs;
+ setorigin(self, self.origin); setsize(self, self.mins, self.maxs); // link edict
+ }
+
+ if(self.cnt == -1) // actually race_place -1
+ {
+ // show "10 10" for qualifying spawns
+ setmodel(self.killindicator, "models/sprites/10.spr32");
+ setmodel(self.killindicator.killindicator, "models/sprites/10.spr32");
+ }
+ else if(self.cnt == -2) // actually race_place 0
+ {
+ // show "10 0" for loser spawns
+ setmodel(self.killindicator, "models/sprites/10.spr32");
+ setmodel(self.killindicator.killindicator, "models/sprites/0.spr32");
+ }
+ else
+ {
+ setmodel(self.killindicator, strcat("models/sprites/", ftos(mod(self.cnt, 10)), ".spr32"));
+ setmodel(self.killindicator.killindicator, strcat("models/sprites/", ftos(floor(self.cnt / 10)), ".spr32"));
+ }
+
+ self.nextthink = time;
+}
+
+#endif
Modified: trunk/data/qcsrc/server/cheats.qh
===================================================================
--- trunk/data/qcsrc/server/cheats.qh 2010-01-25 17:05:08 UTC (rev 8554)
+++ trunk/data/qcsrc/server/cheats.qh 2010-01-25 17:05:43 UTC (rev 8555)
@@ -1,5 +1,11 @@
float cheatcount_total;
.float cheatcount;
+void CheatInit();
+void CheatShutdown();
+void CheatInitClient();
+void CheatShutdownClient();
float CheatImpulse(float i);
float CheatCommand(float argc);
float CheatFrame();
+
+void Drag_MoveDrag(entity from, entity to); // call this from CopyBody
Modified: trunk/data/qcsrc/server/cl_client.qc
===================================================================
--- trunk/data/qcsrc/server/cl_client.qc 2010-01-25 17:05:08 UTC (rev 8554)
+++ trunk/data/qcsrc/server/cl_client.qc 2010-01-25 17:05:43 UTC (rev 8555)
@@ -1447,7 +1447,7 @@
ctf_clientconnect();
}*/
- if(teams_matter || sv_cheats)
+ if(teams_matter || radar_showennemies)
attach_entcs();
bot_relinkplayerlist();
Modified: trunk/data/qcsrc/server/clientcommands.qc
===================================================================
--- trunk/data/qcsrc/server/clientcommands.qc 2010-01-25 17:05:08 UTC (rev 8554)
+++ trunk/data/qcsrc/server/clientcommands.qc 2010-01-25 17:05:43 UTC (rev 8555)
@@ -94,42 +94,6 @@
return world;
}
-float drag_lastcnt;
-void DragBox_Think()
-{
- if(self.aiment && self.enemy)
- {
- self.origin_x = (self.aiment.origin_x + self.enemy.origin_x) * 0.5;
- self.origin_y = (self.aiment.origin_y + self.enemy.origin_y) * 0.5;
- self.origin_z = (self.aiment.origin_z + self.enemy.origin_z) * 0.5;
- self.maxs_x = fabs(self.aiment.origin_x - self.enemy.origin_x) * 0.5;
- self.maxs_y = fabs(self.aiment.origin_y - self.enemy.origin_y) * 0.5;
- self.maxs_z = fabs(self.aiment.origin_z - self.enemy.origin_z) * 0.5;
- self.mins = -1 * self.maxs;
- setorigin(self, self.origin); setsize(self, self.mins, self.maxs); // link edict
- }
-
- if(self.cnt == -1) // actually race_place -1
- {
- // show "10 10" for qualifying spawns
- setmodel(self.killindicator, "models/sprites/10.spr32");
- setmodel(self.killindicator.killindicator, "models/sprites/10.spr32");
- }
- else if(self.cnt == -2) // actually race_place 0
- {
- // show "10 0" for loser spawns
- setmodel(self.killindicator, "models/sprites/10.spr32");
- setmodel(self.killindicator.killindicator, "models/sprites/0.spr32");
- }
- else
- {
- setmodel(self.killindicator, strcat("models/sprites/", ftos(mod(self.cnt, 10)), ".spr32"));
- setmodel(self.killindicator.killindicator, strcat("models/sprites/", ftos(floor(self.cnt / 10)), ".spr32"));
- }
-
- self.nextthink = time;
-}
-
//float ctf_clientcommand();
float readyrestart_happened;
.float lms_spectate_warning;
Modified: trunk/data/qcsrc/server/defs.qh
===================================================================
--- trunk/data/qcsrc/server/defs.qh 2010-01-25 17:05:08 UTC (rev 8554)
+++ trunk/data/qcsrc/server/defs.qh 2010-01-25 17:05:43 UTC (rev 8555)
@@ -42,7 +42,6 @@
float g_jetpack;
float sv_clones;
-float sv_cheats;
float sv_gentle;
float sv_foginterval;
@@ -575,8 +574,6 @@
float servertime, serverprevtime, serverframetime;
-void Drag_MoveDrag(entity from, entity to);
-
.entity soundentity;
.float ammo_fuel;
@@ -608,7 +605,6 @@
FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(stats_hit);
FTEQCC_YOU_SUCK_THIS_IS_NOT_UNREFERENCED(stats_fired);
-.float maycheat;
.float stat_leadlimit;
float radar_showennemies;
Modified: trunk/data/qcsrc/server/ent_cs.qc
===================================================================
--- trunk/data/qcsrc/server/ent_cs.qc 2010-01-25 17:05:08 UTC (rev 8554)
+++ trunk/data/qcsrc/server/ent_cs.qc 2010-01-25 17:05:43 UTC (rev 8555)
@@ -32,7 +32,7 @@
return FALSE;
if(other.classname == "player")
if(o.team != other.team)
- if not (sv_cheats || radar_showennemies)
+ if not (radar_showennemies)
return FALSE;
return TRUE;
}
Modified: trunk/data/qcsrc/server/gamecommand.qc
===================================================================
--- trunk/data/qcsrc/server/gamecommand.qc 2010-01-25 17:05:08 UTC (rev 8554)
+++ trunk/data/qcsrc/server/gamecommand.qc 2010-01-25 17:05:43 UTC (rev 8555)
@@ -683,12 +683,6 @@
return;
}
- if(argv(0) == "warp") if(argc == 2) if(cvar("g_campaign"))
- {
- CampaignLevelWarp(stof(argv(1)));
- return;
- }
-
if(argv(0) == "gotomap") if(argc == 2)
{
print(GotoMap(argv(1)), "\n");
Modified: trunk/data/qcsrc/server/miscfunctions.qc
===================================================================
--- trunk/data/qcsrc/server/miscfunctions.qc 2010-01-25 17:05:08 UTC (rev 8554)
+++ trunk/data/qcsrc/server/miscfunctions.qc 2010-01-25 17:05:43 UTC (rev 8555)
@@ -1230,7 +1230,6 @@
sv_loddistance2 = 1073741824; // enough to turn off LOD 2 reliably
sv_clones = cvar("sv_clones");
- sv_cheats = cvar("sv_cheats");
sv_gentle = cvar("sv_gentle");
sv_foginterval = cvar("sv_foginterval");
g_cloaked = cvar("g_cloaked");
More information about the nexuiz-commits
mailing list