X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_world.qc;h=da2983c4a20d98cbaba575bbfd87005f22004938;hp=b6d2b5e07db28cb648e028bc9154c149ff2dd88c;hb=ae2c1407ec9a05e4f501a6604a7cce8e1030df9f;hpb=ad415a3b4e5ec559b143c81080dd705875533449

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index b6d2b5e07d..da2983c4a2 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -23,6 +23,7 @@
 #include "../common/buffs.qh"
 #include "../common/constants.qh"
 #include "../common/deathtypes.qh"
+#include "../common/effects.qh"
 #include "../common/mapinfo.qh"
 #include "../common/monsters/all.qh"
 #include "../common/monsters/sv_monsters.qh"
@@ -560,14 +561,11 @@ void spawnfunc___init_dedicated_server(void)
 	self.classname = "worldspawn"; // safeguard against various stuff ;)
 
 	// needs to be done so early because of the constants they create
-	CALL_ACCUMULATED_FUNCTION(RegisterWeapons);
-	CALL_ACCUMULATED_FUNCTION(RegisterVehicles);
-	CALL_ACCUMULATED_FUNCTION(RegisterMonsters);
-	CALL_ACCUMULATED_FUNCTION(RegisterItems);
-	CALL_ACCUMULATED_FUNCTION(RegisterGametypes);
+	static_init();
 	CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
 	CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
-	CALL_ACCUMULATED_FUNCTION(RegisterBuffs);
+	CALL_ACCUMULATED_FUNCTION(RegisterEffects);
+	CALL_ACCUMULATED_FUNCTION(RegisterVehicles);
 
 	MapInfo_Enumerate();
 	MapInfo_FilterGametype(MapInfo_CurrentGametype(), MapInfo_CurrentFeatures(), MapInfo_RequiredFlags(), MapInfo_ForbiddenFlags(), 0);
@@ -576,6 +574,7 @@ void spawnfunc___init_dedicated_server(void)
 void Map_MarkAsRecent(string m);
 float world_already_spawned;
 void Nagger_Init();
+void Item_ItemsTime_Init();
 void ClientInit_Spawn();
 void WeaponStats_Init();
 void WeaponStats_Shutdown();
@@ -611,14 +610,11 @@ void spawnfunc_worldspawn (void)
 	server_is_dedicated = (stof(cvar_defstring("is_dedicated")) ? true : false);
 
 	// needs to be done so early because of the constants they create
-	CALL_ACCUMULATED_FUNCTION(RegisterWeapons);
-	CALL_ACCUMULATED_FUNCTION(RegisterVehicles);
-	CALL_ACCUMULATED_FUNCTION(RegisterMonsters);
-	CALL_ACCUMULATED_FUNCTION(RegisterItems);
-	CALL_ACCUMULATED_FUNCTION(RegisterGametypes);
+	static_init();
 	CALL_ACCUMULATED_FUNCTION(RegisterNotifications);
 	CALL_ACCUMULATED_FUNCTION(RegisterDeathtypes);
-	CALL_ACCUMULATED_FUNCTION(RegisterBuffs);
+	CALL_ACCUMULATED_FUNCTION(RegisterEffects);
+	CALL_ACCUMULATED_FUNCTION(RegisterVehicles);
 
 	ServerProgsDB = db_load(strcat("server.db", autocvar_sessionid));
 
@@ -700,8 +696,7 @@ void spawnfunc_worldspawn (void)
 		GameLogEcho(strcat(":gamestart:", GetGametype(), "_", GetMapname(), ":", s));
 		s = ":gameinfo:mutators:LIST";
 
-		ret_string = s;
-		MUTATOR_CALLHOOK(BuildMutatorsString);
+		MUTATOR_CALLHOOK(BuildMutatorsString, s);
 		s = ret_string;
 
 		// simple, probably not good in the mutator system
@@ -788,6 +783,7 @@ void spawnfunc_worldspawn (void)
 	WeaponStats_Init();
 
 	WepSet_AddStat();
+	WepSet_AddStat_InMap();
 	addstat(STAT_SWITCHWEAPON, AS_INT, switchweapon);
 	addstat(STAT_SWITCHINGWEAPON, AS_INT, switchingweapon);
 	addstat(STAT_GAMESTARTTIME, AS_FLOAT, stat_game_starttime);
@@ -818,6 +814,19 @@ void spawnfunc_worldspawn (void)
 
 	addstat(STAT_ARC_HEAT, AS_FLOAT, arc_heat_percent);
 
+	// items time
+	addstat(STAT_ARMOR_LARGE_TIME, AS_FLOAT, item_armor_large_time);
+	addstat(STAT_HEALTH_MEGA_TIME, AS_FLOAT, item_health_mega_time);
+	addstat(STAT_INVISIBLE_TIME, AS_FLOAT, item_invisible_time);
+	addstat(STAT_SPEED_TIME, AS_FLOAT, item_speed_time);
+	addstat(STAT_EXTRALIFE_TIME, AS_FLOAT, item_extralife_time);
+	addstat(STAT_STRENGTH_TIME, AS_FLOAT, item_strength_time);
+	addstat(STAT_SHIELD_TIME, AS_FLOAT, item_shield_time);
+	addstat(STAT_FUELREGEN_TIME, AS_FLOAT, item_fuelregen_time);
+	addstat(STAT_JETPACK_TIME, AS_FLOAT, item_jetpack_time);
+	addstat(STAT_SUPERWEAPONS_TIME, AS_FLOAT, item_superweapons_time);
+	Item_ItemsTime_Init();
+
 	// freeze attacks
 	addstat(STAT_FROZEN, AS_INT, frozen);
 	addstat(STAT_REVIVE_PROGRESS, AS_FLOAT, revive_progress);