Merge OpenRCT2/master into OpenRCT2/develop

contributors.md

@@ -55,6 +55,7 @@ Includes all git commit authors. Aliases are GitHub user names.
 * (nean)
 * Ed Foley (e-foley)
 * Michael Pham (nightroan)
+* Hielke Morsink (Broxzier)
 
 ## Toolchain
 * (Balletie) - OSX

data/language/chinese_traditional.txt

@@ -2294,7 +2294,7 @@ STR_2286    :設計中
 STR_2287    :完成設計中
 STR_2288    :未知
 STR_2289    :{STRINGID} {STRINGID}
-STR_2290    :{SMALLFONT}{BLACK}{STRINGID} {STRINGID}
+STR_2290    :<not used anymore>
 STR_2291    :選擇新遊戲的劇情
 STR_2292    :{WINDOW_COLOUR_2}乘坐過的遊樂設施:
 STR_2293    :{BLACK}無
@@ -3900,7 +3900,7 @@ STR_5557    :多人遊戲不同步時依然保持連線
 STR_5558    :此設定會於重啟遊戲後生效
 STR_5559    :檢查時距為10分鐘
 STR_5560    :將所有遊樂設施的檢查時距設定為'每10分鐘'
-STR_5561    :載入語言檔案失敗
+STR_5561    :載入語言失敗
 STR_5562    :警告!
 STR_5563    :此功能暫未穩定地使用, 請多加留意.
 STR_5564    :插入已損壞元素
@@ -3919,6 +3919,7 @@ STR_5576    :連接埠:
 STR_5577    :南韓園 (₩)
 STR_5578    :俄羅斯盧布 (R)
 STR_5579    :顥示縮放因子:
+STR_5580    :捷克克朗 (Kc)
 
 
 #####################

data/language/dutch.txt

