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

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 7dbc6148a..a7dfb9677 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -28,7 +28,7 @@
 .float lastground;
 .int state;
 
-void CreatureFrame (void)
+void CreatureFrame ()
 {SELFPARAM();
 	float dm;
 
@@ -94,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)
 					{
@@ -159,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);
 					}
 				}
 			}
@@ -262,6 +264,13 @@ void StartFrame()
 	bot_serverframe();
 	anticheat_startframe();
 	MUTATOR_CALLHOOK(SV_StartFrame);
+	{
+        entity e;
+        FOR_EACH_CLIENT(e)
+        {
+            GlobalStats_update(e);
+        }
+    }
 }
 
 .vector originjitter;
@@ -423,7 +432,7 @@ void SV_OnEntityPreSpawnFunction()
 	}
 }
 
-void WarpZone_PostInitialize_Callback(void)
+void WarpZone_PostInitialize_Callback()
 {
 	// create waypoint links for warpzones
 	entity e;