X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=a7dfb96775d8d272b13a1acf6e4f104b75a3f936;hb=bda4e58210275f23266f9a1231de949b6bc64893;hp=5fc3f771aa87aeb449074d16c4e4edba96d9078f;hpb=0141e404f85cd34e2394beb4c8651566cc291063;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 5fc3f771a..a7dfb9677 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -13,6 +13,7 @@
 
 #include "../common/constants.qh"
 #include "../common/deathtypes/all.qh"
+#include "../common/debug.qh"
 #include "../common/mapinfo.qh"
 #include "../common/util.qh"
 
@@ -27,7 +28,7 @@
 .float lastground;
 .int state;
 
-void CreatureFrame (void)
+void CreatureFrame ()
 {SELFPARAM();
 	float dm;
 
@@ -93,6 +94,8 @@ void CreatureFrame (void)
 							sound (self, CH_PLAYER_SINGLE, SND_LAVA, VOL_BASE, ATTEN_NORM);
 						}
 						Damage (self, world, world, autocvar_g_balance_contents_playerdamage_lava * autocvar_g_balance_contents_damagerate * self.waterlevel, DEATH_LAVA.m_id, self.origin, '0 0 0');
+						if(autocvar_g_balance_contents_playerdamage_lava_burn)
+							Fire_AddDamage(self, world, autocvar_g_balance_contents_playerdamage_lava_burn * self.waterlevel, autocvar_g_balance_contents_playerdamage_lava_burn_time * self.waterlevel, DEATH_LAVA.m_id);
 					}
 					else if (self.watertype == CONTENT_SLIME)
 					{
@@ -158,9 +161,9 @@ void CreatureFrame (void)
 					if (!(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOSTEPS))
 					{
 						if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_METALSTEPS)
-							GlobalSound(globalsound_metalstep, CH_PLAYER, VOICETYPE_PLAYERSOUND);
+							GlobalSound(GS_STEP_METAL, CH_PLAYER, VOICETYPE_PLAYERSOUND);
 						else
-							GlobalSound(globalsound_step, CH_PLAYER, VOICETYPE_PLAYERSOUND);
+							GlobalSound(GS_STEP, CH_PLAYER, VOICETYPE_PLAYERSOUND);
 					}
 				}
 			}
@@ -184,8 +187,9 @@ float game_delay;
 float game_delay_last;
 
 float RedirectionThink();
-void StartFrame (void)
-{SELFPARAM();
+void StartFrame()
+{
+	SELFPARAM();
 	execute_next_frame();
 
 	remove = remove_unsafely; // not during spawning!
@@ -196,12 +200,11 @@ void StartFrame (void)
 #ifdef PROFILING
 	if(time > client_cefc_accumulatortime + 1)
 	{
-		float t, pp, c_seeing, c_seen;
-		entity cl;
-		t = client_cefc_accumulator / (time - client_cefc_accumulatortime);
+		float t = client_cefc_accumulator / (time - client_cefc_accumulatortime);
 		LOG_INFO("CEFC time: ", ftos(t * 1000), "ms; ");
-		c_seeing = 0;
-		c_seen = 0;
+		int c_seeing = 0;
+		int c_seen = 0;
+		entity cl;
 		FOR_EACH_CLIENT(cl)
 		{
 			if(IS_REAL_CLIENT(cl))
@@ -238,17 +241,15 @@ void StartFrame (void)
 	skill = autocvar_skill;
 
 	// detect when the pre-game countdown (if any) has ended and the game has started
-	game_delay = (time < game_starttime) ? true : false;
+	game_delay = (time < game_starttime);
 
-	if(game_delay_last == true)
-	if(game_delay == false)
-	if(autocvar_sv_eventlog)
+	if(autocvar_sv_eventlog && game_delay_last && !game_delay)
 		GameLogEcho(":startdelay_ended");
 
 	game_delay_last = game_delay;
 
-	CreatureFrame ();
-	CheckRules_World ();
+	CreatureFrame();
+	CheckRules_World();
 
 	// if in warmup stage and limit for warmup is hit start match
 	if(warmup_stage)
@@ -261,14 +262,15 @@ void StartFrame (void)
 	}
 
 	bot_serverframe();
-
-	entity e;
-	FOR_EACH_PLAYER(e)
-		e.porto_forbidden = max(0, e.porto_forbidden - 1);
-
 	anticheat_startframe();
-
 	MUTATOR_CALLHOOK(SV_StartFrame);
+	{
+        entity e;
+        FOR_EACH_CLIENT(e)
+        {
+            GlobalStats_update(e);
+        }
+    }
 }
 
 .vector originjitter;
@@ -430,7 +432,7 @@ void SV_OnEntityPreSpawnFunction()
 	}
 }
 
-void WarpZone_PostInitialize_Callback(void)
+void WarpZone_PostInitialize_Callback()
 {
 	// create waypoint links for warpzones
 	entity e;