Merge branch 'master' into wipeout-updates

Author: dusty-qw

include/progs.h

@@ -954,6 +954,7 @@ typedef struct gedict_s
 	float fIllegalFPSWarnings;
 // ILLEGALFPS]
 
+	qbool leavemealone;
 	float shownick_time;					// used to force centerprint is off at desired time
 	clientType_t ct;						// client type for client edicts
 // { timing

src/client.c

@@ -3796,6 +3796,16 @@ void PlayerPreThink(void)
 
 	race_player_pre_think();
 
+	if (self->leavemealone)
+	{
+		if ((self->s.v.mins[0] == 0) || (self->s.v.mins[1] == 0))
+		{
+			// This can happen if the world 'squashes' a SOLID_NOT entity, mvdsv will turn into corpse
+			setsize(self, PASSVEC3(VEC_HULL_MIN), PASSVEC3(VEC_HULL_MAX));
+		}
+		setorigin(self, PASSVEC3(self->s.v.origin));
+	}	
+
 // brokenankle included here
 	if (self->s.v.button2 || self->brokenankle)
 	{

src/combat.c

@@ -463,6 +463,21 @@ void T_Damage(gedict_t *targ, gedict_t *inflictor, gedict_t *attacker, float dam
 		return;
 	}
 
+	// don't bounce around players in prewar who wish to be left alone
+	if (match_in_progress != 2 && targ->leavemealone)
+	{
+		if (attacker != targ && ((targ->ct == ctPlayer) && (attacker->ct == ctPlayer)))
+		{
+			return;
+		}
+		else if (dtTELE1 == targ->deathtype	// always do tele damage
+				|| dtTELE2 == targ->deathtype	// always do tele damage
+				|| dtTELE3 == targ->deathtype)	// always do tele damage
+		{
+			// telefrags still work, to avoid getting stuck
+		}
+	}
+
 	// can't damage other players in race
 	if (isRACE() && (attacker != targ))
 	{

src/commands.c

@@ -72,6 +72,7 @@ void CTFBasedSpawn(void);
 // } CTF
 void FragsDown(void);
 void FragsUp(void);
+void LeaveMeAlone(void);
 void ListWhoNot(void);
 void ModStatus1(void);
 void ModStatus2(void);
@@ -391,6 +392,7 @@ const char CD_NODESC[] = "no desc";
 #define CD_CTOCT			"Show octal charset table"
 #define CD_CTHEX			"Show hexadecimal charset table"
 #define CD_SHOWNICK			"pointed player's info"
+#define CD_LEAVEMEALONE			"can't shoot/bounce players in prewar"
 #define CD_TIME5			"set timelimit to 5 mins"
 #define CD_TIME10			"set timelimit to 10 mins"
 #define CD_TIME15			"set timelimit to 15 mins"
@@ -755,6 +757,7 @@ cmd_t cmds[] =
 	{ "sct_hex", 					ShowCharsetTableHexa, 			0, 			CF_BOTH, 																CD_CTHEX },
 	{ "about", 						ShowVersion, 					0, 			CF_BOTH | CF_MATCHLESS, 												CD_ABOUT },
 	{ "shownick", 					ShowNick, 						0, 			CF_PLAYER | CF_PARAMS, 													CD_SHOWNICK },
+	{ "leavemealone", 				LeaveMeAlone, 					0, 			CF_PLAYER | CF_PARAMS, 													CD_LEAVEMEALONE },
 	{ "time5", 						DEF(TimeSet), 					5.0f, 		CF_PLAYER | CF_SPC_ADMIN, 												CD_TIME5 },
 	{ "time10", 					DEF(TimeSet), 					10.0f, 		CF_PLAYER | CF_SPC_ADMIN, 												CD_TIME10 },
 	{ "time15", 					DEF(TimeSet), 					15.0f, 		CF_PLAYER | CF_SPC_ADMIN, 												CD_TIME15 },
@@ -4070,6 +4073,33 @@ void ShowNick(void)
 	self->shownick_time = g_globalvars.time + 0.8; // clear centerprint at this time
 }
 
+void LeaveMeAlone(void)
+{
+	if (match_in_progress)
+	{
+		return;
+	}
+
+	if (isRA() || isRACE())
+	{
+		return;
+	}
+
+	if (self->leavemealone)
+	{
+		G_bprint(2, "%s %s\n", self->netname, redtext("no longer wants to be left alone"));
+		self->s.v.solid = SOLID_SLIDEBOX;
+	}
+	else
+	{
+		G_bprint(2, "%s %s\n", self->netname, redtext("wants to be left alone"));
+		self->s.v.solid = SOLID_TRIGGER;
+	}
+
+	setorigin(self, PASSVEC3(self->s.v.origin));
+	self->leavemealone = !self->leavemealone;
+}
+
 // qqshka
 
 // below predefined settings for usermodes

src/match.c

@@ -914,6 +914,7 @@ static void SM_PrepareClients(void)
 	for (p = world; (p = find_plr(p));)
 	{
 		players[player_count++] = p;
+		p->leavemealone = false;		// can't have this enabled during match
 	}
 
 	for (i = player_count - 1; i > 0; i--)

src/triggers.c

@@ -715,7 +715,7 @@ void teleport_touch(void)
 	}
 
 // only teleport living creatures
-	if (ISDEAD(other) || (!isRACE() && (other->s.v.solid != SOLID_SLIDEBOX)))
+	if (ISDEAD(other) || (!isRACE() && (other->s.v.solid != SOLID_SLIDEBOX) && !other->leavemealone))
 	{
 		return;
 	}

src/weapons.c

@@ -377,6 +377,12 @@ void TraceAttack(float damage, vec3_t dir, qbool send_effects)
 		return;
 	}
 
+	//can't touch/damage players who want to be left alone
+	if (PROG_TO_EDICT(g_globalvars.trace_ent)->ct == ctPlayer && PROG_TO_EDICT(g_globalvars.trace_ent)->leavemealone)
+	{
+		return;
+	}
+
 	if (PROG_TO_EDICT(g_globalvars.trace_ent)->s.v.takedamage)
 	{
 		if (PROG_TO_EDICT(g_globalvars.trace_ent)->ct == ctPlayer)
@@ -960,6 +966,11 @@ void T_MissileTouch(void)
 		return;
 	}
 
+	if (other->leavemealone)
+	{
+		return;
+	}
+
 	if (self->voided)
 	{
 		return;
@@ -1323,6 +1334,12 @@ void GrenadeTouch(void)
 		return;
 	}
 
+	// can't touch players who want to be left alone
+	if (other->leavemealone)
+	{
+		return;
+	}
+
 	if (other->s.v.takedamage)
 	{
 		if (other->ct == ctPlayer)
@@ -1517,6 +1534,12 @@ void spike_touch(void)
 		return;
 	}
 
+	// can't touch players who want to be left alone
+	if (other->leavemealone)
+	{
+		return;
+	}
+
 	if (self->voided)
 	{
 		return;