X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_player.qc;h=8e84f4863a9e3b2b7373a05f0d680831e4d1d86f;hp=afd52171e1d2f7e834d63bae8a320a6576780f6d;hb=1c758278958da8f2baf1f39cd0f298d5bda097a2;hpb=34195feabdbcec29f6b7f6fcf8df8e25c4f41d8a

diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc
index afd52171e1..8e84f4863a 100644
--- a/qcsrc/server/cl_player.qc
+++ b/qcsrc/server/cl_player.qc
@@ -1,12 +1,31 @@
 #include "cl_player.qh"
-#include "g_triggers.qh"
+#include "_all.qh"
+
+#include "bot/bot.qh"
+#include "cheats.qh"
+#include "g_damage.qh"
+#include "g_subs.qh"
 #include "g_violence.qh"
 #include "miscfunctions.qh"
+#include "portals.qh"
+#include "teamplay.qh"
+#include "weapons/throwing.qh"
+#include "command/common.qh"
+#include "../common/animdecide.qh"
+#include "../common/csqcmodel_settings.qh"
+#include "../common/deathtypes.qh"
+#include "../common/triggers/subs.qh"
+#include "../common/playerstats.qh"
+#include "../csqcmodellib/sv_model.qh"
+
+#include "../common/minigames/sv_minigames.qh"
 
 #include "weapons/weaponstats.qh"
 
+#include "../common/animdecide.qh"
+
 void CopyBody_Think(void)
