X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fclient%2Fmain.qc;h=c534cc7a5db46dc3362a9b511b551e7bb4861f86;hb=a95e5467c6e1e20a886b19bd6464ec2b005ff53f;hp=a5085e893da413c6db62620736aabb7fef9d6fec;hpb=1ce7d4e9513a976d5393c3945c4fe643cea1bf6e;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/client/main.qc b/qcsrc/client/main.qc
index a5085e893..c534cc7a5 100644
--- a/qcsrc/client/main.qc
+++ b/qcsrc/client/main.qc
@@ -28,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"
@@ -125,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!
@@ -152,7 +156,6 @@ void CSQC_Init(void)
 	initialize_minigames();
 
 	// precaches
-	precache_model("null");
 	precache_sound("misc/hit.wav");
 	precache_sound("misc/typehit.wav");
 
@@ -300,7 +303,7 @@ float SetTeam(entity o, int Team)
 }
 
 void Playerchecker_Think()
-{
+{SELFPARAM();
     int i;
 	entity e;
 	for(i = 0; i < maxclients; ++i)
@@ -394,11 +397,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();
 
@@ -434,7 +437,7 @@ void Ent_ReadEntCS()
 void Ent_Remove();
 
 void Ent_RemovePlayerScore()
-{
+{SELFPARAM();
 	if(self.owner) {
 		SetTeam(self.owner, -1);
 		self.owner.gotscores = 0;
@@ -445,7 +448,7 @@ void Ent_RemovePlayerScore()
 }
 
 void Ent_ReadPlayerScore()
-{
+{SELFPARAM();
 	int i, n;
 	bool isNew;
 	entity o;
@@ -503,7 +506,7 @@ void Ent_ReadPlayerScore()
 }
 
 void Ent_ReadTeamScore()
-{
+{SELFPARAM();
 	int i;
 	entity o;
 
@@ -695,12 +698,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();
@@ -746,7 +749,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.
@@ -802,7 +805,7 @@ void Ent_RadarLink();
 void Ent_Init();
 void Ent_ScoresInfo();
 void CSQC_Ent_Update(float bIsNewEntity)
-{
+{SELFPARAM();
 	float t;
 	float savetime;
 	t = ReadByte();
@@ -920,7 +923,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();
 
@@ -944,7 +947,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);
 
@@ -981,7 +984,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.
@@ -1007,7 +1010,7 @@ void Fog_Force()
 
 void Gamemode_Init();
 void Ent_ScoresInfo()
-{
+{SELFPARAM();
     int i;
 	self.classname = "ent_client_scores_info";
 	gametype = ReadInt24_t();
@@ -1031,7 +1034,7 @@ void Ent_ScoresInfo()
 }
 
 void Ent_Init()
-{
+{SELFPARAM();
 	self.classname = "ent_client_init";
 
 	nb_pb_period = ReadByte() / 32; //Accuracy of 1/32th