X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fsv_main.qc;h=d80b777a6f129197428f16146e36af1b32fc186a;hb=f00dd29e71e236ddd2d79f44256ff589cbeac350;hp=73c444afec7b8637e0481ecb18ba133d01f471a1;hpb=d03bf59652dab079deef7cf35e5b80599b13df05;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/sv_main.qc b/qcsrc/server/sv_main.qc
index 73c444afe..d80b777a6 100644
--- a/qcsrc/server/sv_main.qc
+++ b/qcsrc/server/sv_main.qc
@@ -43,7 +43,18 @@ void CreatureFrame (void)
 			{
 				self.dmgtime = time + autocvar_g_balance_contents_damagerate; 
 				
-				if (!projectile)
+				if (projectile)
+				{
+					if (self.watertype == CONTENT_LAVA)
+					{
+						Damage (self, world, world, autocvar_g_balance_contents_projectiledamage * autocvar_g_balance_contents_damagerate * self.waterlevel, DEATH_LAVA, self.origin, '0 0 0');
+					}
+					else if (self.watertype == CONTENT_SLIME)
+					{
+						Damage (self, world, world, autocvar_g_balance_contents_projectiledamage * autocvar_g_balance_contents_damagerate * self.waterlevel, DEATH_SLIME, self.origin, '0 0 0');
+					}
+				}
+				else
 				{
 					if (self.watertype == CONTENT_LAVA)
 					{
@@ -64,10 +75,6 @@ void CreatureFrame (void)
 						Damage (self, world, world, autocvar_g_balance_contents_playerdamage_slime * autocvar_g_balance_contents_damagerate * self.waterlevel, DEATH_SLIME, self.origin, '0 0 0');
 					}
 				}
-				else if ((self.watertype == CONTENT_LAVA) || (self.watertype == CONTENT_SLIME))
-				{
-					Damage (self, world, world, autocvar_g_balance_contents_projectiledamage * autocvar_g_balance_contents_damagerate * self.waterlevel, DEATH_SLIME, self.origin, '0 0 0');
-				}
 			}
 		}
 		else
@@ -146,11 +153,12 @@ Called before each frame by the server
 float game_delay;
 float game_delay_last;
 
-void RuneMatchGivePoints();
 float RedirectionThink();
 entity SelectSpawnPoint (float anypoint);
 void StartFrame (void)
 {
+	execute_next_frame();
+
 	remove = remove_unsafely; // not during spawning!
 	serverprevtime = servertime;
 	servertime = time;
@@ -201,9 +209,12 @@ void StartFrame (void)
 
 	skill = autocvar_skill;
 
+	count_players();
+	if(g_ca || g_freezetag)
+		count_alive_players();
+	Arena_Warmup();
 	Spawnqueue_Check();
 
-
 	// detect when the pre-game countdown (if any) has ended and the game has started
 	game_delay = (time < game_starttime) ? TRUE : FALSE;
 
@@ -226,9 +237,6 @@ void StartFrame (void)
 	CreatureFrame ();
 	CheckRules_World ();
 
-	AuditTeams();
-
-	RuneMatchGivePoints();
 	bot_serverframe();
 
 	FOR_EACH_PLAYER(self)