-{
+{SELFPARAM();
 	if(self.CopyBody_nextthink && time > self.CopyBody_nextthink)
 	{
 		self.CopyBody_think();
@@ -16,90 +35,88 @@ void CopyBody_Think(void)
 		self.CopyBody_think = self.think;
 		self.think = CopyBody_Think;
 	}
-	CSQCMODEL_AUTOUPDATE();
+	CSQCMODEL_AUTOUPDATE(self);
 	self.nextthink = time;
 }
 void CopyBody(float keepvelocity)
-{
-	entity oldself;
+{SELFPARAM();
 	if (self.effects & EF_NODRAW)
 		return;
-	oldself = self;
-	self = spawn();
-	self.enemy = oldself;
-	self.lip = oldself.lip;
-	self.colormap = oldself.colormap;
-	self.iscreature = oldself.iscreature;
-	self.teleportable = oldself.teleportable;
-	self.damagedbycontents = oldself.damagedbycontents;
-	self.angles = oldself.angles;
-	self.v_angle = oldself.v_angle;
-	self.avelocity = oldself.avelocity;
+	setself(spawn());
+	self.enemy = this;
+	self.lip = this.lip;
+	self.colormap = this.colormap;
+	self.iscreature = this.iscreature;
+	self.teleportable = this.teleportable;
+	self.damagedbycontents = this.damagedbycontents;
+	self.angles = this.angles;
+	self.v_angle = this.v_angle;
+	self.avelocity = this.avelocity;
 	self.classname = "body";
-	self.damageforcescale = oldself.damageforcescale;
-	self.effects = oldself.effects;
-	self.glowmod = oldself.glowmod;
-	self.event_damage = oldself.event_damage;
-	self.anim_state = oldself.anim_state;
-	self.anim_time = oldself.anim_time;
-	self.anim_lower_action = oldself.anim_lower_action;
-	self.anim_lower_time = oldself.anim_lower_time;
-	self.anim_upper_action = oldself.anim_upper_action;
-	self.anim_upper_time = oldself.anim_upper_time;
-	self.anim_implicit_state = oldself.anim_implicit_state;
-	self.anim_implicit_time = oldself.anim_implicit_time;
-	self.anim_lower_implicit_action = oldself.anim_lower_implicit_action;
-	self.anim_lower_implicit_time = oldself.anim_lower_implicit_time;
-	self.anim_upper_implicit_action = oldself.anim_upper_implicit_action;
-	self.anim_upper_implicit_time = oldself.anim_upper_implicit_time;
-	self.dphitcontentsmask = oldself.dphitcontentsmask;
-	self.death_time = oldself.death_time;
-	self.pain_finished = oldself.pain_finished;
-	self.health = oldself.health;
-	self.armorvalue = oldself.armorvalue;
-	self.armortype = oldself.armortype;
-	self.model = oldself.model;
-	self.modelindex = oldself.modelindex;
-	self.skin = oldself.skin;
-	self.species = oldself.species;
-	self.movetype = oldself.movetype;
-	self.solid = oldself.solid;
-	self.ballistics_density = oldself.ballistics_density;
-	self.takedamage = oldself.takedamage;
-	self.customizeentityforclient = oldself.customizeentityforclient;
-	self.uncustomizeentityforclient = oldself.uncustomizeentityforclient;
-	self.uncustomizeentityforclient_set = oldself.uncustomizeentityforclient_set;
+	self.damageforcescale = this.damageforcescale;
+	self.effects = this.effects;
+	self.glowmod = this.glowmod;
+	self.event_damage = this.event_damage;
+	self.anim_state = this.anim_state;
+	self.anim_time = this.anim_time;
+	self.anim_lower_action = this.anim_lower_action;
+	self.anim_lower_time = this.anim_lower_time;
+	self.anim_upper_action = this.anim_upper_action;
+	self.anim_upper_time = this.anim_upper_time;
+	self.anim_implicit_state = this.anim_implicit_state;
+	self.anim_implicit_time = this.anim_implicit_time;
+	self.anim_lower_implicit_action = this.anim_lower_implicit_action;
+	self.anim_lower_implicit_time = this.anim_lower_implicit_time;
+	self.anim_upper_implicit_action = this.anim_upper_implicit_action;
+	self.anim_upper_implicit_time = this.anim_upper_implicit_time;
+	self.dphitcontentsmask = this.dphitcontentsmask;
+	self.death_time = this.death_time;
+	self.pain_finished = this.pain_finished;
+	self.health = this.health;
+	self.armorvalue = this.armorvalue;
+	self.armortype = this.armortype;
+	self.model = this.model;
+	self.modelindex = this.modelindex;
+	self.skin = this.skin;
+	self.species = this.species;
+	self.movetype = this.movetype;
+	self.solid = this.solid;
+	self.ballistics_density = this.ballistics_density;
+	self.takedamage = this.takedamage;
+	self.customizeentityforclient = this.customizeentityforclient;
+	self.uncustomizeentityforclient = this.uncustomizeentityforclient;
+	self.uncustomizeentityforclient_set = this.uncustomizeentityforclient_set;
 	if (keepvelocity == 1)
-		self.velocity = oldself.velocity;
+		self.velocity = this.velocity;
 	self.oldvelocity = self.velocity;
-	self.alpha = oldself.alpha;
-	self.fade_time = oldself.fade_time;
-	self.fade_rate = oldself.fade_rate;
-	//self.weapon = oldself.weapon;
-	setorigin(self, oldself.origin);
-	setsize(self, oldself.mins, oldself.maxs);
-	self.prevorigin = oldself.origin;
+	self.alpha = this.alpha;
+	self.fade_time = this.fade_time;
+	self.fade_rate = this.fade_rate;
+	//self.weapon = this.weapon;
+	setorigin(self, this.origin);
+	setsize(self, this.mins, this.maxs);
+	self.prevorigin = this.origin;
 	self.reset = SUB_Remove;
 
-	Drag_MoveDrag(oldself, self);
+	Drag_MoveDrag(this, self);
 
 	if(self.colormap <= maxclients && self.colormap > 0)
-		self.colormap = 1024 + oldself.clientcolors;
+		self.colormap = 1024 + this.clientcolors;
 
-	CSQCMODEL_AUTOINIT();
-	self.CopyBody_nextthink = oldself.nextthink;
-	self.CopyBody_think = oldself.think;
+	CSQCMODEL_AUTOINIT(self);
+	self.CopyBody_nextthink = this.nextthink;
+	self.CopyBody_think = this.think;
 	self.nextthink = time;
 	self.think = CopyBody_Think;
 	// "bake" the current animation frame for clones (they don't get clientside animation)
 	animdecide_load_if_needed(self);
 	animdecide_setframes(self, false, frame, frame1time, frame2, frame2time);
 
-	self = oldself;
+	setself(this);
 }
 
 float player_getspecies()
-{
+{SELFPARAM();
 	float s;
 	get_model_parameters(self.model, self.skin);
 	s = get_model_parameters_species;
@@ -110,14 +127,14 @@ float player_getspecies()
 }
 
 void player_setupanimsformodel()
-{
+{SELFPARAM();
 	// load animation info
 	animdecide_load_if_needed(self);
 	animdecide_setstate(self, 0, false);
 }
 
 void player_anim (void)
-{
+{SELFPARAM();
 	int deadbits = (self.anim_state & (ANIMSTATE_DEAD1 | ANIMSTATE_DEAD2));
 	if(self.deadflag) {
 		if (!deadbits) {
@@ -134,6 +151,8 @@ void player_anim (void)
 	int animbits = deadbits;
 	if(self.frozen)
 		animbits |= ANIMSTATE_FROZEN;
+	if(self.movetype == MOVETYPE_FOLLOW)
+		animbits |= ANIMSTATE_FOLLOW;
 	if(self.crouch)
 		animbits |= ANIMSTATE_DUCK;
 	animdecide_setstate(self, animbits, false);
@@ -148,7 +167,7 @@ void player_anim (void)
 }
 
 void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
-{
+{SELFPARAM();
 	float take, save;
 	vector v;
 	Violence_GibSplash_At(hitloc, force, 2, bound(0, damage, 200) / 16, self, attacker);
@@ -200,7 +219,7 @@ void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, int de
 }
 
 void calculate_player_respawn_time()
-{
+{SELFPARAM();
 	if(g_ca)
 		return;
 
@@ -287,7 +306,7 @@ void calculate_player_respawn_time()
 }
 
 void PlayerDamage (entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
-{
+{SELFPARAM();
 	float take, save, dh, da;
 	int j;
 	vector v;
@@ -304,7 +323,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, int deathtyp
 			damage /= sqrt(bound(1.0, attacker.cvar_cl_handicap, 100.0));
 	}
 
-	if(DEATH_ISWEAPON(deathtype, WEP_TUBA))
+	if(DEATH_ISWEAPON(deathtype, WEP_TUBA.m_id))
 	{
 		// tuba causes blood to come out of the ears
 		vector ear1, ear2;
@@ -367,14 +386,8 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, int deathtyp
 		self.istypefrag = 0;
 	}
 
-	frag_inflictor = inflictor;
-	frag_attacker = attacker;
-	frag_target = self;
 	frag_damage = damage;
-	damage_take = take;
-	damage_save = save;
-	damage_force = force;
-	MUTATOR_CALLHOOK(PlayerDamage_SplitHealthArmor);
+	MUTATOR_CALLHOOK(PlayerDamage_SplitHealthArmor, inflictor, attacker, self, force, take, save);
 	take = bound(0, damage_take, self.health);
 	save = bound(0, damage_save, self.armorvalue);
 	excess = max(0, damage - take - save);
@@ -480,6 +493,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, int deathtyp
 		dh = dh - max(self.health, 0);
 		da = da - max(self.armorvalue, 0);
 		WeaponStats_LogDamage(awep, abot, self.weapon, vbot, dh + da);
+		MUTATOR_CALLHOOK(PlayerDamaged, attacker, self, dh, da, hitloc);
 	}
 
 	if (self.health < 1)
@@ -517,7 +531,7 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, int deathtyp
 			if(deathtype == DEATH_KILL)
 			{
 				// for the lemmings fans, a small harmless explosion
-				pointparticles(particleeffectnum("rocket_explode"), self.origin, '0 0 0', 1);
+				Send_Effect(EFFECT_ROCKET_EXPLODE, self.origin, '0 0 0', 1);
 			}
 		}
 
@@ -531,11 +545,8 @@ void PlayerDamage (entity inflictor, entity attacker, float damage, int deathtyp
 	if(accuracy_isgooddamage(attacker, self))
         attacker.accuracy.(accuracy_frags[w-1]) += 1;
 
-		frag_attacker = attacker;
-		frag_inflictor = inflictor;
-		frag_target = self;
-		frag_deathtype = deathtype;
-		MUTATOR_CALLHOOK(PlayerDies);
+		MUTATOR_CALLHOOK(PlayerDies, inflictor, attacker, self, deathtype);
+		excess = frag_damage;
 
 		WEP_ACTION(self.weapon, WR_PLAYERDEATH);
 
@@ -697,12 +708,28 @@ float Say(entity source, float teamsay, entity privatesay, string msgin, float f
 		}
 		else if(teamsay)
 		{
-			msgstr = strcat("\{1}\{13}", colorstr, "(", colorprefix, namestr, colorstr, ") ^7", msgin);
+			if(strstrofs(msgin, "/me", 0) >= 0)
+			{
+				//msgin = strreplace("/me", "", msgin);
+				//msgin = substring(msgin, 3, strlen(msgin));
+				msgin = strreplace("/me", strcat(colorstr, "(", colorprefix, namestr, colorstr, ")^7"), msgin);
+				msgstr = strcat("\{1}\{13}^4* ", "^7", msgin);
+			}
+			else
+				msgstr = strcat("\{1}\{13}", colorstr, "(", colorprefix, namestr, colorstr, ") ^7", msgin);
 			cmsgstr = strcat(colorstr, "(", colorprefix, namestr, colorstr, ")\n^7", msgin);
 		}
 		else
 		{
-			msgstr = strcat("\{1}", colorprefix, namestr, "^7: ", msgin);
+			if(strstrofs(msgin, "/me", 0) >= 0)
+			{
+				//msgin = strreplace("/me", "", msgin);
+				//msgin = substring(msgin, 3, strlen(msgin));
+				msgin = strreplace("/me", strcat(colorprefix, namestr), msgin);
+				msgstr = strcat("\{1}^4* ", "^7", msgin);
+			}
+			else
+				msgstr = strcat("\{1}", colorprefix, namestr, "^7: ", msgin);
 			cmsgstr = "";
 		}
 		msgstr = strcat(strreplace("\n", " ", msgstr), "\n"); // newlines only are good for centerprint
@@ -767,9 +794,9 @@ float Say(entity source, float teamsay, entity privatesay, string msgin, float f
 				flood = 2;
 			}
 
-			if(time >= source.flood_field)
+			if (time >= source.(flood_field))
 			{
-				source.flood_field = max(time - flood_burst * flood_spl, source.flood_field) + lines * flood_spl;
+				source.(flood_field) = max(time - flood_burst * flood_spl, source.(flood_field)) + lines * flood_spl;
 			}
 			else
 			{
@@ -779,14 +806,14 @@ float Say(entity source, float teamsay, entity privatesay, string msgin, float f
 		}
 		else
 		{
-			if(time >= source.flood_field)
-				source.flood_field = max(time - flood_burst * flood_spl, source.flood_field) + flood_spl;
+			if (time >= source.(flood_field))
+				source.(flood_field) = max(time - flood_burst * flood_spl, source.(flood_field)) + flood_spl;
 			else
 				flood = 1;
 		}
 
 		if (timeout_status == TIMEOUT_ACTIVE) // when game is paused, no flood protection
-			source.flood_field = flood = 0;
+			source.(flood_field) = flood = 0;
 	}
 
 	if(flood == 2) // cannot happen for empty msgstr
@@ -818,7 +845,7 @@ float Say(entity source, float teamsay, entity privatesay, string msgin, float f
 	}
 
 	if(flood)
-		print("NOTE: ", playername(source), "^7 is flooding.\n");
+		LOG_INFO("NOTE: ", playername(source), "^7 is flooding.\n");
 
 	// build sourcemsgstr by cutting off a prefix and replacing it by the other one
 	if(privatesay)
@@ -831,9 +858,9 @@ float Say(entity source, float teamsay, entity privatesay, string msgin, float f
 	}
 	else if(flood == 1)
 	{
-		if(autocvar_g_chat_flood_notify_flooder)
+		if (autocvar_g_chat_flood_notify_flooder)
 		{
-			sprint(source, strcat("^3FLOOD CONTROL: ^7wait ^1", ftos(source.flood_field - time), "^3 seconds\n"));
+			sprint(source, strcat("^3FLOOD CONTROL: ^7wait ^1", ftos(source.(flood_field) - time), "^3 seconds\n"));
 			ret = 0;
 		}
 		else
@@ -860,6 +887,15 @@ float Say(entity source, float teamsay, entity privatesay, string msgin, float f
 			if(cmsgstr != "")
 				centerprint(privatesay, cmsgstr);
 		}
+		else if ( teamsay && source.active_minigame )
+		{
+			sprint(source, sourcemsgstr);
+			dedicated_print(msgstr); // send to server console too
+			FOR_EACH_REALCLIENT(head) 
+				if(head != source)
+				if(head.active_minigame == source.active_minigame)
+					sprint(head, msgstr);
+		}
 		else if(teamsay > 0) // team message, only sent to team mates
 		{
 			sprint(source, sourcemsgstr);
@@ -959,7 +995,7 @@ void PrecachePlayerSounds(string f)
 	{
 		if(tokenize_console(s) != 3)
 		{
-			dprint("Invalid sound info line: ", s, "\n");
+			LOG_TRACE("Invalid sound info line: ", s, "\n");
 			continue;
 		}
 		PrecacheGlobalSound(strcat(argv(1), " ", argv(2)));
@@ -976,7 +1012,7 @@ void PrecachePlayerSounds(string f)
 }
 
 void ClearPlayerSounds()
-{
+{SELFPARAM();
 #define _VOICEMSG(m) if(self.playersound_##m) { strunzone(self.playersound_##m); self.playersound_##m = string_null; }
 	ALLPLAYERSOUNDS
 	ALLVOICEMSGS
@@ -984,14 +1020,14 @@ void ClearPlayerSounds()
 }
 
 float LoadPlayerSounds(string f, float first)
-{
+{SELFPARAM();
 	float fh;
 	string s;
 	var .string field;
 	fh = fopen(f, FILE_READ);
 	if(fh < 0)
 	{
-		dprint("Player sound file not found: ", f, "\n");
+		LOG_TRACE("Player sound file not found: ", f, "\n");
 		return 0;
 	}
 	while((s = fgets(fh)))
@@ -1003,16 +1039,16 @@ float LoadPlayerSounds(string f, float first)
 			field = GetVoiceMessageSampleField(argv(0));
 		if(GetPlayerSoundSampleField_notFound)
 			continue;
-		if(self.field)
-			strunzone(self.field);
-		self.field = strzone(strcat(argv(1), " ", argv(2)));
+		if (self.(field))
+			strunzone(self.(field));
+		self.(field) = strzone(strcat(argv(1), " ", argv(2)));
 	}
 	fclose(fh);
 	return 1;
 }
 
 void UpdatePlayerSounds()
-{
+{SELFPARAM();
 	if(self.modelindex == self.modelindex_for_playersound)
 	if(self.skin == self.skin_for_playersound)
 		return;
@@ -1026,7 +1062,7 @@ void UpdatePlayerSounds()
 }
 
 void FakeGlobalSound(string sample, float chan, float voicetype)
-{
+{SELFPARAM();
 	float n;
 	float tauntrand;
 
@@ -1101,7 +1137,7 @@ void FakeGlobalSound(string sample, float chan, float voicetype)
 }
 
 void GlobalSound(string sample, float chan, float voicetype)
-{
+{SELFPARAM();
 	float n;
 	float tauntrand;
 
@@ -1199,12 +1235,12 @@ void GlobalSound(string sample, float chan, float voicetype)
 }
 
 void PlayerSound(.string samplefield, float chan, float voicetype)
-{
-	GlobalSound(self.samplefield, chan, voicetype);
+{SELFPARAM();
+	GlobalSound(self.(samplefield), chan, voicetype);
 }
 
 void VoiceMessage(string type, string msg)
-{
+{SELFPARAM();
 	var .string sample;
 	float voicetype, ownteam;
 	float flood;
@@ -1221,10 +1257,10 @@ void VoiceMessage(string type, string msg)
 
 	flood = Say(self, ownteam, world, msg, 1);
 
-	if(IS_SPEC(self) || IS_OBSERVER(self) || flood < 0)
-		FakeGlobalSound(self.sample, CH_VOICE, voicetype);
+	if (IS_SPEC(self) || IS_OBSERVER(self) || flood < 0)
+		FakeGlobalSound(self.(sample), CH_VOICE, voicetype);
 	else if (flood > 0)
-		GlobalSound(self.sample, CH_VOICE, voicetype);
+		GlobalSound(self.(sample), CH_VOICE, voicetype);
 }
 
 void MoveToTeam(entity client, float team_colour, float type)