# HG changeset patch
# User unc0rr
# Date 1254062039 0
# Node ID 2ca4ca6b4babe8b77388b086daf76101abe1aafe
# Parent  e13a1117152b3c84fb99544948c8d6a23ae1d438
 - Patch for "Syncronizing" message by Smaxx + some tweaks by me
 - Tweak chat colours a bit

diff -r e13a1117152b -r 2ca4ca6b4bab hedgewars/uChat.pas
--- a/hedgewars/uChat.pas	Sun Sep 27 10:26:36 2009 +0000
+++ b/hedgewars/uChat.pas	Sun Sep 27 14:33:59 2009 +0000
@@ -49,8 +49,8 @@
 const colors: array[#1..#4] of Longword = (
 	$FFFFFF, // chat message
 	$FF00FF, // action message
-	$00B000, // join/leave message
-	$AFFFAF  // team message
+	$00FF00, // join/leave message
+	$A0FFFF  // team message
 	);
 
 procedure SetLine(var cl: TChatLine; str: shortstring; isInput: boolean);
@@ -66,7 +66,7 @@
 
 if isInput then
 	begin
-	color:= $00FFFF;
+	color:= $FFFF00;
 	str:= UserNick + '> ' + str + '_'
 	end
 	else begin
diff -r e13a1117152b -r 2ca4ca6b4bab hedgewars/uLocale.pas
--- a/hedgewars/uLocale.pas	Sun Sep 27 10:26:36 2009 +0000
+++ b/hedgewars/uLocale.pas	Sun Sep 27 14:33:59 2009 +0000
@@ -29,7 +29,7 @@
             sidLaserSight, sidVampiric, sidSniperRifle, sidJetpack);
 
 	TMsgStrId = (sidStartFight, sidDraw, sidWinner, sidVolume, sidPaused,
-			sidConfirm, sidSuddenDeath, sidRemaining, sidFuel);
+			sidConfirm, sidSuddenDeath, sidRemaining, sidFuel, sidSync);
 
 	TEventId = (eidDied, eidDrowned, eidRoundStart, eidRoundWin, eidRoundDraw,
 			eidNewHealthPack, eidNewAmmoPack, eidNewUtilityPack, eidTurnSkipped, eidHurtSelf);
diff -r e13a1117152b -r 2ca4ca6b4bab hedgewars/uStore.pas
--- a/hedgewars/uStore.pas	Sun Sep 27 10:26:36 2009 +0000
+++ b/hedgewars/uStore.pas	Sun Sep 27 14:33:59 2009 +0000
@@ -61,6 +61,7 @@
 var PixelFormat: PSDL_PixelFormat = nil;
  SDLPrimSurface: PSDL_Surface = nil;
    PauseTexture,
+   SyncTexture,
    ConfirmTexture: PTexture;
    cScaleFactor: GLfloat = 2.0;
 
@@ -308,6 +309,7 @@
 
 PauseTexture:= RenderStringTex(trmsg[sidPaused], $FFFF00, fntBig);
 ConfirmTexture:= RenderStringTex(trmsg[sidConfirm], $FFFF00, fntBig);
+SyncTexture:= RenderStringTex(trmsg[sidSync], $FFFF00, fntBig);
 
 for ai:= Low(TAmmoType) to High(TAmmoType) do
 	with Ammoz[ai] do
diff -r e13a1117152b -r 2ca4ca6b4bab hedgewars/uWorld.pas
--- a/hedgewars/uWorld.pas	Sun Sep 27 10:26:36 2009 +0000
+++ b/hedgewars/uWorld.pas	Sun Sep 27 14:33:59 2009 +0000
@@ -466,6 +466,7 @@
 
 DrawChat;
 
+if fastUntilLag then DrawCentered(0, cScreenHeight div 2, SyncTexture);
 if isPaused then DrawCentered(0, cScreenHeight div 2, PauseTexture);
 
 inc(Frames);
@@ -556,7 +557,7 @@
 	CursorPoint.Y:= cScreenHeight - CursorPoint.Y;
 	end;
 
-if (FollowGear <> nil) and (not isCursorVisible) then
+if (FollowGear <> nil) and (not isCursorVisible) and (not fastUntilLag) then
 	if abs(CursorPoint.X - prevPoint.X) + abs(CursorPoint.Y - prevpoint.Y) > 4 then
 		begin
 		FollowGear:= nil;
diff -r e13a1117152b -r 2ca4ca6b4bab share/hedgewars/Data/Locale/en.txt
--- a/share/hedgewars/Data/Locale/en.txt	Sun Sep 27 10:26:36 2009 +0000
+++ b/share/hedgewars/Data/Locale/en.txt	Sun Sep 27 14:33:59 2009 +0000
@@ -50,6 +50,7 @@
 01:06=Sudden Death!
 01:07=Remaining
 01:08=Fuel
+01:09=Synchronizing...
 
 ; Event messages
 ; Hog (%1) died
diff -r e13a1117152b -r 2ca4ca6b4bab share/hedgewars/Data/Locale/ru.txt
--- a/share/hedgewars/Data/Locale/ru.txt	Sun Sep 27 10:26:36 2009 +0000
+++ b/share/hedgewars/Data/Locale/ru.txt	Sun Sep 27 14:33:59 2009 +0000
@@ -50,6 +50,7 @@
 01:06=Скоро погибель!
 01:07=Осталось
 01:08=Топливо
+01:09=Синхронизация...
 
 ; Event messages
 ; Hog (%1) died