Mercurial Mercurial > sheepy-clone / 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.
Merge
authorWolfgang Steffens <WolfgangSteff@gmail.com>
Mon, 25 Jun 2012 15:46:49 +0200
changeset 7299 c633d00dc593
parent 7297 af64b509725c (current diff)
parent 7290 390d76b29ed0 (diff)
child 7301 bea42438a2ec
Merge
--- a/QTfrontend/ui/widget/about.cpp	Mon Jun 25 15:46:08 2012 +0200
+++ b/QTfrontend/ui/widget/about.cpp	Mon Jun 25 15:46:49 2012 +0200
@@ -128,7 +128,7 @@
             "Greek: &lt;<a href=\"mailto:talos_kriti@yahoo.gr\">talos_kriti@yahoo.gr</a>&gt;<br>"
             "Italian: Luca Bonora &lt;<a href=\"mailto:bonora.luca@gmail.com\">bonora.luca@gmail.com</a>&gt;, Marco Bresciani<br>"
             "Japanese: ADAM Etienne &lt;<a href=\"mailto:etienne.adam@gmail.com\">etienne.adam@gmail.com</a>&gt;<br>"
-            "Korean: Anthony Bellew &lt;<a href=\"mailto:webmaster@anthonybellew.com\">webmaster@anthonybellew.com</a>&gt;<br>"
+            "Korean: Anthony Bellew &lt;<a href=\"mailto:anthonyreflected@gmail.com\">anthonyreflected@gmail.com</a>&gt;<br>"
             "Lithuanian: Lukas Urbonas &lt;<a href=\"mailto:lukasu08@gmail.com\">lukasu08@gmail.com</a>&gt;<br>"
             "Polish: Maciej Mroziński &lt;<a href=\"mailto:mynick2@o2.pl\">mynick2@o2.pl</a>&gt;, Wojciech Latkowski &lt;<a href=\"mailto:magik17l@gmail.com\">magik17l@gmail.com</a>&gt;, Piotr Mitana, Maciej Górny<br>"
             "Portuguese: Fábio Canário &lt;<a href=\"mailto:inufabie@gmail.com\">inufabie@gmail.com</a>&gt;<br>"
--- a/hedgewars/uLandPainted.pas	Mon Jun 25 15:46:08 2012 +0200
+++ b/hedgewars/uLandPainted.pas	Mon Jun 25 15:46:49 2012 +0200
@@ -57,10 +57,10 @@
         rec:= prec^;
         rec.X:= SDLNet_Read16(@rec.X);
         rec.Y:= SDLNet_Read16(@rec.Y);
-        if rec.X < -323 then rec.X:= -323;
-        if rec.X > LAND_WIDTH+323 then rec.X:= LAND_WIDTH+323;
-        if rec.Y < -323 then rec.Y:= -323;
-        if rec.Y > LAND_HEIGHT+323 then rec.Y:= LAND_HEIGHT+323;
+        if rec.X < -318 then rec.X:= -318;
+        if rec.X > LAND_WIDTH+318 then rec.X:= LAND_WIDTH+318;
+        if rec.Y < -318 then rec.Y:= -318;
+        if rec.Y > LAND_HEIGHT+318 then rec.Y:= LAND_HEIGHT+318;
 
         new(pe);
         if pointsListLast = nil then
sheepy-clone