Changeset 613 for trunk/LocalPlayer/Diplomacy.pas

Timestamp:

Sep 14, 2024, 11:02:08 AM (6 days ago)

Author:

chronos

Message:

• Added: Allow to rename city with mouse right click on city caption in City screen.
• Fixed: Do not overflow city name text in City screen.
• Fixed: Repaint main screen after city and unit rename.

File:

• trunk/LocalPlayer/Diplomacy.pas (modified) (9 diffs)

trunk/LocalPlayer/Diplomacy.pas

@@ -29 +29 @@
         Result := Tribe[P].TPhrase('PRICE_MAP');
       opTreaty:
-        { if Price-opTreaty<Treaty then
+        { if Price - opTreaty < Treaty then
           case Treaty of
-          trPeace: Result:=Phrases.Lookup('FRENDTREATY_PEACE');
-          trFriendlyContact: Result:=Phrases.Lookup('FRENDTREATY_FRIENDLY');
-          trAlliance: Result:=Phrases.Lookup('FRENDTREATY_ALLIANCE');
+            trPeace: Result := Phrases.Lookup('FRENDTREATY_PEACE');
+            trFriendlyContact: Result := Phrases.Lookup('FRENDTREATY_FRIENDLY');
+            trAlliance: Result := Phrases.Lookup('FRENDTREATY_ALLIANCE');
           end
           else } Result := Phrases.Lookup('TREATY', Price - opTreaty);
@@ -61 +61 @@
         Result := Tribe[P].TPhrase('PRICE_ALLMODEL');
       { opCity:
-        Result:=Format(TPhrase('PRICE_CITY',P),[CityName(Price-opCity)]); }
-    end
+        Result := Format(TPhrase('PRICE_CITY', P), [CityName(Price - opCity)]); }
+    end;
   end;
 
@@ -92 +92 @@
           (Integer(OppOffer.Price[0] - opTreaty) > Treaty) then
         // simple treaty offer
-          { if OppOffer.Price[0]-opTreaty=trCeaseFire then
-            Result:=Tribe[pTarget].TPhrase('FRACCEPTCEASEFIRE')
+          { if OppOffer.Price[0] - opTreaty = trCeaseFire then
+            Result := Tribe[pTarget].TPhrase('FRACCEPTCEASEFIRE')
             else } Result := Tribe[pTarget].TPhrase('FRACCEPTTREATY')
         else if OppOffer.nDeliver = 0 then
@@ -132 +132 @@
             sDeliver := sAdd
           else
-            sDeliver := Format(Phrases.Lookup('PRICE_CONCAT'), [sDeliver, sAdd])
+            sDeliver := Format(Phrases.Lookup('PRICE_CONCAT'), [sDeliver, sAdd]);
         end;
         sCost := '';
@@ -141 +141 @@
             sCost := sAdd
           else
-            sCost := Format(Phrases.Lookup('PRICE_CONCAT'), [sCost, sAdd])
+            sCost := Format(Phrases.Lookup('PRICE_CONCAT'), [sCost, sAdd]);
         end;
 
@@ -167 +167 @@
             end;
             Result := Result + Phrases.Lookup('FRDONE');
-            DoIntro := False
-          end
+            DoIntro := False;
+          end;
         end
         else if (Offer.nDeliver + Offer.nCost = 1) and
@@ -183 +183 @@
             trAlliance:
               Result := Result + Tribe[pTarget].TPhrase('FRALLIANCE');
-          end
+          end;
         end
         else if Offer.nDeliver = 0 then // demand
@@ -196 +196 @@
             Result := Result +
               Format(Tribe[pTarget].TPhrase('FRDEMAND_STRONG'), [sCost]);
-            DoIntro := False
-          end
+            DoIntro := False;
+          end;
         end
         else if Offer.nCost = 0 then // present
@@ -216 +216 @@
       Result := Tribe[pSender].TPhrase('FRSTART_NOTREATY') + ' ' + Result
     else
-      Result := Tribe[pSender].TPhrase('FRSTART_PEACE') + ' ' + Result
+      Result := Tribe[pSender].TPhrase('FRSTART_PEACE') + ' ' + Result;
 end;