X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Farena.qc;h=f7af963591e7c0cf23f599aa9b07a3863658e3e4;hp=7b2d715835c0ebda093becabd1f00326b9a37e68;hb=024719975962a1b3ca98ab2f73a8d89d66b1ce21;hpb=b8c629df9a66ec47cbef42054b958d6a2363aa6a

diff --git a/qcsrc/server/arena.qc b/qcsrc/server/arena.qc
index 7b2d715835..f7af963591 100644
--- a/qcsrc/server/arena.qc
+++ b/qcsrc/server/arena.qc
@@ -22,7 +22,7 @@ float red_players, blue_players, yellow_players, pink_players;
 float total_players;
 
 /**
- * Resets the state of all clients, items, flags, runes, keys, weapons, waypoints, ... of the map.
+ * Resets the state of all clients, items, flags, keys, weapons, waypoints, ... of the map.
  * Sets the 'warmup' global variable.
  */
 void reset_map(float dorespawn)
@@ -108,8 +108,6 @@ void reset_map(float dorespawn)
 					//NEW: changed behaviour so that it prevents that previous spectators/observers suddenly spawn as players
 					if (self.classname == "player") {
 						//PlayerScore_Clear(self);
-						if(g_lms)
-							PlayerScore_Add(self, SP_LMS_LIVES, LMS_NewPlayerLives());
 						self.killcount = 0;
 						//stop the player from moving so that he stands still once he gets respawned
 						self.velocity = '0 0 0';
@@ -237,13 +235,13 @@ void Arena_Warmup()
 				warmup = time + autocvar_g_ca_warmup;
 			} else {
 				if(f == 5)
-					Announce("prepareforbattle");
+					Send_Notification(NOTIF_ALL, world, MSG_ANNCE, ANNCE_PREPARE);
 				else if(f == 3)
-					Announce("3");
+					Send_Notification(NOTIF_ALL, world, MSG_ANNCE, ANNCE_NUM_3);
 				else if(f == 2)
-					Announce("2");
+					Send_Notification(NOTIF_ALL, world, MSG_ANNCE, ANNCE_NUM_2);
 				else if(f == 1)
-					Announce("1");
+					Send_Notification(NOTIF_ALL, world, MSG_ANNCE, ANNCE_NUM_1);
 
 				Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_ARENA_ROUNDSTART, f);
 			}
@@ -266,8 +264,7 @@ void Arena_Warmup()
 			else
 				reset_map(TRUE);
 		} else {
-			Announce("begin");
-			Send_Notification(NOTIF_ALL, world, MSG_CENTER, CENTER_ARENA_BEGIN); 
+			Send_Notification(NOTIF_ALL, world, MSG_MULTI, MULTI_ARENA_BEGIN);
 		}
 
 		if(g_arena) {