merge 0.9.15 (with a typo fix)
authornemo
Mon, 27 Dec 2010 16:32:15 -0500
changeset 4731 edf7d04d3fa9
parent 4722 038cd49777a7 (diff)
parent 4728 3d808af10ea0 (current diff)
child 4735 08749f5127b9
merge 0.9.15 (with a typo fix)
CMakeLists.txt
hedgewars/uLandPainted.pas
--- a/CMakeLists.txt	Mon Dec 27 22:22:50 2010 +0100
+++ b/CMakeLists.txt	Mon Dec 27 16:32:15 2010 -0500
@@ -8,7 +8,7 @@
 ENDIF()
 
 #detect Mercurial revision (if present)
-#set(version_suffix "-dev") #UNSET THIS VARIABLE AT RELEASE TIME
+set(version_suffix "-dev") #UNSET THIS VARIABLE AT RELEASE TIME
 IF(version_suffix MATCHES "-dev")
 	set(HW_DEV true)
 	IF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.hg)
@@ -165,7 +165,7 @@
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 
 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set(HEDGEWARS_PROTO_VER 37)
+set(HEDGEWARS_PROTO_VER 34)
 
 if(WITH_SERVER)
 	message(STATUS "Server is going to be built! Make sure you have GHC installed")
@@ -239,13 +239,14 @@
 	"release$"
 	"Debug$"
 	"Release$"
-	"proto.inc$"
-	"hwconsts.cpp$"
-	"playlist.inc$"
+	"proto\\\\.inc$"
+	"hwconsts\\\\.cpp$"
+	"playlist\\\\.inc$"
 	"CPack"
-	"cmake_install.cmake$"
-	"config.inc$"
-	"hwengine.desktop$"
+	"cmake_install\\\\.cmake$"
+	"config\\\\.inc$"
+	"hwengine\\\\.desktop$"
+	"CMakeCache\\\\.txt$"
 #   "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libopenalbridge"
 	"^${CMAKE_CURRENT_SOURCE_DIR}/project_files/HedgewarsMobile/"
 	"^${CMAKE_CURRENT_SOURCE_DIR}/bin/[a-z]"
--- a/hedgewars/uLandPainted.pas	Mon Dec 27 22:22:50 2010 +0100
+++ b/hedgewars/uLandPainted.pas	Mon Dec 27 16:32:15 2010 -0500
@@ -149,7 +149,7 @@
         begin
         if (pe^.point.flags and $80 <> 0) then
             begin
-            {$IFDEF DEBUGBFILE}AddFileLog('[DRAW] Move to: ('+inttostr(pe^.point.X)+','+inttostr(pe^.point.Y)+')');{$ENDIF}
+            {$IFDEF DEBUGFILE}AddFileLog('[DRAW] Move to: ('+inttostr(pe^.point.X)+','+inttostr(pe^.point.Y)+')');{$ENDIF}
             FillRoundInLand(pe^.point.X, pe^.point.Y, 34, lfBasic)
             end
             else
--- a/share/hedgewars/Data/Locale/sv.lua	Mon Dec 27 22:22:50 2010 +0100
+++ b/share/hedgewars/Data/Locale/sv.lua	Mon Dec 27 16:32:15 2010 -0500
@@ -8,7 +8,7 @@
 	["Bazooka Training"] = "Bazookaträning",
 	["Best laps per team: "] = "Bästa varv per lag: ",
 	["Bloody Rookies"] = "Blodiga gröngölingar", -- 01#Boot_Camp, User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree
---      ["Boom!"] = "",
+    ["Boom!"] = "Bom!",
 	["by mikade"] = "av mikade", -- Control, User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork, Capture_the_Flag
 	["CAPTURE THE FLAG"] = "CAPTURE THE FLAG",
 	["Codename: Teamwork"] = "Kodnamn: Lagarbete",
@@ -17,7 +17,7 @@
 	["CONTROL"] = "KONTROLL",
 	["Control pillars to score points."] = "Kontrollera pelare för att ta poäng",
 	["CONTROL v0.3"] = "KONTROLL v0.3",
