X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fmiscfunctions.qh;h=1c01a573797713c4fe39345da3f895e60717aad9;hb=fdfc12c69482332948018097af4a39732ca5e369;hp=d237c3038b1002e12b19660d9b215cb6fe1c62a2;hpb=32b84444728fd49e2b8415e5e0fd9541cd834075;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/miscfunctions.qh b/qcsrc/server/miscfunctions.qh
index d237c3038b..1c01a57379 100644
--- a/qcsrc/server/miscfunctions.qh
+++ b/qcsrc/server/miscfunctions.qh
@@ -1,5 +1,7 @@
 #pragma once
 
+#include <server/defs.qh>
+
 #include <common/t_items.qh>
 
 #include "mutators/events.qh"
@@ -32,19 +34,17 @@ float cvar_normal(string n)
 entity eliminatedPlayers;
 void EliminatedPlayers_Init(float(entity) isEliminated_func);
 
-string admin_name();
-
 void write_recordmarker(entity pl, float tstart, float dt);
 
 void play2all(string samp);
 
 void play2team(float t, string filename);
 
-void GetCvars_handleFloat(entity this, string thisname, float f, .float field, string name);
+void GetCvars_handleFloat(entity this, entity store, string thisname, float f, .float field, string name);
 
-float spamsound(entity e, float chan, string samp, float vol, float _atten);
+float spamsound(entity e, float chan, Sound samp, float vol, float _atten);
 
-void GetCvars_handleString(entity this, string thisname, float f, .string field, string name);
+void GetCvars_handleString(entity this, entity store, string thisname, float f, .string field, string name);
 
 void precache_all_playermodels(string pattern);
 
@@ -75,7 +75,7 @@ void GameLogInit();
 
 void GameLogClose();
 
-void GetCvars(entity this, float f);
+void GetCvars(entity this, entity store, int f);
 
 string GetMapname();
 
@@ -93,7 +93,7 @@ string NearestLocation(vector p);
 
 void play2(entity e, string filename);
 
-string playername(entity p);
+string playername(entity p, bool team_colorize);
 
 void precache();
 
@@ -160,44 +160,12 @@ float nearest_length[NUM_NEAREST_ENTITIES];
 
 //#NO AUTOCVARS START
 
-float g_pickup_shells;
 float g_pickup_shells_max;
-float g_pickup_nails;
 float g_pickup_nails_max;
-float g_pickup_rockets;
 float g_pickup_rockets_max;
-float g_pickup_cells;
 float g_pickup_cells_max;
-float g_pickup_plasma;
 float g_pickup_plasma_max;
-float g_pickup_fuel;
-float g_pickup_fuel_jetpack;
 float g_pickup_fuel_max;
-float g_pickup_armorsmall;
-float g_pickup_armorsmall_max;
-float g_pickup_armorsmall_anyway;
-float g_pickup_armormedium;
-float g_pickup_armormedium_max;
-float g_pickup_armormedium_anyway;
-float g_pickup_armorbig;
-float g_pickup_armorbig_max;
-float g_pickup_armorbig_anyway;
-float g_pickup_armormega;
-float g_pickup_armormega_max;
-float g_pickup_armormega_anyway;
-float g_pickup_healthsmall;
-float g_pickup_healthsmall_max;
-float g_pickup_healthsmall_anyway;
-float g_pickup_healthmedium;
-float g_pickup_healthmedium_max;
-float g_pickup_healthmedium_anyway;
-float g_pickup_healthlarge;
-float g_pickup_healthlarge_max;
-float g_pickup_healthlarge_anyway;
-float g_pickup_healthmega;
-float g_pickup_healthmega_max;
-float g_pickup_healthmega_anyway;
-float g_pickup_ammo_anyway;
 float g_pickup_weapons_anyway;
 float g_weaponarena;
 WepSet g_weaponarena_weapons;
@@ -321,9 +289,9 @@ void readlevelcvars()
 	g_pickup_healthmedium = cvar("g_pickup_healthmedium");
 	g_pickup_healthmedium_max = cvar("g_pickup_healthmedium_max");
 	g_pickup_healthmedium_anyway = cvar("g_pickup_healthmedium_anyway");
-	g_pickup_healthlarge = cvar("g_pickup_healthlarge");
-	g_pickup_healthlarge_max = cvar("g_pickup_healthlarge_max");
-	g_pickup_healthlarge_anyway = cvar("g_pickup_healthlarge_anyway");
+	g_pickup_healthbig = cvar("g_pickup_healthbig");
+	g_pickup_healthbig_max = cvar("g_pickup_healthbig_max");
+	g_pickup_healthbig_anyway = cvar("g_pickup_healthbig_anyway");
 	g_pickup_healthmega = cvar("g_pickup_healthmega");
 	g_pickup_healthmega_max = cvar("g_pickup_healthmega_max");
 	g_pickup_healthmega_anyway = cvar("g_pickup_healthmega_anyway");
@@ -340,7 +308,7 @@ void readlevelcvars()
 	if (!warmup_stage)
 		game_starttime = time + cvar("g_start_delay");
 
-	FOREACH(Weapons, it != WEP_Null, LAMBDA(it.wr_init(it)));
+	FOREACH(Weapons, it != WEP_Null, { it.wr_init(it); });
 
 	readplayerstartcvars();
 }
@@ -367,3 +335,6 @@ entity initialize_entity_first;
 
 float sound_allowed(float dest, entity e);
 void InitializeEntity(entity e, void(entity this) func, float order);
+
+IntrusiveList g_ctrace_changed;
+STATIC_INIT(g_ctrace_changed) { g_ctrace_changed = IL_NEW(); }