X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fg_world.qc;h=0e550db1e46979abd1ac7cbb137beae0c0458f0e;hp=e17e7adbcff7dd162f345a89a84e2b0b4e9bf8ad;hb=a8cc9eb71b0d0e44e9a968a9cf5554f6226cc838;hpb=6b8b403dbd938914eeaa6a02f98d0e939950d29e

diff --git a/qcsrc/server/g_world.qc b/qcsrc/server/g_world.qc
index e17e7adbcf..0e550db1e4 100644
--- a/qcsrc/server/g_world.qc
+++ b/qcsrc/server/g_world.qc
@@ -534,8 +534,8 @@ void RandomSeed_Spawn()
 	WITH(entity, self, randomseed, randomseed.think()); // sets random seed and nextthink
 }
 
-void spawnfunc___init_dedicated_server(void)
-{SELFPARAM();
+spawnfunc(__init_dedicated_server)
+{
 	// handler for _init/_init map (only for dedicated server initialization)
 
 	world_initialized = -1; // don't complain
@@ -557,7 +557,6 @@ void spawnfunc___init_dedicated_server(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);
 
@@ -572,8 +571,8 @@ void ClientInit_Spawn();
 void WeaponStats_Init();
 void WeaponStats_Shutdown();
 void Physics_AddStats();
-void spawnfunc_worldspawn (void)
-{SELFPARAM();
+spawnfunc(worldspawn)
+{
 	float fd, l, j, n;
 	string s;
 
@@ -604,7 +603,6 @@ void spawnfunc_worldspawn (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);
 
@@ -690,10 +688,6 @@ void spawnfunc_worldspawn (void)
 		MUTATOR_CALLHOOK(BuildMutatorsString, s);
 		s = ret_string;
 
-		// simple, probably not good in the mutator system
-		if(autocvar_g_grappling_hook)
-			s = strcat(s, ":grappling_hook");
-
 		// initialiation stuff, not good in the mutator system
 		if(!autocvar_g_use_ammunition)
 			s = strcat(s, ":no_use_ammunition");
@@ -918,8 +912,8 @@ void spawnfunc_worldspawn (void)
 	world_initialized = 1;
 }
 
-void spawnfunc_light (void)
-{SELFPARAM();
+spawnfunc(light)
+{
 	//makestatic (self); // Who the f___ did that?
 	remove(self);
 }