X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qc;h=798b7c7dd94b4741219ba183509d29b4230f2cbe;hp=9e7b8bd6859d51680edd513216a03eddf6e677dc;hb=e96921cf1aaf000518f93645539e2c3baa60f528;hpb=c67e77ba36fb8dd44b39722e41943b6671b549ff

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index 9e7b8bd685..798b7c7dd9 100644
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -1,7 +1,6 @@
 #include "main.qh"
 #include "_all.qh"
 
-#include "casings.qh"
 #include "controlpoint.qh"
 #include "csqcmodel_hooks.qh"
 #include "damage.qh"
@@ -15,14 +14,11 @@
 #include "mapvoting.qh"
 #include "modeleffects.qh"
 #include "particles.qh"
-#include "prandom.qh"
 #include "scoreboard.qh"
 #include "shownames.qh"
-#include "sortlist.qh"
 #include "tuba.qh"
 #include "t_items.qh"
 #include "wall.qh"
-#include "waypointsprites.qh"
 
 #include "../common/vehicles/all.qh"
 
@@ -32,7 +28,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"
@@ -88,14 +84,13 @@ void menu_sub_null()
 }
 
 string forcefog;
-void WaypointSprite_Load();
 void ConsoleCommand_macro_init();
 void CSQC_Init(void)
 {
-	prvm_language = cvar_string("prvm_language");
+	prvm_language = strzone(cvar_string("prvm_language"));
 
 #ifdef WATERMARK
-	dprintf("^4CSQC Build information: ^1%s\n", WATERMARK);
+	LOG_TRACEF("^4CSQC Build information: ^1%s\n", WATERMARK);
 #endif
 
 	int i;
@@ -130,6 +125,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!
@@ -153,9 +152,8 @@ void CSQC_Init(void)
 	CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
 	CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
 	CALL_ACCUMULATED_FUNCTION(RegisterHUD_Panels);
-	CALL_ACCUMULATED_FUNCTION(RegisterEffects);
 
-	WaypointSprite_Load();
+	initialize_minigames();
 
 	// precaches
 	precache_model("null");
@@ -166,7 +164,6 @@ void CSQC_Init(void)
 	Projectile_Precache();
 	Hook_Precache();
 	GibSplash_Precache();
-	Casings_Precache();
 	Tuba_Precache();
 	CSQCPlayer_Precache();
 
@@ -229,6 +226,9 @@ void Shutdown(void)
 		if (!(calledhooks & HOOK_END))
 			localcmd("\ncl_hook_gameend\n");
 	}
+
+	deactivate_minigame();
+	HUD_MinigameMenu_Close();
 }
 
 .float has_team;
@@ -248,7 +248,7 @@ float SetTeam(entity o, int Team)
 			default:
 				if(GetTeam(Team, false) == world)
 				{
-					dprintf("trying to switch to unsupported team %d\n", Team);
+					LOG_TRACEF("trying to switch to unsupported team %d\n", Team);
 					Team = NUM_SPECTATOR;
 				}
 				break;
@@ -264,7 +264,7 @@ float SetTeam(entity o, int Team)
 			default:
 				if(GetTeam(Team, false) == world)
 				{
-					dprintf("trying to switch to unsupported team %d\n", Team);
+					LOG_TRACEF("trying to switch to unsupported team %d\n", Team);
 					Team = NUM_SPECTATOR;
 				}
 				break;
@@ -304,7 +304,7 @@ float SetTeam(entity o, int Team)
 }
 
 void Playerchecker_Think()