@@ -3171,20 +3171,20 @@ STR_3166    :{BLACK}(ID:
 STR_3167    :{WINDOW_COLOUR_2}Bevat {BLACK}{COMMA16} objecten
 STR_3168    :{WINDOW_COLOUR_2}Tekst: {BLACK}{STRINGID}
 STR_3169    :Data voor de volgende objecten niet gevonden: 
-STR_3170    :Niet genoeg ruimte voor graphics
-STR_3171    :Te veel objecten van dit type geselecteerd
+STR_3170    :Niet genoeg ruimte voor graphics.
+STR_3171    :er zijn teveel objecten van dit type geselecteerd.
 STR_3172    :De volgende objecten moeten eerst geselecteerd worden:
-STR_3173    :Dit object is momenteel in gebruik
-STR_3174    :Een ander object is afhankelijk van dit object
-STR_3175    :Dit object is altijd benodigd
-STR_3176    :Kan object niet selecteren
-STR_3177    :Kan object niet deselecteren
-STR_3178    :Er moet minstens één voetpad worden geselecteerd
-STR_3179    :Er moet minstens één attractie worden geselecteerd
-STR_3180    :Ongeldige selectie van objecten
+STR_3173    :dit object is momenteel in gebruik.
+STR_3174    :een ander object is afhankelijk van dit object.
+STR_3175    :dit object is altijd benodigd.
+STR_3176    :Kan object niet selecteren:
+STR_3177    :Kan object niet deselecteren:
+STR_3178    :er moet minstens één voetpad worden geselecteerd.
+STR_3179    :er moet minstens één attractie worden geselecteerd.
+STR_3180    :Ongeldige selectie van objecten:
 STR_3181    :Objectselectie - {STRINGID}
-STR_3182    :Er moet een parkingang worden geselecteerd
-STR_3183    :Er moet een watertype worden geselecteerd
+STR_3182    :er moet een parkingang worden geselecteerd.
+STR_3183    :er moet een watertype worden geselecteerd.
 STR_3184    :Attracties/voertuigen
 STR_3185    :Klein decor
 STR_3186    :Groot decor
@@ -5588,7 +5588,7 @@ STR_DESC    :Een waar de nieuwste soorten frisdrank worden verkocht.
 
 # Shops
 [BALLN]
-STR_NAME    :Balloon Stall
+STR_NAME    :Ballonnenkraam
 STR_DESC    :Een souvenirkraam waar met helium gevulde ballonnen worden verkocht.
 
 [HATST]

data/title/openrct2/script.txt

@@ -1,108 +1,81 @@
-# OpenRCT2 0.0.2 Title Sequence Script
-# Arranged by IntelOrca
+# OpenRCT2 0.0.3 Title Sequence Script
+# Arranged by Gymnasiast (Michael Steenbeek).
+# Based on the 0.0.2 script, which was arranged by IntelOrca.
+
 
-# PFCKrutonium
 LOAD pfckrutonium1.sv6
 LOCATION 7 41
-WAIT 15
-LOCATION 49 15
-ROTATE 1
 WAIT 10
 
-# Achilleshiel
+LOAD netgrouppark.sv6
+LOCATION 91 10
+WAIT 9
+
+LOCATION 25 15
+WAIT 9
+
+LOAD bigfoot.sv6
+LOCATION 58 29
+WAIT 10
+
+ROTATE 1
+LOCATION 29 63
+WAIT 10
+
+LOAD gymnasiast2.sv6
+LOCATION 39 79
+WAIT 11
+
 LOAD achilleshiel.sv6
 LOCATION 25 77
 WAIT 10
 
 LOCATION 36 58
 ROTATE 3
-WAIT 12
-
-LOCATION 64 40
-ROTATE 1
 WAIT 8
 
-# DUSTY GREENS
-LOAD triggerdeath.sv6
-LOCATION 63 68
-WAIT 14
-
-ROTATE 1
-WAIT 16
-
-LOCATION 28 26
-ROTATE 2
-WAIT 10
-
-LOCATION 61 33
-ROTATE 2
-WAIT 8
-
-# PFCKrutonium
-LOAD pfckrutonium2.sv6
-LOCATION 116 58
-WAIT 14
-
-ROTATE 1
-WAIT 12
-
-# Shotguns (http://www.nedesigns.com/park/3107/rougarou/)
-LOAD shotguns.sv6
-LOCATION 20 13
-WAIT 16
-
-# Faas (http://www.nedesigns.com/park/2996/lucky-lake-amusement-park/)
-LOAD faas.sv6
-LOCATION 42 11
-WAIT 10
-
-LOCATION 30 18
-ROTATE 1
-WAIT 16
-
-LOCATION 17 71
-ROTATE 2
-WAIT 12
-
-LOCATION 88 68
-WAIT 12
-
-# MCI (http://www.nedesigns.com/park/2973/maerchen-paradies/)
 LOAD mci.sv6
 LOCATION 46 60
-WAIT 16
-
-LOCATION 78 43
-ROTATE 2
-WAIT 12
+WAIT 6
 
 LOCATION 76 32
 ROTATE 1
+WAIT 11
+
+LOAD phann.sv6
+LOCATION 96 73
 WAIT 8
 
-# Ride6 (http://www.nedesigns.com/park/2545/banana-valley/)
 LOAD rid6.sv6
 LOCATION 56 34
-WAIT 10
-
-LOCATION 48 4
-WAIT 4
+WAIT 8
 
 LOCATION 10 29
 ROTATE 1
-WAIT 12
+WAIT 8
+
+LOAD gymnasiast1.sv6
+LOCATION 51 46
+WAIT 11
+
+LOAD alexfablelake.SV6
+LOCATION 50 25
+WAIT 9
+
+ROTATE 1
+LOCATION 35 74
+WAIT 9
 
-# Poke (http://www.nedesigns.com/park/2967/mystic-mountain/)
 LOAD poke.sv6
 LOCATION 43 83
-WAIT 16
+WAIT 9
 
 LOCATION 63 35
 ROTATE 3
-WAIT 12
+WAIT 9
 
 LOCATION 12 47
 ROTATE 3
-WAIT 20
+WAIT 6
 
-RESTART
+RESTART

distribution/changelog.txt

@@ -1,4 +1,4 @@
-0.0.3-beta (not yet released)
+0.0.3-beta (2015-11-30)
 ------------------------------------------------------------------------
 - Feature: Adding extra title sequences.
 - Feature: Title sequences can be edited in-game.

distribution/known_issues.txt

@@ -1,11 +1,6 @@
-Release version: 0.0.2-beta
+Release version: 0.0.3-beta
 ------------------------------------------------------------------------
 * Some sounds play at their maximum volume irrespective of the sound volume control.
-* Sandbox mode does not support all map modifications.
-* Zero clearance cheat results in drawing glitches.
-* Build while paused mode does not support all game commands.
-* Some text shown in the map is not translated to selected language.
 * Scenario editor object selection window will show object names in the selected language at the time of building the object cache. (Deleting plugin.dat in Documents/OpenRCT2 will fix this)
-* The game will run slower at high resolutions, particularly if there are many moving objects visible.
 
-Most bugs or limitations present in the original game have not yet been fixed or lifted.
+Some bugs or limitations present in the original game have not yet been fixed or lifted.

distribution/readme.txt

@@ -1,5 +1,5 @@
-Last updated:    2015-06-21
-Release version: 0.0.2-beta
+Last updated:    2015-30-11
+Release version: 0.0.3-beta
 ------------------------------------------------------------------------
 
 

distribution/windows/win32.txt

@@ -1,5 +1,5 @@
 !define APPBITS 32          ; Define number of bits for the architecture
-!define EXTRA_VERSION "XP SP3, Vista, 7 and 8.1"
+!define EXTRA_VERSION "Vista, 7, 8.1 and 10"
 !define APPARCH "win32"     ; Define the application architecture
 !define BINARY_DIR "${PATH_ROOT}build\Release"
 InstallDir "$PROGRAMFILES32\OpenRCT2\"

src/game.c

@@ -1042,11 +1042,14 @@ void save_game()
 			scenario_save(rw, 0x80000000);
 			log_verbose("Saved to %s", gScenarioSavePath);
 			SDL_RWclose(rw);
+
+			// Setting screen age to zero, so no prompt will pop up when closing the
+			// game shortly after saving.
+			RCT2_GLOBAL(RCT2_ADDRESS_SCREEN_AGE, uint16) = 0;
 		}
 	} else {
 		save_game_as();
 	}
-
 }
 void save_game_as()
 {