Mercurial Mercurial > hedgewars / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
- Tweak join/leave colour
authorunc0rr
Fri, 16 Oct 2009 18:37:55 +0000
changeset 2500 31ba68a50208
parent 2499 548f69de8db1
child 2501 51ebab1b446d
- Tweak join/leave colour - Don't show how many shots left message when multishoot game flag set
hedgewars/HHHandlers.inc file | annotate | diff | comparison | revisions
hedgewars/uChat.pas file | annotate | diff | comparison | revisions 
--- a/hedgewars/HHHandlers.inc	Fri Oct 16 18:04:38 2009 +0000
+++ b/hedgewars/HHHandlers.inc	Fri Oct 16 18:37:55 2009 +0000
@@ -242,12 +242,10 @@
 	if ((Ammo^[CurSlot, CurAmmo].Propz) and ammoprop_Utility) = 0 then
 		begin
 		Inc(AttacksNum);
-		if (Ammo^[CurSlot, CurAmmo].NumPerTurn >= AttacksNum) or
-		((GameFlags and gfMultiWeapon) <> 0) then
-            begin
-            AddCaption(inttostr(Ammo^[CurSlot, CurAmmo].NumPerTurn+1-AttacksNum)+' '+trmsg[sidRemaining], $FFFFFF, capgrpAmmostate);
-			isInMultiShoot:= true
-            end
+		if (Ammo^[CurSlot, CurAmmo].NumPerTurn >= AttacksNum) then
+			AddCaption(inttostr(Ammo^[CurSlot, CurAmmo].NumPerTurn+1-AttacksNum)+' '+trmsg[sidRemaining], $FFFFFF, capgrpAmmostate);
+		isInMultiShoot:= (Ammo^[CurSlot, CurAmmo].NumPerTurn >= AttacksNum) or
+				((GameFlags and gfMultiWeapon) <> 0)
 		else
 			begin
 			TurnTimeLeft:= Ammoz[Ammo^[CurSlot, CurAmmo].AmmoType].TimeAfterTurn;
--- a/hedgewars/uChat.pas	Fri Oct 16 18:04:38 2009 +0000
+++ b/hedgewars/uChat.pas	Fri Oct 16 18:37:55 2009 +0000
@@ -49,7 +49,7 @@
 const colors: array[#1..#4] of Longword = (
 	$FFFFFF, // chat message
 	$FF00FF, // action message
-	$00FF00, // join/leave message
+	$90FF90, // join/leave message
 	$A0FFFF  // team message
 	);
hedgewars