-{
+{SELFPARAM();
     int i;
 	entity e;
 	for(i = 0; i < maxclients; ++i)
@@ -372,12 +372,18 @@ 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;
 
 	if (MapVote_InputEvent(bInputType, nPrimary, nSecondary))
 		return true;
 
+	if (HUD_Minigame_InputEvent(bInputType, nPrimary, nSecondary))
+		return true;
+
 	if(menu_visible && menu_action)
 		if(menu_action(bInputType, nPrimary, nSecondary))
 			return true;
@@ -392,11 +398,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 +438,7 @@ void Ent_ReadEntCS()
 void Ent_Remove();
 
 void Ent_RemovePlayerScore()
-{
+{SELFPARAM();
 	if(self.owner) {
 		SetTeam(self.owner, -1);
 		self.owner.gotscores = 0;
@@ -443,7 +449,7 @@ void Ent_RemovePlayerScore()
 }
 
 void Ent_ReadPlayerScore()
-{
+{SELFPARAM();
 	int i, n;
 	bool isNew;
 	entity o;
@@ -457,7 +463,7 @@ void Ent_ReadPlayerScore()
 	if(!isNew && n != self.sv_entnum)
 	{
 		//print("A CSQC entity changed its owner!\n");
-		printf("A CSQC entity changed its owner! (edict: %d, classname: %s)\n", num_for_edict(self), self.classname);
+		LOG_INFOF("A CSQC entity changed its owner! (edict: %d, classname: %s)\n", num_for_edict(self), self.classname);
 		isNew = true;
 		Ent_Remove();
 		self.enttype = ENT_CLIENT_SCORES;
@@ -501,7 +507,7 @@ void Ent_ReadPlayerScore()
 }
 
 void Ent_ReadTeamScore()
-{
+{SELFPARAM();
 	int i;
 	entity o;
 
@@ -693,12 +699,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 +733,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 +750,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,11 +770,11 @@ 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)
@@ -800,13 +806,13 @@ void Ent_RadarLink();
 void Ent_Init();
 void Ent_ScoresInfo();
 void CSQC_Ent_Update(float bIsNewEntity)
-{
+{SELFPARAM();
 	float t;
 	float savetime;
 	t = ReadByte();
 
 	if(autocvar_developer_csqcentities)
-		printf("CSQC_Ent_Update(%d) with self=%i self.entnum=%d self.enttype=%d t=%d\n", bIsNewEntity, self, self.entnum, self.enttype, t);
+		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;
@@ -827,7 +833,7 @@ void CSQC_Ent_Update(float bIsNewEntity)
 		if(t != self.enttype || bIsNewEntity)
 		{
 			//print("A CSQC entity changed its type!\n");
-			printf("A CSQC entity changed its type! (edict: %d, server: %d, type: %d -> %d)\n", num_for_edict(self), self.entnum, self.enttype, t);
+			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);
 			bIsNewEntity = 1;
@@ -837,7 +843,7 @@ void CSQC_Ent_Update(float bIsNewEntity)
 	{
 		if(!bIsNewEntity)
 		{
-			printf("A CSQC entity appeared out of nowhere! (edict: %d, server: %d, type: %d)\n", num_for_edict(self), self.entnum, t);
+			LOG_INFOF("A CSQC entity appeared out of nowhere! (edict: %d, server: %d, type: %d)\n", num_for_edict(self), self.entnum, t);
 			bIsNewEntity = 1;
 		}
 	}
@@ -845,6 +851,12 @@ void CSQC_Ent_Update(float bIsNewEntity)
 	self.enttype = t;
 	switch(t)
 	{
+		case ENT_CLIENT_MUTATOR: {
+			int mutID = ReadMutator();
+			if (!MUTATOR_CALLHOOK(CSQC_Ent_Update, mutID, bIsNewEntity))
+			error(sprintf("Unknown mutator type in CSQC_Ent_Update (mutID: %d, edict: %d, classname: %s)\n", mutID, num_for_edict(self), self.classname));
+			break;
+		}
 		case ENT_CLIENT_ENTCS: Ent_ReadEntCS(); break;
 		case ENT_CLIENT_SCORES: Ent_ReadPlayerScore(); break;
 		case ENT_CLIENT_TEAMSCORES: Ent_ReadTeamScore(); break;
@@ -853,12 +865,10 @@ void CSQC_Ent_Update(float bIsNewEntity)
 		case ENT_CLIENT_LASER: Ent_Laser(); break;
 		case ENT_CLIENT_NAGGER: Ent_Nagger(); break;
 		case ENT_CLIENT_ELIMINATEDPLAYERS: Ent_EliminatedPlayers(); break;
-		case ENT_CLIENT_WAYPOINT: Ent_WaypointSprite(); break;
 		case ENT_CLIENT_RADARLINK: Ent_RadarLink(); break;
 		case ENT_CLIENT_PROJECTILE: Ent_Projectile(); break;
 		case ENT_CLIENT_GIBSPLASH: Ent_GibSplash(bIsNewEntity); break;
 		case ENT_CLIENT_DAMAGEINFO: Ent_DamageInfo(bIsNewEntity); break;
-		case ENT_CLIENT_CASING: Ent_Casing(bIsNewEntity); break;
 		case ENT_CLIENT_INIT: Ent_Init(); break;
 		case ENT_CLIENT_SCORES_INFO: Ent_ScoresInfo(); break;
 		case ENT_CLIENT_MAPVOTE: Ent_MapVote(); break;
@@ -886,6 +896,7 @@ void CSQC_Ent_Update(float bIsNewEntity)
 		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;
 		case ENT_CLIENT_LADDER: ent_func_ladder(); break;
@@ -913,7 +924,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();
 
@@ -937,13 +948,13 @@ 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)
-		printf("CSQC_Ent_Remove() with self=%i self.entnum=%d self.enttype=%d\n", self, self.entnum, self.enttype);
+		LOG_INFOF("CSQC_Ent_Remove() with self=%i self.entnum=%d self.enttype=%d\n", self, self.entnum, self.enttype);
 
 	if(wasfreed(self))
 	{
-		print("WARNING: CSQC_Ent_Remove called for already removed entity. Packet loss?\n");
+		LOG_INFO("WARNING: CSQC_Ent_Remove called for already removed entity. Packet loss?\n");
 		return;
 	}
 	if(self.enttype)
@@ -964,7 +975,7 @@ void Gamemode_Init()
 void CSQC_Parse_StuffCmd(string strMessage)
 {
 	if(autocvar_developer_csqcentities)
-		printf("CSQC_Parse_StuffCmd(\"%s\")\n", strMessage);
+		LOG_INFOF("CSQC_Parse_StuffCmd(\"%s\")\n", strMessage);
 
 	localcmd(strMessage);
 }
@@ -972,7 +983,7 @@ void CSQC_Parse_StuffCmd(string strMessage)
 void CSQC_Parse_Print(string strMessage)
 {
 	if(autocvar_developer_csqcentities)
-		printf("CSQC_Parse_Print(\"%s\")\n", strMessage);
+		LOG_INFOF("CSQC_Parse_Print(\"%s\")\n", strMessage);
 
 	print(ColorTranslateRGB(strMessage));
 }
@@ -981,7 +992,7 @@ void CSQC_Parse_Print(string strMessage)
 void CSQC_Parse_CenterPrint(string strMessage)
 {
 	if(autocvar_developer_csqcentities)
-		printf("CSQC_Parse_CenterPrint(\"%s\")\n", strMessage);
+		LOG_INFOF("CSQC_Parse_CenterPrint(\"%s\")\n", strMessage);
 
 	centerprint_hud(strMessage);
 }
@@ -1000,7 +1011,7 @@ void Fog_Force()
 
 void Gamemode_Init();
 void Ent_ScoresInfo()
-{
+{SELFPARAM();
     int i;
 	self.classname = "ent_client_scores_info";
 	gametype = ReadInt24_t();
@@ -1024,7 +1035,7 @@ void Ent_ScoresInfo()
 }
 
 void Ent_Init()
-{
+{SELFPARAM();
 	self.classname = "ent_client_init";
 
 	nb_pb_period = ReadByte() / 32; //Accuracy of 1/32th
@@ -1270,7 +1281,7 @@ float CSQC_Parse_TempEntity()
 	int nTEID = ReadByte();
 
 	if (autocvar_developer_csqcentities)
-		printf("CSQC_Parse_TempEntity() with nTEID=%d\n", nTEID);
+		LOG_INFOF("CSQC_Parse_TempEntity() with nTEID=%d\n", nTEID);
 
 	switch (nTEID)
 	{