---      ["CTF_BLIZZARD"] = "",
+    ["CTF_BLIZZARD"] = "CTF_BLIZZARD",
 	["CUSTOM BUILD 0.2"] = "SPECIALVERSION 0.2",
 	["Cybernetic Empire"] = "Robotriket",
 	["DAMMIT, ROOKIE! GET OFF MY HEAD!"] = "SATAN, GRÖNGÖLING! SLUTA TJATA!",
@@ -38,7 +38,7 @@
 	["GAME OVER!"] = "SPELET ÄR SLUT!",
 	["Game Started!"] = "Spel startat!",
 	["Get on over there and take him out!"] = "Ta dig bort där och gör dig av med honom!",
---      ["Goal:"] = "",
+    ["Goal:"] = "Mål:",
 	["GO! GO! GO!"] = "Kör! Kör! Kör!",
 	["Good birdy......"] = "Fin fågel......",
 	["Good luck out there!"] = "Lycka till där ute!",
@@ -50,7 +50,7 @@
 	["Instructor"] = "Instruktör", -- 01#Boot_Camp, User_Mission_-_Dangerous_Ducklings
 	["- Jumping is disabled"] = "- Hoppande är avaktiverat",
 	["Listen up, maggot!!"] = "Hör här, ynkrygg!!",
---      ["|- Mines Time:"] = "", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
+    ["|- Mines Time:"] = "|- Mintid:", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
 	["MISSION FAILED"] = "UPPDRAG MISSLYCKADES", -- User_Mission_-_Dangerous_Ducklings, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
 	["MISSION SUCCESSFUL"] = "UPPDRAG SLUTFÖRT", -- User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
 	["MISSION SUCCESS"] = "UPPDRAG LYCKADES", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
@@ -65,9 +65,8 @@
 	["Poison"] = "Gift",
 	["Random Weapons"] = "Slumpade vapen",
 	[" - Return the enemy flag to your base to score | - First team to 3 captures wins | - You may only score when your flag is in your base | - Hogs will drop the flag if killed, or drowned | - Dropped flags may be returned or recaptured | - Hogs respawn when killed"] = " - Återvänd med fiendens flagga till din bas för att ta poäng | - Första laget till tre vinner | - Du kan bara ta poäng när din egen flagga är i basen | - Kottar tappar flaggan när de dödas eller drunknar | - Tappade flaggor kan tas tillbaka eller fångas | - Kottar kommer tillbaka när de dör",
---      ["RULES OF THE GAME [Press ESC to view]"] = "",
-	["RULES OF THE GAME [Press ESC to view]"] = "SPELREGLER [Tryck ESC för att se",
---      ["sec"] = "", -- CTF_Blizzard, TrophyRace, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork, Capture_the_Flag
+	["RULES OF THE GAME [Press ESC to view]"] = "SPELREGLER [Tryck ESC för att se]",
+    ["sec"] = "sec", -- CTF_Blizzard, TrophyRace, Basic_Training_-_Bazooka, Basic_Training_-_Shotgun, Basic_Training_-_Sniper_Rifle, User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork, Capture_the_Flag
 	["See ya!"] = "Ses!",
 	["Shotgun Team"] = "Hagelgevärslaget",
 	["Shotgun Training"] = "Hagelgevärsträning",
@@ -78,9 +77,9 @@
 	["Spooky Tree"] = "Kusligt träd",
 	["Team %d: "] = "Lag %d: ",
 	["Team Scores:"] = "Lagresultat:",
---      ["That was pointless."] = "",
+    ["That was pointless."] = "Det där var meningslöst.",
 	["The enemy is hiding out on yonder ducky!"] = "Fienden gömmer sig på andra ankan!",
---      ["The flag will respawn next round."] = "",
+    ["The flag will respawn next round."] = "Flaggan kommer tillbaka nästa runda.",
 	["There has been a mix-up with your gear and now you|have to utilize whatever is coming your way!"] = "Det har uppstått ett missförstånd om din utrustning|och nu måste du använda vad du kan hitta!",
 	["Toxic Team"] = "Förgiftade laget", -- User_Mission_-_Diver, User_Mission_-_Spooky_Tree, User_Mission_-_Teamwork
 	["TrophyRace"] = "TrophyRace",