From: FruitieX <fruitiex@gmail.com>
Date: Wed, 8 Dec 2010 14:27:26 +0000 (+0200)
Subject: fix some of the defrag compat code, start with the shotgun only in CTS
X-Git-Tag: xonotic-v0.1.0preview~51^2~29
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f20d5568723d1899095b212efbe1796233563033;p=xonotic%2Fxonotic-data.pk3dir.git

fix some of the defrag compat code, start with the shotgun only in CTS
---

diff --git a/qcsrc/server/miscfunctions.qc b/qcsrc/server/miscfunctions.qc
index 8e052e837..2fee39193 100644
--- a/qcsrc/server/miscfunctions.qc
+++ b/qcsrc/server/miscfunctions.qc
@@ -881,7 +881,7 @@ float want_weapon(string cvarprefix, entity weaponinfo, float allguns)
 		else if(t < -1)
 			t = 0;
 		else if (g_race || g_cts)
-			t = (i == WEP_LASER);
+			t = (i == WEP_SHOTGUN);
 		else if (g_nexball)
 			t = 0; // weapon is set a few lines later
 		else
diff --git a/qcsrc/server/race.qc b/qcsrc/server/race.qc
index dd48d7b3b..80072a736 100644
--- a/qcsrc/server/race.qc
+++ b/qcsrc/server/race.qc
@@ -742,7 +742,9 @@ void trigger_race_checkpoint_verify()
 		for(trigger = world; (trigger = find(trigger, classname, "trigger_multiple")); )
 			for(targ = world; (targ = find(targ, targetname, trigger.target)); )
 				if (targ.classname == "target_checkpoint" || targ.classname == "target_startTimer" || targ.classname == "target_stopTimer") {
-					targ.wait = -2;
+					trigger.wait = 0;
+					trigger.delay = 0;
+					targ.wait = 0;
 					targ.delay = 0;
 
                     // These just make the game crash on some maps with oddly shaped triggers. 
@@ -750,12 +752,15 @@ void trigger_race_checkpoint_verify()
                     // and often one of them just passed through without being registered. Hope it's fixed  in a better way now.
                     // (happened on item triggers too)
                     //
+					//targ.wait = -2;
+					//targ.delay = 0;
+
 					//setsize(targ, trigger.mins, trigger.maxs);
 					//setorigin(targ, trigger.origin);
 					//remove(trigger);
 				}
 	}
-	remove(self);
+	//remove(self);
 	self = oldself;
 }
 
diff --git a/qcsrc/server/t_quake3.qc b/qcsrc/server/t_quake3.qc
index 241b8f76d..c63b4de2f 100644
--- a/qcsrc/server/t_quake3.qc
+++ b/qcsrc/server/t_quake3.qc
@@ -47,11 +47,13 @@ void target_init_verify()
 		for(targ = world; (targ = find(targ, targetname, trigger.target)); )
 			if (targ.classname == "target_init" || targ.classname == "target_give" || targ.classname == "target_items")
 			{
-				targ.wait = -2;
+				trigger.wait = 0;
+				trigger.delay = 0;
+				targ.wait = 0;
 				targ.delay = 0;
 
-				setsize(targ, trigger.mins, trigger.maxs);
-				setorigin(targ, trigger.origin);
+				//setsize(targ, trigger.mins, trigger.maxs);
+				//setorigin(targ, trigger.origin);
 				//remove(trigger);
 			}
 }
@@ -59,7 +61,7 @@ void target_init_verify()
 void spawnfunc_target_init()
 {
 	self.spawnflags = 0; // remove all weapons except the ones listed below
-	self.netname = "laser uzi"; // keep these weapons through the remove trigger
+	self.netname = "shotgun"; // keep these weapons through the remove trigger
 	spawnfunc_target_items();
 	InitializeEntity(self, target_init_verify, INITPRIO_FINDTARGET);
 }