X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qc;h=8ba551d9c3c2011c00a551a06fbb1211869d028f;hp=85aae33c48fcfae4085b7d51fac11cc2342f0967;hb=7bd8f8562a392fda3ac881b1fbe2a35a5ef0f5c8;hpb=9e6de751aaa2a918708f80735a006a03e84f2fcf

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 85aae33c48..8ba551d9c3 100644
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -2,7 +2,6 @@
 #include "_all.qh"
 
 #include "controlpoint.qh"
-#include "csqcmodel_hooks.qh"
 #include "damage.qh"
 #include "effects.qh"
 #include "generator.qh"
@@ -28,7 +27,7 @@
 
 #include "../common/buffs.qh"
 #include "../common/deathtypes.qh"
-#include "../common/effects.qh"
+#include "../common/effects/effects.qh"
 #include "../common/mapinfo.qh"
 #include "../common/monsters/all.qh"
 #include "../common/nades.qh"
@@ -49,7 +48,6 @@
 #include "../common/triggers/include.qh"
 
 #include "../common/turrets/cl_turrets.qh"
-#include "../common/turrets/turrets.qh"
 
 #include "../warpzonelib/client.qh"
 
@@ -87,7 +85,7 @@ string forcefog;
 void ConsoleCommand_macro_init();
 void CSQC_Init(void)
 {
-	prvm_language = cvar_string("prvm_language");
+	prvm_language = strzone(cvar_string("prvm_language"));
 
 #ifdef WATERMARK
 	LOG_TRACEF("^4CSQC Build information: ^1%s\n", WATERMARK);
@@ -125,6 +123,10 @@ void CSQC_Init(void)
 	registercvar("cl_jumpspeedcap_min", "");
 	registercvar("cl_jumpspeedcap_max", "");
 
+	registercvar("cl_multijump", "0");
+
+	registercvar("cl_spawn_near_teammate", "1");
+
 	gametype = 0;
 
 	// hud_fields uses strunzone on the titles!
@@ -144,25 +146,14 @@ void CSQC_Init(void)
 
 	// needs to be done so early because of the constants they create
 	static_init();
-	CALL_ACCUMULATED_FUNCTION(RegisterTurrets);
 	CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
 	CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
 	CALL_ACCUMULATED_FUNCTION(RegisterHUD_Panels);
-	CALL_ACCUMULATED_FUNCTION(RegisterEffects);
-
-	initialize_minigames();
 
 	// precaches
-	precache_model("null");
-	precache_sound("misc/hit.wav");
-	precache_sound("misc/typehit.wav");
 
-	generator_precache();
 	Projectile_Precache();
-	Hook_Precache();
-	GibSplash_Precache();
 	Tuba_Precache();
-	CSQCPlayer_Precache();
 
 	if(autocvar_cl_reticle)
 	{
@@ -301,7 +292,7 @@ float SetTeam(entity o, int Team)
 }
 
 void Playerchecker_Think()
-{
+{SELFPARAM();
     int i;
 	entity e;
 	for(i = 0; i < maxclients; ++i)
@@ -369,6 +360,9 @@ float CSQC_InputEvent(float bInputType, float nPrimary, float nSecondary)
 	if (HUD_Panel_InputEvent(bInputType, nPrimary, nSecondary))
 		return true;
 
+	if (QuickMenu_InputEvent(bInputType, nPrimary, nSecondary))
+		return true;
+
 	if ( HUD_Radar_InputEvent(bInputType, nPrimary, nSecondary) )
 		return true;
 
@@ -392,11 +386,11 @@ float CSQC_InputEvent(float bInputType, float nPrimary, float nSecondary)
 // BEGIN OPTIONAL CSQC FUNCTIONS
 
 void Ent_RemoveEntCS()
-{
+{SELFPARAM();
 	entcs_receiver[self.sv_entnum] = world;
 }
 void Ent_ReadEntCS()
-{
+{SELFPARAM();
     int sf;
 	InterpolateOrigin_Undo();
 
@@ -432,7 +426,7 @@ void Ent_ReadEntCS()
 void Ent_Remove();
 
 void Ent_RemovePlayerScore()
-{
+{SELFPARAM();
 	if(self.owner) {
 		SetTeam(self.owner, -1);
 		self.owner.gotscores = 0;
@@ -443,7 +437,7 @@ void Ent_RemovePlayerScore()
 }
 
 void Ent_ReadPlayerScore()
-{
+{SELFPARAM();
 	int i, n;
 	bool isNew;
 	entity o;
@@ -501,7 +495,7 @@ void Ent_ReadPlayerScore()
 }
 
 void Ent_ReadTeamScore()
-{
+{SELFPARAM();
 	int i;
 	entity o;
 
@@ -693,12 +687,12 @@ void Ent_ReadAccuracy(void)
 }
 
 void Spawn_Draw(void)
-{
+{SELFPARAM();
 	pointparticles(self.cnt, self.origin + '0 0 28', '0 0 2', bound(0, frametime, 0.1));
 }
 
 void Ent_ReadSpawnPoint(float is_new) // entity for spawnpoint
-{
+{SELFPARAM();
 	float teamnum = (ReadByte() - 1);
 	vector spn_origin;
 	spn_origin.x = ReadShort();
@@ -727,14 +721,14 @@ void Ent_ReadSpawnPoint(float is_new) // entity for spawnpoint
 			{
 				switch(teamnum)
 				{
-					case NUM_TEAM_1: self.cnt = particleeffectnum("spawn_point_red"); break;
-					case NUM_TEAM_2: self.cnt = particleeffectnum("spawn_point_blue"); break;
-					case NUM_TEAM_3: self.cnt = particleeffectnum("spawn_point_yellow"); break;
-					case NUM_TEAM_4: self.cnt = particleeffectnum("spawn_point_pink"); break;
-					default: self.cnt = particleeffectnum("spawn_point_neutral"); break;
+					case NUM_TEAM_1: self.cnt = particleeffectnum(EFFECT_SPAWNPOINT_RED); break;
+					case NUM_TEAM_2: self.cnt = particleeffectnum(EFFECT_SPAWNPOINT_BLUE); break;
+					case NUM_TEAM_3: self.cnt = particleeffectnum(EFFECT_SPAWNPOINT_YELLOW); break;
+					case NUM_TEAM_4: self.cnt = particleeffectnum(EFFECT_SPAWNPOINT_PINK); break;
+					default: self.cnt = particleeffectnum(EFFECT_SPAWNPOINT_NEUTRAL); break;
 				}
 			}
-			else { self.cnt = particleeffectnum("spawn_point_neutral"); }
+			else { self.cnt = particleeffectnum(EFFECT_SPAWNPOINT_NEUTRAL); }
 
 			self.draw = Spawn_Draw;
 		}
@@ -744,7 +738,7 @@ void Ent_ReadSpawnPoint(float is_new) // entity for spawnpoint
 }
 
 void Ent_ReadSpawnEvent(float is_new)
-{
+{SELFPARAM();
 	// If entnum is 0, ONLY do the local spawn actions
 	// this way the server can disable the sending of
 	// spawn origin or such to clients if wanted.
@@ -764,16 +758,16 @@ void Ent_ReadSpawnEvent(float is_new)
 			{
 				switch(teamnum)
 				{
-					case NUM_TEAM_1: pointparticles(particleeffectnum("spawn_event_red"), self.origin, '0 0 0', 1); break;
-					case NUM_TEAM_2: pointparticles(particleeffectnum("spawn_event_blue"), self.origin, '0 0 0', 1); break;
-					case NUM_TEAM_3: pointparticles(particleeffectnum("spawn_event_yellow"), self.origin, '0 0 0', 1); break;
-					case NUM_TEAM_4: pointparticles(particleeffectnum("spawn_event_pink"), self.origin, '0 0 0', 1); break;
-					default: pointparticles(particleeffectnum("spawn_event_neutral"), self.origin, '0 0 0', 1); break;
+					case NUM_TEAM_1: pointparticles(particleeffectnum(EFFECT_SPAWN_RED), self.origin, '0 0 0', 1); break;
+					case NUM_TEAM_2: pointparticles(particleeffectnum(EFFECT_SPAWN_BLUE), self.origin, '0 0 0', 1); break;
+					case NUM_TEAM_3: pointparticles(particleeffectnum(EFFECT_SPAWN_YELLOW), self.origin, '0 0 0', 1); break;
+					case NUM_TEAM_4: pointparticles(particleeffectnum(EFFECT_SPAWN_PINK), self.origin, '0 0 0', 1); break;
+					default: pointparticles(particleeffectnum(EFFECT_SPAWN_NEUTRAL), self.origin, '0 0 0', 1); break;
 				}
 			}
 			if(autocvar_cl_spawn_event_sound)
 			{
-				sound(self, CH_TRIGGER, "misc/spawn.wav", VOL_BASE, ATTEN_NORM);
+				sound(self, CH_TRIGGER, SND_SPAWN, VOL_BASE, ATTEN_NORM);
 			}
 		}
 	}
@@ -800,16 +794,14 @@ void Ent_RadarLink();
 void Ent_Init();
 void Ent_ScoresInfo();
 void CSQC_Ent_Update(float bIsNewEntity)
-{
-	float t;
-	float savetime;
-	t = ReadByte();
+{SELFPARAM();
+	int t = ReadByte();
 
 	if(autocvar_developer_csqcentities)
 		LOG_INFOF("CSQC_Ent_Update(%d) with self=%i self.entnum=%d self.enttype=%d t=%d\n", bIsNewEntity, self, self.entnum, self.enttype, t);
 
 	// set up the "time" global for received entities to be correct for interpolation purposes
-	savetime = time;
+	float savetime = time;
 	if(servertime)
 	{
 		time = servertime;
@@ -826,7 +818,6 @@ void CSQC_Ent_Update(float bIsNewEntity)
 	{
 		if(t != self.enttype || bIsNewEntity)
 		{
-			//print("A CSQC entity changed its type!\n");
 			LOG_INFOF("A CSQC entity changed its type! (edict: %d, server: %d, type: %d -> %d)\n", num_for_edict(self), self.entnum, self.enttype, t);
 			Ent_Remove();
 			clearentity(self);
@@ -843,6 +834,13 @@ void CSQC_Ent_Update(float bIsNewEntity)
 	}
 #endif
 	self.enttype = t;
+	bool done = false;
+	FOREACH(Linked, it.m_id == t, LAMBDA(
+		it.m_read(self, bIsNewEntity);
+		done = true;
+		break;
+	));
+	if (!done)
 	switch(t)
 	{
 		case ENT_CLIENT_MUTATOR: {
@@ -889,7 +887,6 @@ void CSQC_Ent_Update(float bIsNewEntity)
 		case ENT_CLIENT_SPAWNPOINT: Ent_ReadSpawnPoint(bIsNewEntity); break;
 		case ENT_CLIENT_SPAWNEVENT: Ent_ReadSpawnEvent(bIsNewEntity); break;
 		case ENT_CLIENT_NOTIFICATION: Read_Notification(bIsNewEntity); break;
-		case ENT_CLIENT_HEALING_ORB: ent_healer(); break;
 		case ENT_CLIENT_MINIGAME: ent_read_minigame(); break;
 		case ENT_CLIENT_VIEWLOC: ent_viewloc(); break;
 		case ENT_CLIENT_VIEWLOC_TRIGGER: ent_viewloc_trigger(); break;
@@ -918,7 +915,7 @@ void CSQC_Ent_Update(float bIsNewEntity)
 // used when an entity changes its type. For an entity that someone interacts
 // with others, make sure it can no longer do so.
 void Ent_Remove()
-{
+{SELFPARAM();
 	if(self.entremove)
 		self.entremove();
 
@@ -930,7 +927,7 @@ void Ent_Remove()
 
 	if(self.snd_looping > 0)
 	{
-		sound(self, self.snd_looping, "misc/null.wav", VOL_BASE, autocvar_g_jetpack_attenuation);
+		sound(self, self.snd_looping, SND_Null, VOL_BASE, autocvar_g_jetpack_attenuation);
 		self.snd_looping = 0;
 	}
 
@@ -942,7 +939,7 @@ void Ent_Remove()
 }
 // CSQC_Ent_Remove : Called when the server requests a SSQC / CSQC entity to be removed.  Essentially call remove(self) as well.
 void CSQC_Ent_Remove()
-{
+{SELFPARAM();
 	if(autocvar_developer_csqcentities)
 		LOG_INFOF("CSQC_Ent_Remove() with self=%i self.entnum=%d self.enttype=%d\n", self, self.entnum, self.enttype);
 
@@ -979,7 +976,7 @@ void CSQC_Parse_Print(string strMessage)
 	if(autocvar_developer_csqcentities)
 		LOG_INFOF("CSQC_Parse_Print(\"%s\")\n", strMessage);
 
-	LOG_INFO(ColorTranslateRGB(strMessage));
+	print(ColorTranslateRGB(strMessage));
 }
 
 // CSQC_Parse_CenterPrint : Provides the centerprint_hud string in the first parameter that the server provided.
@@ -1005,7 +1002,7 @@ void Fog_Force()
 
 void Gamemode_Init();
 void Ent_ScoresInfo()
-{
+{SELFPARAM();
     int i;
 	self.classname = "ent_client_scores_info";
 	gametype = ReadInt24_t();
@@ -1029,7 +1026,7 @@ void Ent_ScoresInfo()
 }
 
 void Ent_Init()
-{
+{SELFPARAM();
 	self.classname = "ent_client_init";
 
 	nb_pb_period = ReadByte() / 32; //Accuracy of 1/32th