default_sc.cfg

@@ -8,10 +8,6 @@ alias pronoun_xey    "impulse 26"
 alias pronoun_ze_hir "impulse 27"
 alias pronoun_ze_zir "impulse 28"
 
-set sc_cheats    0
-set sc_lives     0
-set sc_dist_ammo 0
-
 echo "To change your pronouns in-game use one of the pronoun_ commands."
 echo "You can get a list by typing 'pronoun_' and pressing tab."
 

source/client.qc

@@ -301,9 +301,6 @@ void() trigger_changelevel = {
 */
 
 void() become_spectator = {
-	float not_dead;
-	entity pl;
-
 	self.health       = self.max_health;
 	self.armortype    = 0;
 	self.armorvalue   = 0;
@@ -322,16 +319,6 @@ void() become_spectator = {
 	self.frame        = 0;
 	self.modelindex   = modelindex_eyes;
 	W_SetCurrentAmmo();
-
-	pl = find(world, classname, "player");
-	while(pl != world) {
-		not_dead += pl.lives;
-		pl = find(pl, classname, "player");
-	}
-
-	if(!not_dead) {
-		all_players_are_dead = time;
-	}
 };
 
 void() respawn = {
@@ -352,7 +339,7 @@ void() respawn = {
 		player_respawned = TRUE;
 		PutClientInServer();
 	} else {
-		// restart the map
+		// restart the entire server
 		localcmd("restart\n");
 	}
 };

source/defs.qc

@@ -269,8 +269,6 @@ string(string s) precache_file2 = #77; // registered version only
 // set parm1... to the values at level start for coop respawn
 void(entity e) setspawnparms = #78;
 
-float(string s) checkextension = #99;
-
 // constants -----------------------------------------------------------------|
 
 const vector VEC_ORIGIN = '0 0 0';
@@ -632,9 +630,6 @@ float sf_lives;
 float sf_dist_ammo;
 
 float player_respawned;
-float all_players_are_dead;
-
-float ext_con_set;
 
 // fields --------------------------------------------------------------------|
 

source/world.qc

@@ -17,12 +17,6 @@ void() worldspawn = {
 	lastspawn = world;
 	InitBodyQue();
 
-	if(cvar("pr_checkextension")) {
-		if(checkextension("DP_CON_SET")) {
-			ext_con_set = TRUE;
-		}
-	}
-
 	// custom map attributes
 	if(self.model == "maps/e1m8.bsp") {
 		cvar_set("sv_gravity", "100");
@@ -185,37 +179,16 @@ void() worldspawn = {
 };
 
 void() StartFrame = {
-	entity pl;
+	float temp1flag;
-	float temp1flag, delta;
 
 	teamplay   = cvar("teamplay");
 	skill      = cvar("skill");
+	temp1flag  = cvar("temp1");
 	framecount = framecount + 1;
 
-	if(ext_con_set) {
+	sf_cheats    = (temp1flag & SF_CHEATS) != 0;
-		sf_cheats    = cvar("sc_cheats");
+	sf_lives     = bit_shift_right(temp1flag & SF_LIVES_MSK, SF_LIVES_BEG);
-		sf_lives     = cvar("sc_lives");
+	sf_dist_ammo = (temp1flag & SF_DIST_AMMO) != 0;
-		sf_dist_ammo = cvar("sc_dist_ammo");
-	} else {
-		temp1flag    = cvar("temp1");
-		sf_cheats    = (temp1flag & SF_CHEATS) != 0;
-		sf_lives     = bit_shift_right(temp1flag & SF_LIVES_MSK, SF_LIVES_BEG);
-		sf_dist_ammo = (temp1flag & SF_DIST_AMMO) != 0;
-	}
-
-	if(all_players_are_dead) {
-		delta = time - all_players_are_dead;
-		if(delta >= 9.95) {
-			localcmd("restart\n");
-		} else if(rint(delta * 10) == rint(delta) * 10) {
-			pl = find(world, classname, "player");
-			while(pl != world) {
-				centerprint(pl, "Mission failed.\nRestarting in ",
-				            ftos(10 - rint(delta)), " seconds");
-				pl = find(pl, classname, "player");
-			}
-		}
-	}
 };
 
 /*

todo

@@ -9,12 +9,12 @@ rename all functions to be lower_underscore
 
 core features:
 
-all done
+add registercvar support
+restart map after 10 seconds when everyone is dead
 
 useful features:
 
 configurable enemy stats
-impulse command for spectating
 indicators for where other players are
 users can cancel map ends ("<name> initiated travel to <mapname>")
 
@@ -29,11 +29,9 @@ third person player weapon models
 
 done:
 
-add registercvar support
 corpse pickups have keys
 custom pronouns
 distributed ammo
 enforcers are broken
 lives counting
 no friendly fire
-restart map after 10 seconds when everyone is dead