1
0
mirror of https://github.com/OpenTTD/OpenTTD.git synced 2025-08-27 08:29:11 +00:00

Compare commits

..

1 Commits

Author SHA1 Message Date
rubidium
99381bcb51 (svn r22686) -Release 1.1.2-RC1 2011-07-24 14:48:39 +00:00
218 changed files with 3464 additions and 6539 deletions

View File

@@ -60,9 +60,6 @@ ifdef OSXAPP
$(Q)cp "$(ROOT_DIR)/os/macosx/openttd.icns" "$(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/openttd.icns" $(Q)cp "$(ROOT_DIR)/os/macosx/openttd.icns" "$(BUNDLE_DIR)/$(OSXAPP)/Contents/Resources/openttd.icns"
$(Q)$(ROOT_DIR)/os/macosx/plistgen.sh "$(BUNDLE_DIR)/$(OSXAPP)" "$(REV)" $(Q)$(ROOT_DIR)/os/macosx/plistgen.sh "$(BUNDLE_DIR)/$(OSXAPP)" "$(REV)"
$(Q)cp "$(ROOT_DIR)/os/macosx/splash.png" "$(DATA_DIR)" $(Q)cp "$(ROOT_DIR)/os/macosx/splash.png" "$(DATA_DIR)"
endif
ifeq ($(OS),UNIX)
$(Q)cp "$(ROOT_DIR)/media/openttd.32.bmp" "$(DATA_DIR)/"
endif endif
$(Q)cp "$(BIN_DIR)/$(TTD)" "$(TTD_DIR)/" $(Q)cp "$(BIN_DIR)/$(TTD)" "$(TTD_DIR)/"
$(Q)cp "$(BIN_DIR)/ai/"compat_*.nut "$(AI_DIR)/" $(Q)cp "$(BIN_DIR)/ai/"compat_*.nut "$(AI_DIR)/"

View File

@@ -42,8 +42,8 @@ NFORENUM := $(shell [ `nforenum -s -v 2>/dev/null | wc -l ` -eq 1 ] && echo "nfo
MD5SUM := $(shell [ "$(OS)" = "OSX" ] && echo "md5 -r" || echo "md5sum") MD5SUM := $(shell [ "$(OS)" = "OSX" ] && echo "md5 -r" || echo "md5sum")
# Some "should not be changed" settings. # Some "should not be changed" settings.
NFO_FILES := $(GRF_DIR)/*.nfo $(GRF_DIR)/rivers/*.nfo NFO_FILES := $(GRF_DIR)/*.nfo
PNG_FILES := $(GRF_DIR)/*.png $(GRF_DIR)/rivers/*.png PNG_FILES := $(GRF_DIR)/*.png
# Build the GRF. # Build the GRF.
all: $(BIN_DIR)/openttd.grf all: $(BIN_DIR)/openttd.grf

View File

@@ -248,10 +248,7 @@ $(OBJS_RC): %.o: $(SRC_DIR)/%.rc $(FILE_DEP)
$(Q)$(WINDRES) -o $@ -I `basename $<` $< $(Q)$(WINDRES) -o $@ -I `basename $<` $<
$(BIN_DIR)/$(TTD): $(TTD) $(BIN_DIR)/$(TTD): $(TTD)
$(Q)cp $(TTD) $(BIN_DIR)/$(TTD) $(Q)cp $< $@
ifeq ($(OS), UNIX)
$(Q)cp $(MEDIA_DIR)/openttd.32.bmp $(BIN_DIR)/data/
endif
$(TTD): $(OBJS) $(CONFIG_CACHE_LINKER) $(TTD): $(OBJS) $(CONFIG_CACHE_LINKER)
$(E) '$(STAGE) Linking $@' $(E) '$(STAGE) Linking $@'

View File

@@ -8456,7 +8456,7 @@ ERROR: IsEnd() is invalid as Begin() is never called
GetNumWagons(): 3 GetNumWagons(): 3
GetLength(): 24 GetLength(): 24
GetWagonEngineType(): 9 GetWagonEngineType(): 9
GetWagonAge(): 1 GetWagonAge(): 0
GetWagonEngineType(): 27 GetWagonEngineType(): 27
GetWagonAge(): 0 GetWagonAge(): 0
GetWagonEngineType(): 27 GetWagonEngineType(): 27
@@ -8492,11 +8492,11 @@ ERROR: IsEnd() is invalid as Begin() is never called
14 => 1 14 => 1
12 => 1 12 => 1
Age ListDump: Age ListDump:
17 => 1
16 => 1
14 => 1 14 => 1
13 => 1 13 => 1
12 => 1 12 => 1
17 => 0
16 => 0
MaxAge ListDump: MaxAge ListDump:
16 => 10980 16 => 10980
14 => 10980 14 => 10980
@@ -8504,9 +8504,9 @@ ERROR: IsEnd() is invalid as Begin() is never called
13 => 5490 13 => 5490
12 => 5490 12 => 5490
AgeLeft ListDump: AgeLeft ListDump:
16 => 10979 16 => 10980
14 => 10979 14 => 10979
17 => 7319 17 => 7320
13 => 5489 13 => 5489
12 => 5489 12 => 5489
CurrentSpeed ListDump: CurrentSpeed ListDump:

Binary file not shown.

View File

@@ -55,7 +55,7 @@ TRGI.GRF = da6a6c9dcc451eec88d79211437b76a8
TRGC.GRF = ed446637e034104c5559b32c18afe78d TRGC.GRF = ed446637e034104c5559b32c18afe78d
TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9 TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9
TRGT.GRF = e30e8a398ae86c03dc534a8ac7dfb3b6 TRGT.GRF = e30e8a398ae86c03dc534a8ac7dfb3b6
OPENTTD.GRF = 245e2125cecfe7e0b6c5e85d32459f86 OPENTTD.GRF = 768051d1eb451c682d6f4e936a89caa5
[origin] [origin]
default = You can find it on your Transport Tycoon Deluxe CD-ROM. default = You can find it on your Transport Tycoon Deluxe CD-ROM.

View File

@@ -55,7 +55,7 @@ TRGI.GRF = da6a6c9dcc451eec88d79211437b76a8
TRGC.GRF = ed446637e034104c5559b32c18afe78d TRGC.GRF = ed446637e034104c5559b32c18afe78d
TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9 TRGH.GRF = ee6616fb0e6ef6b24892c58c93d86fc9
TRGT.GRF = fcde1d7e8a74197d72a62695884b909e TRGT.GRF = fcde1d7e8a74197d72a62695884b909e
OPENTTD.GRF = 245e2125cecfe7e0b6c5e85d32459f86 OPENTTD.GRF = 768051d1eb451c682d6f4e936a89caa5
[origin] [origin]
default = You can find it on your Transport Tycoon Deluxe CD-ROM. default = You can find it on your Transport Tycoon Deluxe CD-ROM.

View File

@@ -55,7 +55,7 @@ TRGIR.GRF = 0c2484ff6be49fc63a83be6ab5c38f32
TRGCR.GRF = 3668f410c761a050b5e7095a2b14879b TRGCR.GRF = 3668f410c761a050b5e7095a2b14879b
TRGHR.GRF = 06bf2b7a31766f048baac2ebe43457b1 TRGHR.GRF = 06bf2b7a31766f048baac2ebe43457b1
TRGTR.GRF = de53650517fe661ceaa3138c6edb0eb8 TRGTR.GRF = de53650517fe661ceaa3138c6edb0eb8
OPENTTD.GRF = 245e2125cecfe7e0b6c5e85d32459f86 OPENTTD.GRF = 768051d1eb451c682d6f4e936a89caa5
[origin] [origin]
default = You can find it on your Transport Tycoon Deluxe CD-ROM. default = You can find it on your Transport Tycoon Deluxe CD-ROM.

View File

@@ -1,116 +1,3 @@
1.1.4 (2011-12-05)
------------------------------------------------------------------------
- Fix: Savegames made with the Catalan town name generator would trigger a 'savegame corrupt' exception [FS#4866] (r23418)
- Fix: [Network] Do not send chat messages to clients that have not joined yet [FS#4826] (r23337)
- Fix: Assertion could be triggered in case a station was removed just after a vehicle delivered cargo to it [FS#4849] (r23312)
- Fix: Pathfinders go haywire when you build a lock over a ship going perpendicular to the axis of the new lock [FS#4845] (r23284)
- Fix: [NewGRF] Prevent against writing data for unknown fonts (r23283)
1.1.4-RC1 (2011-11-20)
------------------------------------------------------------------------
- Fix: 3-column view of NewGRF GUI had too much space for certain font sizes (r23251)
- Fix: Ignore special characters, such as the train 'character', when determining a fallback font (r23237)
- Fix: [NewGRF] Make train var 0xF3 consistent with TTDPatch (r23231)
- Fix: Invalidate build vehicle window when changing the setting for wagon speed limits (r23211)
- Fix: [NoAI] Hide AIObject from the documentation as it cannot be used (r23204, r23201)
- Fix: [Network] Unstable sorting in the network list when two servers had the exact same name [FS#4829] (r23202)
- Fix: Oil rigs that 'expired' did not get removed from the station list [FS#4822] (r23199)
- Fix: [Squirrel] replace custom qsort by std::sort to fix stack overflow [FS#4830] (r23190, r23187, r23186)
- Fix: Do not display railway fences between track and waypoints [FS#4627] (r23163)
- Fix: [NoAI] AIOrder did not handle implicit orders correctly in all cases [FS#4823] (r23135, r23133)
- Fix: When any keys on the on-screen keyboard were pressed the text cursor disappeared (r23132)
- Fix: [NoAI] AIOrder::IsCurrentOrderPartOfOrderList return false for valid vehicles and crashed for invalid ones (r23131)
- Fix: [NoAI] calling require() to include a file gave you 100.000 opcodes for free (r23117)
- Fix: Allow accessing the server's client info as well in the admin network [FS#4813] (r23115)
- Fix: [NewGRF] Run StartupEngines() if NewGRFs changed during loading a savegame, just like it is running when NewGRFs are changed during a game (r23083)
- Fix: Account for snow line table when determining the snow line for building houses (r23082)
- Fix: [NewGRF] If a NewGRF overrides a default house the minimum start year for that house was set to 1930 [FS#4794] (r23059)
- Fix: [NoAI] AIOrder::GetOrderCount() did not hide implicit orders (r23057)
- Fix: [NewGRF] When vehicles break down, update the image cache after changing the vehicle state (r23050)
- Fix: Use the same forest-check for the vegetation-map colour as for nearby station names [FS#4810] (r23049)
- Fix: Check that the selected font size is valid the font face in use and choose the nearest size to that selected if not. Font metrics should then just work (r23038)
- Fix: [NewGRF] Strip newlines from NewGRF strings that should not have newlines, e.g. the NewGRF's name [FS#4769] (r23036, r22970)
- Fix: The last custom playlist items went lost when the files in the .obm are not contiguous [FS#4776] (r23035, r23034, r23033)
- Fix: Palette conversion windows to DOS for light house / stadium animated colour was mixed up (r23032)
- Fix: For the admin 'bots' there was no distinction between bankruptcy and manual removal of companies even though the API suggested that [FS#4804] (r23031)
- Fix: Always show a chat message and send an admin packet when a new company is made [FS#4796] (r23030)
- Fix: Pass bottom of dropdown item rather than bottom of dropdown window, so the dropdown gets drawn better with different font sizes (r23018)
- Fix: AI backlog was to short to fully display the backtrace of some AI crashes [FS#4798] (r23012)
- Fix: When the last used server is deleted from the list also clear the last used server if it is the same [FS#4791] (r23011)
- Fix: [NewGRF] Make sure temporary storage is cleared before test and exec runs for DoCommands so NewGRF callbacks cannot change the result between the runs (r22996)
- Fix: [NewGRF] Tile was cleared before the object-placement callback was run, resulting in possible differences in test and exec run [FS#4775] (r22994)
- Fix: [NoAI] Do not return ERR_UNKNOWN when the vehicle would become too long (r22988)
- Fix: Draw buoy sprite without outline on the map, fix minor issues with original graphics (r22974, r22973, r22971, r22962)
- Fix: The savegame description and loading of savegames would crash with savegames from a patched stable (which did not bump the savegame version) [FS#4778] (r22958, r22957)
- Fix: Guard from reading outside the silly name list (r22955)
- Fix: [NewGRF] Properly limit the length of strings in a choice list (r22952)
- Fix: [NewGRF] Do not call CB 32 for disaster, effect vehicles or aircraft shadows/rotors (r22947)
- Fix: [NewGRF] Crash when accessing vehicle var 44 for a non-front aircraft [FS#4781] (r22946)
- Fix: Calculate the size of the start/stop vehicle button correctly (r22941)
- Fix: [OSX] Various MacOSX 10.7 issues causing OpenTTD to not work [FS#4751] (r22921, r22895, r22893, r22889)
- Fix: [NewGRF] Properties for feature 0x05 were not zeroed for each NewGRF, thus waterfeatures could glitch when the properties were set by a previous NewGRF and the NewGRF assumed the properties to be unmodified (r22918)
- Fix: Old TTO/TTD savegames could get non-stop via orders upon savegame loading, even when those orders did not exist back then. This 'conversion' feature is something for TTDPatch and old OpenTTD savegames [FS#4716] (r22914)
- Fix: The icon would (almost) never be shown for SDL builds [FS#4617] (r22910)
- Fix: The name of the heightmap glitches in the 'play heightmap' window (r22902)
- Fix: Locks would be incorrectly assembled (r22108)
1.1.3 (2011-09-15)
------------------------------------------------------------------------
- Fix: Prevent authentication bypass for the admin port when a new game is started [FS#4771] (r22934)
- Fix: TTO savegames with any aircraft not in an hangar caused crashes during load (r22915)
- Fix: Windows 2000 and XP without service pack 3 must use the win9x binary/installer; the newer MSVC compiler of the compile farm does not support those versions of Windows anymore [FS#4749] (r22909)
1.1.3-RC1 (2011-09-04)
------------------------------------------------------------------------
- Add: River graphics for the original base set (r22766)
- Fix: [NewGRF] DCxx text references via the textstack are not allowed, but caused crash [FS#4758] (r22882)
- Fix: Harden memory allocation (r22881, r22880, r22875)
- Fix: Miscalculation of train curve speed limits (r22879)
- Fix: Validate image dimensions before loading [CVE-2011-3343] [FS#4747] (r22878, r22877, r22874, r22873)
- Fix: Report an error in the news if autoreplace/renew fails due to the engine type being no longer available [FS#4712] (r22876)
- Fix: Perform stricter checks on RLE compressed BMP images [CVE-2011-3343] [FS#4746] (r22872, r22871)
- Fix: [NewGRF] Variables 40 and 81 of callback 18 are not the same as 80 (r22867)
- Fix: [NewGRF] Generic callbacks shall chain to the next GRF when the callback fails (r22866, r22865)
- Fix: Perform stricter checks on some commands [CVE-2011-3341] [FS#4745] (r22845)
- Fix: Harden savegame load against too many AI config settings [CVE-2011-3342] [FS#4748] (r22843)
- Fix: Compilation with GCC 4.7 (r22832, r22728, r22719)
- Fix: Allow to demolish aqueducts built in the scenario editor [FS#4741] (r22821)
- Fix: Towns expanding from the 'wrong' side of a tunnel or bridge [FS#4731] (r22810, r22809)
- Fix: [NewGRF] String codes for dates should use unsigned words, like old OpenTTD did before it learned dates before 1920 (r22774)
- Fix: [NoAI] Clarify the meaning of AIStation::IsWithinTownInfluence(), AITile::IsWithinTownInfluence() and AITown::IsWithinTownInfluence() [FS#4702] (r22763)
- Fix: [NewGRF] Also free allocated depot tables of NewGRF airports (r22760)
- Fix: [NewGRF] Invalid memory access when querying the grfID of the default objects [FS#4730] (r22757)
- Fix: When marking tile selections dirty, use the height information of the corners instead of the surface slope. This is more accurate when the foundation is kind of undefined [FS#4727] (r22755)
- Fix: Make aircraft point to the exit when leaving the hangar [FS#4696] (r22743, r22742, r22741)
- Fix: Display the size of the leveled platform in the measurement tooltip of terraforming operations [FS#4708] (r22740, r22739)
- Fix: Setting company passwords via the GUI on servers (including starting a company with the default password) failed, so no client could join that company [FS#4722] (r22738)
- Fix: [NewGRF] The construction stage sprites were incorrectly selected in cases other than 1 or 4 sprites per set (r22731)
- Fix: [NoAI] AITile::GetCargoAcceptance, AITile::GetCargoProduction and AIRail::BuildNewGRFRailStation did not check the cargo argument for validity (r22726)
- Fix: [NewGRF] Always draw NewGRF supplied texts with a default colour (r22725)
- Fix: [NewGRF] Do not restrict AdvVarAct2 to 255 operations (r22723)
- Fix: If there is no point in opening the rail/air toolbar, do not open it for people who use hotkeys either rather than only for those using GUI elements (r22716, r22715, r22714)
- Fix: [NoAI] Allow AIAirport::GetNoiseLevelIncrease() also for expired airports [FS#4704] (r22710)
1.1.2 (2011-08-14)
------------------------------------------------------------------------
- Fix: Some corrupted savegames could crash OpenTTD instead of showing the 'savegame corrupted' message [CVE-2011-3342] [FS#4717] (r22737, r22736)
- Fix: [NewGRF] Triggering NOT_REACHED when playing with a NewGRF that supplies genders/cases for a language that was not installed [FS#4718] (r22735)
1.1.2-RC2 (2011-07-30)
------------------------------------------------------------------------
- Fix: Cost of adding an extra road type to a bridge or tunnel was undercalculated [FS#4680, FS#4681] (r22700, r22699)
- Fix: Only insert cleared object tiles into _cleared_object_areas if clearing actually succeeds, else subsequential tests of the same tile will be skipped and considered successful [FS#4694] (r22698)
- Fix: When building a house it could be built at the wrong place if multitile houses failed some tests (r22697)
- Fix: [Network] Failed network address resolving could trigger temporary freezes [FS#4697] (r22696, r22695)
- Fix: [NewGRF] The override managers were not reset in some cases like creating a new scenario [FS#4691] (r22693)
- Fix: [NewGRF] Aircrafts defined with IDs above the default aircrafts always defaulted to passenger cargo (r22690)
1.1.2-RC1 (2011-07-24) 1.1.2-RC1 (2011-07-24)
------------------------------------------------------------------------ ------------------------------------------------------------------------
- Change: [NewGRF] Only allow access (via hotkey and menu) to the bounding box visualisation when NewGRF developer tools are enabled (r22675) - Change: [NewGRF] Only allow access (via hotkey and menu) to the bounding box visualisation when NewGRF developer tools are enabled (r22675)

View File

@@ -59,8 +59,8 @@ set_default() {
enable_translator="0" enable_translator="0"
enable_unicode="1" enable_unicode="1"
enable_console="1"; enable_console="1";
enable_assert="0" enable_assert="1"
enable_strip="1" enable_strip="0"
enable_universal="0" enable_universal="0"
enable_osx_g5="0" enable_osx_g5="0"
enable_cocoa_quartz="1" enable_cocoa_quartz="1"
@@ -1296,15 +1296,6 @@ make_compiler_cflags() {
cxxflags="$cxxflags -std=gnu++0x" cxxflags="$cxxflags -std=gnu++0x"
fi fi
if [ $cc_version -ge 47 ]; then
# Disable -Wnarrowing which gives many warnings, such as:
# warning: narrowing conversion of '...' from 'unsigned int' to 'int' inside { } [-Wnarrowing]
# They are valid according to the C++ standard, but useless.
cxxflags="$cxxflags -Wno-narrowing"
# Disable bogus 'attempt to free a non-heap object' warning
flags="$flags -Wno-free-nonheap-object"
fi
if [ "$enable_lto" != "0" ]; then if [ "$enable_lto" != "0" ]; then
# GCC 4.5 outputs '%{flto}', GCC 4.6 outputs '%{flto*}' # GCC 4.5 outputs '%{flto}', GCC 4.6 outputs '%{flto*}'
has_lto=`$1 -dumpspecs | grep '\%{flto'` has_lto=`$1 -dumpspecs | grep '\%{flto'`

View File

@@ -1,6 +1,6 @@
OpenTTD's known bugs OpenTTD's known bugs
Last updated: 2011-12-05 Last updated: 2011-07-24
Release version: 1.1.4 Release version: 1.1.2-RC1
------------------------------------------------------------------------ ------------------------------------------------------------------------
@@ -39,7 +39,8 @@ officially supporting Mac OS X again. For now it remains unsupported and
we only apply bug fixes provided by the community but we are unable to fix we only apply bug fixes provided by the community but we are unable to fix
these bugs ourselves. these bugs ourselves.
- 4744 [OSX] Crash when switching to full screen with OS X Lion - 4695 [OSX] Crash when switching to full screen with OS X Lion
- 4694 HQ (partly) destroyed when funding town
- 4689 [OSX] Crash when hiding window after coming from full screen - 4689 [OSX] Crash when hiding window after coming from full screen
- 4594 [Windows] Minimizing the windows when a modal error message is - 4594 [Windows] Minimizing the windows when a modal error message is
shown makes it difficult to exit the game shown makes it difficult to exit the game
@@ -267,7 +268,7 @@ OpenTTD hangs when started on 32 bits Windows [FS#4083]
default we are not able to detect this failure, except when Windows' default we are not able to detect this failure, except when Windows'
music initialisation function returns after several hours and then music initialisation function returns after several hours and then
there is no point in switching the music driver anymore. there is no point in switching the music driver anymore.
The reason we still use the "win32" music driver as default are The reason we do not use the "win32" music driver as default are
described in the "Long delay between switching music/song" section described in the "Long delay between switching music/song" section
of this document. of this document.
@@ -325,16 +326,3 @@ Unreadable characters for non-latin locales [FS#4607]
blitter has been selected, e.g. blitter = "32bpp-anim", as with the blitter has been selected, e.g. blitter = "32bpp-anim", as with the
8 bits blitter there are not enough colours to properly perform the 8 bits blitter there are not enough colours to properly perform the
anti-aliasing. anti-aliasing.
Train does not crash with itself [FS#4635]:
When a train drives in a circle the front engine passes through
wagons of the same train without crashing. This is intentional.
Signals are only aware of tracks, they do not consider the train
length and whether there would be enough room for a train in some
circle it might drive on. Also the path a train might take is not
necessarily known when passing a signal.
Checking all circumstances would take a lot of additional computational
power for signals, which is not considered worth the effort, as
it does not add anything to gameplay.
Nevertheless trains shall not crash in normal operation, so making
a train not crash with itself is the best solution for everyone.

View File

@@ -6,26 +6,13 @@
// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>. // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
// //
-1 * 0 0C "Aqueduct graphics by Jonathan G. Rennison / PaulC" -1 * 0 0C "Aqueduct graphics by Jonathan G. Rennison"
// temperate aqueduct
-1 * 6 07 83 01 \7! 00 09
-1 * 3 05 12 08 -1 * 3 05 12 08
-1 sprites/aqueduct.png 34 8 09 32 61 -30 -9 -1 sprites/aqueduct.png 34 8 09 33 64 -34 -10
-1 sprites/aqueduct.png 114 8 09 31 62 -29 -9 -1 sprites/aqueduct.png 114 8 09 33 66 -37 -9
-1 sprites/aqueduct.png 194 8 09 32 61 -30 -9 -1 sprites/aqueduct.png 194 8 09 33 64 -34 -10
-1 sprites/aqueduct.png 274 8 09 31 62 -29 -9 -1 sprites/aqueduct.png 274 8 09 33 66 -37 -9
-1 sprites/aqueduct.png 354 8 09 32 61 -30 -4 -1 sprites/aqueduct.png 354 8 09 33 64 -34 -5
-1 sprites/aqueduct.png 434 8 09 31 62 -29 -4 -1 sprites/aqueduct.png 434 8 09 33 66 -37 -4
-1 sprites/aqueduct.png 514 8 09 23 33 -31 0 -1 sprites/aqueduct.png 514 8 09 23 33 -31 0
-1 sprites/aqueduct.png 562 8 09 23 33 0 1 -1 sprites/aqueduct.png 562 8 09 23 33 0 1
// non-temperate aqueduct
-1 * 6 07 83 01 \7= 00 09
-1 * 3 05 12 08
-1 sprites/aqueduct.png 34 48 09 32 61 -30 -9
-1 sprites/aqueduct.png 114 48 09 31 62 -29 -9
-1 sprites/aqueduct.png 194 48 09 32 61 -30 -9
-1 sprites/aqueduct.png 274 48 09 31 62 -29 -9
-1 sprites/aqueduct.png 354 48 09 32 61 -30 -4
-1 sprites/aqueduct.png 434 48 09 31 62 -29 -4
-1 sprites/aqueduct.png 514 48 09 23 33 -31 0
-1 sprites/aqueduct.png 562 48 09 23 33 0 1

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 20 KiB

View File

@@ -6,166 +6,70 @@
// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>. // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
// //
-1 * 0 0C "Canal graphics by George / PaulC" -1 * 0 0C "Canal graphics by George"
-1 * 3 05 08 41 -1 * 3 05 08 41
// Canal slopes -1 sprites/canals.png 66 8 09 23 64 -31 0
-1 sprites/canal_locks.png 66 8 09 23 64 -31 0 -1 sprites/canals.png 146 8 09 39 64 -31 -8
-1 sprites/canal_locks.png 146 8 09 39 64 -31 -8 -1 sprites/canals.png 226 8 09 23 64 -31 0
-1 sprites/canal_locks.png 226 8 09 23 64 -31 0 -1 sprites/canals.png 306 8 09 39 64 -31 -8
-1 sprites/canal_locks.png 306 8 09 39 64 -31 -8 -1 sprites/canals.png 386 8 09 59 64 -31 -36
// Lock sides -1 sprites/canals.png 466 8 09 65 64 -31 -34
-1 sprites/canal_locks.png 386 8 09 59 64 -31 -36 -1 sprites/canals.png 546 8 09 59 64 -31 -36
-1 sprites/canal_locks.png 466 8 09 65 64 -31 -34 -1 sprites/canals.png 626 8 09 59 64 -31 -28
-1 sprites/canal_locks.png 546 8 09 59 64 -31 -36 -1 sprites/canals.png 706 8 09 62 64 -1 -51
-1 sprites/canal_locks.png 626 8 09 59 64 -31 -28 -1 sprites/canals.png 2 88 09 62 64 -61 -43
-1 sprites/canal_locks.png 706 8 09 62 64 -1 -51 -1 sprites/canals.png 82 88 09 62 64 -61 -51
-1 sprites/canal_locks.png 2 88 09 62 64 -61 -43 -1 sprites/canals.png 162 88 09 62 64 -1 -43
-1 sprites/canal_locks.png 82 88 09 62 64 -61 -51 -1 sprites/canals.png 242 88 09 59 64 -31 -28
-1 sprites/canal_locks.png 162 88 09 62 64 -1 -43 -1 sprites/canals.png 322 88 09 65 66 -33 -34
-1 sprites/canal_locks.png 242 88 09 59 64 -31 -28 -1 sprites/canals.png 402 88 09 59 64 -31 -28
-1 sprites/canal_locks.png 322 88 09 65 66 -33 -34 -1 sprites/canals.png 482 88 09 59 64 -31 -28
-1 sprites/canal_locks.png 402 88 09 59 64 -31 -28 -1 sprites/canals.png 562 88 09 62 64 -1 -43
-1 sprites/canal_locks.png 482 88 09 59 64 -31 -28 -1 sprites/canals.png 642 88 09 60 64 -61 -43
-1 sprites/canal_locks.png 562 88 09 62 64 -1 -43 -1 sprites/canals.png 722 88 09 62 66 -61 -43
-1 sprites/canal_locks.png 642 88 09 60 64 -61 -43 -1 sprites/canals.png 2 168 09 60 64 -1 -43
-1 sprites/canal_locks.png 722 88 09 62 66 -61 -43 -1 sprites/canals.png 82 168 09 59 64 -31 -28
-1 sprites/canal_locks.png 2 168 09 60 64 -1 -43 -1 sprites/canals.png 162 168 09 59 64 -31 -28
-1 sprites/canal_locks.png 82 168 09 59 64 -31 -28 -1 sprites/canals.png 242 168 09 59 64 -31 -28
-1 sprites/canal_locks.png 162 168 09 59 64 -31 -28 -1 sprites/canals.png 322 168 09 59 64 -31 -28
-1 sprites/canal_locks.png 242 168 09 59 64 -31 -28 -1 sprites/canals.png 402 168 09 60 64 -1 -43
-1 sprites/canal_locks.png 322 168 09 59 64 -31 -28 -1 sprites/canals.png 482 168 09 62 68 -61 -43
-1 sprites/canal_locks.png 402 168 09 60 64 -1 -43 -1 sprites/canals.png 562 168 09 60 64 -61 -43
-1 sprites/canal_locks.png 482 168 09 62 68 -61 -43 -1 sprites/canals.png 642 168 09 62 64 -1 -43
-1 sprites/canal_locks.png 562 168 09 60 64 -61 -43 -1 sprites/canals.png 722 168 09 59 64 -31 -36
-1 sprites/canal_locks.png 642 168 09 62 64 -1 -43 -1 sprites/canals.png 2 248 09 65 64 -31 -34
-1 sprites/canal_locks.png 722 168 09 59 64 -31 -36 -1 sprites/canals.png 82 248 09 59 64 -31 -36
-1 sprites/canal_locks.png 2 248 09 65 64 -31 -34 -1 sprites/canals.png 162 248 09 59 64 -31 -28
-1 sprites/canal_locks.png 82 248 09 59 64 -31 -36 -1 sprites/canals.png 242 248 09 62 64 -1 -51
-1 sprites/canal_locks.png 162 248 09 59 64 -31 -28 -1 sprites/canals.png 322 248 09 62 64 -61 -43
-1 sprites/canal_locks.png 242 248 09 62 64 -1 -51 -1 sprites/canals.png 402 248 09 62 64 -61 -51
-1 sprites/canal_locks.png 322 248 09 62 64 -61 -43 -1 sprites/canals.png 482 248 09 62 64 -1 -43
-1 sprites/canal_locks.png 402 248 09 62 64 -61 -51 -1 sprites/canals.png 562 248 09 59 64 -31 -28
-1 sprites/canal_locks.png 482 248 09 62 64 -1 -43 -1 sprites/canals.png 642 248 09 65 66 -33 -34
-1 sprites/canal_locks.png 562 248 09 59 64 -31 -28 -1 sprites/canals.png 722 248 09 59 64 -31 -28
-1 sprites/canal_locks.png 642 248 09 65 66 -33 -34 -1 sprites/canals.png 2 328 09 59 64 -31 -28
-1 sprites/canal_locks.png 722 248 09 59 64 -31 -28 -1 sprites/canals.png 82 328 09 62 64 -1 -43
-1 sprites/canal_locks.png 2 328 09 59 64 -31 -28 -1 sprites/canals.png 162 328 09 60 64 -61 -43
-1 sprites/canal_locks.png 82 328 09 62 64 -1 -43 -1 sprites/canals.png 242 328 09 62 66 -61 -43
-1 sprites/canal_locks.png 162 328 09 60 64 -61 -43 -1 sprites/canals.png 322 328 09 60 64 -1 -43
-1 sprites/canal_locks.png 242 328 09 62 66 -61 -43 -1 sprites/canals.png 402 328 09 59 64 -31 -28
-1 sprites/canal_locks.png 322 328 09 60 64 -1 -43 -1 sprites/canals.png 482 328 09 59 64 -31 -28
-1 sprites/canal_locks.png 402 328 09 59 64 -31 -28 -1 sprites/canals.png 562 328 09 59 64 -31 -28
-1 sprites/canal_locks.png 482 328 09 59 64 -31 -28 -1 sprites/canals.png 642 328 09 59 64 -31 -28
-1 sprites/canal_locks.png 562 328 09 59 64 -31 -28 -1 sprites/canals.png 722 328 09 60 64 -1 -43
-1 sprites/canal_locks.png 642 328 09 59 64 -31 -28 -1 sprites/canals.png 2 408 09 62 68 -61 -43
-1 sprites/canal_locks.png 722 328 09 60 64 -1 -43 -1 sprites/canals.png 82 408 09 60 64 -61 -43
-1 sprites/canal_locks.png 2 408 09 62 68 -61 -43 -1 sprites/canals.png 162 408 09 62 64 -1 -43
-1 sprites/canal_locks.png 82 408 09 60 64 -61 -43 -1 sprites/canals.png 242 408 09 37 70 -31 -6
-1 sprites/canal_locks.png 162 408 09 62 64 -1 -43 -1 sprites/canals.png 322 408 09 37 70 -31 0
// Canal edges (temperate) -1 sprites/canals.png 402 408 09 37 70 -37 0
-1 sprites/canals.png 30 10 09 22 45 -11 -1 -1 sprites/canals.png 482 408 09 37 70 -37 -6
-1 sprites/canals.png 94 10 09 21 41 -8 10 -1 sprites/canals.png 562 408 09 31 64 -31 0
-1 sprites/canals.png 142 10 09 21 42 -31 10 -1 sprites/canals.png 642 408 09 31 64 -31 0
-1 sprites/canals.png 190 10 09 22 43 -31 -1 -1 sprites/canals.png 722 408 09 31 64 -31 0
-1 sprites/canals.png 238 10 09 22 22 11 4 -1 sprites/canals.png 2 488 09 37 64 -31 -6
-1 sprites/canals.png 270 10 09 16 24 -11 15 -1 sprites/canals.png 82 488 09 31 64 -31 0
-1 sprites/canals.png 302 10 09 23 23 -31 4 -1 sprites/canals.png 162 488 09 31 64 -31 0
-1 sprites/canals.png 334 10 09 18 24 -11 -1 -1 sprites/canals.png 242 488 09 31 64 -31 0
-1 sprites/canals.png 366 10 09 11 12 21 10 -1 sprites/canals.png 322 488 09 37 64 -31 -6
-1 sprites/canals.png 398 10 09 10 19 -8 21 -1 sprites/canals.png 402 488 09 20 20 0 0
-1 sprites/canals.png 430 10 09 10 11 -31 10
-1 sprites/canals.png 446 10 09 16 24 -11 -6
// Canal icon
-1 sprites/canal_locks.png 242 408 09 20 20 0 0
// Differentiation for the climates starts here
// Canal edges (arctic snowy)
-1 * 4 01 05 01 \b12
-1 sprites/canals.png 30 40 09 22 45 -11 -1
-1 sprites/canals.png 94 40 09 21 41 -8 10
-1 sprites/canals.png 142 40 09 21 42 -31 10
-1 sprites/canals.png 190 40 09 22 43 -31 -1
-1 sprites/canals.png 238 40 09 22 22 11 4
-1 sprites/canals.png 270 40 09 16 24 -11 15
-1 sprites/canals.png 302 40 09 23 23 -31 4
-1 sprites/canals.png 334 40 09 18 24 -11 -1
-1 sprites/canals.png 366 40 09 11 12 21 10
-1 sprites/canals.png 398 40 09 10 19 -8 21
-1 sprites/canals.png 430 40 09 10 11 -31 10
-1 sprites/canals.png 446 40 09 16 24 -11 -6
-1 * 7 02 05 10 01 00 00 00
// Canal edges (arctic normal)
-1 * 4 01 05 01 \b12
-1 sprites/canals.png 30 70 09 22 45 -11 -1
-1 sprites/canals.png 94 70 09 21 41 -8 10
-1 sprites/canals.png 142 70 09 21 42 -31 10
-1 sprites/canals.png 190 70 09 22 43 -31 -1
-1 sprites/canals.png 238 70 09 22 22 11 4
-1 sprites/canals.png 270 70 09 16 24 -11 15
-1 sprites/canals.png 302 70 09 23 23 -31 4
-1 sprites/canals.png 334 70 09 18 24 -11 -1
-1 sprites/canals.png 366 70 09 11 12 21 10
-1 sprites/canals.png 398 70 09 10 19 -8 21
-1 sprites/canals.png 430 70 09 10 11 -31 10
-1 sprites/canals.png 446 70 09 16 24 -11 -6
-1 * 7 02 05 11 01 00 00 00
// Choose the right arctic canal edges
-1 * 14 02 05 12 81 81 00 FF 01 10 00 04 04 11 00
-1 * 6 07 83 01 \7! 01 01
-1 * 7 03 05 01 02 00 12 00
// Canal edges (tropic desert)
-1 * 4 01 05 01 \b12
-1 sprites/canals.png 30 100 09 22 45 -11 -1
-1 sprites/canals.png 94 100 09 21 41 -8 10
-1 sprites/canals.png 142 100 09 21 42 -31 10
-1 sprites/canals.png 190 100 09 22 43 -31 -1
-1 sprites/canals.png 238 100 09 22 22 11 4
-1 sprites/canals.png 270 100 09 16 24 -11 15
-1 sprites/canals.png 302 100 09 23 23 -31 4
-1 sprites/canals.png 334 100 09 18 24 -11 -1
-1 sprites/canals.png 366 100 09 11 12 21 10
-1 sprites/canals.png 398 100 09 10 19 -8 21
-1 sprites/canals.png 430 100 09 10 11 -31 10
-1 sprites/canals.png 446 100 09 16 24 -11 -6
-1 * 7 02 05 13 01 00 00 00
// Canal edges (tropic rainforest)
-1 * 4 01 05 01 \b12
-1 sprites/canals.png 30 130 09 22 45 -11 -1
-1 sprites/canals.png 94 130 09 21 41 -8 10
-1 sprites/canals.png 142 130 09 21 42 -31 10
-1 sprites/canals.png 190 130 09 22 43 -31 -1
-1 sprites/canals.png 238 130 09 22 22 11 4
-1 sprites/canals.png 270 130 09 16 24 -11 15
-1 sprites/canals.png 302 130 09 23 23 -31 4
-1 sprites/canals.png 334 130 09 18 24 -11 -1
-1 sprites/canals.png 366 130 09 11 12 21 10
-1 sprites/canals.png 398 130 09 10 19 -8 21
-1 sprites/canals.png 430 130 09 10 11 -31 10
-1 sprites/canals.png 446 130 09 16 24 -11 -6
-1 * 7 02 05 14 01 00 00 00
// Choose the right tropic canal edges
-1 * 14 02 05 15 81 81 00 FF 01 13 00 01 01 14 00
-1 * 6 07 83 01 \7! 02 01
-1 * 7 03 05 01 02 00 15 00
// Canal edges (toyland)
-1 * 4 01 05 01 \b12
-1 sprites/canals.png 30 160 09 22 45 -11 -1
-1 sprites/canals.png 94 160 09 21 41 -8 10
-1 sprites/canals.png 142 160 09 21 42 -31 10
-1 sprites/canals.png 190 160 09 22 43 -31 -1
-1 sprites/canals.png 238 160 09 22 22 11 4
-1 sprites/canals.png 270 160 09 16 24 -11 15
-1 sprites/canals.png 302 160 09 23 23 -31 4
-1 sprites/canals.png 334 160 09 18 24 -11 -1
-1 sprites/canals.png 366 160 09 11 12 21 10
-1 sprites/canals.png 398 160 09 10 19 -8 21
-1 sprites/canals.png 430 160 09 10 11 -31 10
-1 sprites/canals.png 446 160 09 16 24 -11 -6
-1 * 7 02 05 16 01 00 00 00
-1 * 6 07 83 01 \7! 03 01
-1 * 7 03 05 01 02 00 16 00

Binary file not shown.

Before

Width:  |  Height:  |  Size: 6.1 KiB

After

Width:  |  Height:  |  Size: 22 KiB

View File

@@ -6,8 +6,8 @@
// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. // OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>. // See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
// //
-1 * 0 0C "Fixing (alignment) bugs in the original graphics. By Addi and PaulC." -1 * 0 0C "Fixing (alignment) bugs in the orignal graphics. By Addi."
-1 * 6 07 83 01 \7= 03 7D -1 * 6 07 83 01 \7= 03 69
// Different graphics for same wood truck // Different graphics for same wood truck
-1 * 14 0A 04 01 87 0C 01 89 0C 01 07 0E 01 09 0E -1 * 14 0A 04 01 87 0C 01 89 0C 01 07 0E 01 09 0E
-1 sprites/fix_graphics.png 82 8 09 16 22 -6 -7 -1 sprites/fix_graphics.png 82 8 09 16 22 -6 -7
@@ -79,11 +79,6 @@
-1 sprites/fix_graphics.png 370 72 09 35 48 -23 -7 -1 sprites/fix_graphics.png 370 72 09 35 48 -23 -7
-1 sprites/fix_graphics.png 434 72 09 35 48 -23 -7 -1 sprites/fix_graphics.png 434 72 09 35 48 -23 -7
-1 sprites/fix_graphics.png 498 72 09 21 49 -24 3 -1 sprites/fix_graphics.png 498 72 09 21 49 -24 3
// Misaligned maglev bridge heads
-1 * 8 0A 02 01 12 11 02 14 11
-1 sprites/fix_graphics.png 322 486 09 35 48 -23 -7
-1 sprites/fix_graphics.png 386 486 09 35 48 -23 -7
-1 sprites/fix_graphics.png 450 486 09 21 49 -24 3
// Improperly cut cinema // Improperly cut cinema
-1 * 5 0A 01 02 34 11 -1 * 5 0A 01 02 34 11
-1 sprites/fix_graphics.png 578 72 09 31 64 -31 0 -1 sprites/fix_graphics.png 578 72 09 31 64 -31 0
@@ -203,132 +198,3 @@
// GUI sprite // GUI sprite
-1 * 5 0A 01 01 \w2600 -1 * 5 0A 01 01 \w2600
-1 sprites/fix_graphics.png 433 298 09 15 40 0 5 -1 sprites/fix_graphics.png 433 298 09 15 40 0 5
// Make level crossings in tropical climate look normal
-1 * 6 07 83 01 \7! 02 19
-1 * 14 0A 04 04 5A 05 08 62 05 08 6E 05 04 7A 05
-1 sprites/fix_graphics.png 2 390 09 31 64 -31 0
-1 sprites/fix_graphics.png 82 390 09 31 64 -31 0
-1 sprites/fix_graphics.png 162 390 09 31 64 -31 0
-1 sprites/fix_graphics.png 242 390 09 31 64 -31 0
-1 sprites/fix_graphics.png 322 390 09 31 64 -31 0
-1 sprites/fix_graphics.png 402 390 09 31 64 -31 0
-1 sprites/fix_graphics.png 482 390 09 31 64 -31 0
-1 sprites/fix_graphics.png 562 390 09 31 64 -31 0
-1 sprites/fix_graphics.png 642 390 09 31 64 -31 0
-1 sprites/fix_graphics.png 722 390 09 31 64 -31 0
-1 sprites/fix_graphics.png 2 438 09 31 64 -31 0
-1 sprites/fix_graphics.png 82 438 09 31 64 -31 0
-1 sprites/fix_graphics.png 162 438 09 31 64 -31 0
-1 sprites/fix_graphics.png 242 438 09 31 64 -31 0
-1 sprites/fix_graphics.png 322 438 09 31 64 -31 0
-1 sprites/fix_graphics.png 402 438 09 31 64 -31 0
-1 sprites/fix_graphics.png 482 438 09 31 64 -31 0
-1 sprites/fix_graphics.png 562 438 09 31 64 -31 0
-1 sprites/fix_graphics.png 642 438 09 31 64 -31 0
-1 sprites/fix_graphics.png 722 438 09 31 64 -31 0
-1 sprites/fix_graphics.png 2 486 09 31 64 -31 0
-1 sprites/fix_graphics.png 82 486 09 31 64 -31 0
-1 sprites/fix_graphics.png 162 486 09 31 64 -31 0
-1 sprites/fix_graphics.png 242 486 09 31 64 -31 0
// Fix transparency of steel mill
-1 * 6 07 83 01 \7! 00 0A
-1 * 5 0A 01 04 4D 08
-1 sprites/fix_graphics.png 610 486 09 31 64 -31 0
-1 sprites/fix_graphics.png 690 486 09 61 59 -31 -33
-1 sprites/fix_graphics.png 2 566 09 31 64 -31 0
-1 sprites/fix_graphics.png 82 566 09 50 51 -25 -21
-1 * 5 0A 01 04 58 08
-1 sprites/fix_graphics.png 162 566 09 31 64 -31 0
-1 sprites/fix_graphics.png 242 566 09 52 59 -31 -24
-1 sprites/fix_graphics.png 306 566 09 31 64 -31 0
-1 sprites/fix_graphics.png 386 566 09 44 51 -25 -15
// Fix transparency of oil well
-1 * 6 07 83 01 \7= 03 10
-1 * 5 0A 01 06 7E 08
-1 sprites/fix_graphics.png 482 566 09 50 31 -11 -28
-1 sprites/fix_graphics.png 530 566 09 47 31 -11 -25
-1 sprites/fix_graphics.png 578 566 09 47 31 -11 -25
-1 sprites/fix_graphics.png 626 566 09 47 31 -11 -25
-1 sprites/fix_graphics.png 674 566 09 49 31 -11 -27
-1 sprites/fix_graphics.png 722 566 09 52 31 -11 -30
-1 * 6 07 83 01 \7! 00 02
-1 * 5 0A 01 01 7D 08
-1 sprites/fix_graphics.png 2 630 09 31 64 -31 0
-1 * 6 07 83 01 \7! 01 02
-1 * 5 0A 01 01 7D 08
-1 sprites/fix_graphics.png 114 630 09 31 64 -31 0
-1 * 6 07 83 01 \7! 02 02
-1 * 5 0A 01 01 7D 08
-1 sprites/fix_graphics.png 226 630 09 31 64 -31 0
-1 * 6 07 83 01 \7! 03 0F
-1 * 5 0A 01 06 91 04
// Fix toyland overlay for PBS on maglev
-1 sprites/fix_graphics.png 338 630 09 16 30 -14 8
-1 sprites/fix_graphics.png 386 630 09 16 30 -14 8
-1 sprites/fix_graphics.png 434 630 01 7 40 -19 4
-1 sprites/fix_graphics.png 482 630 01 7 40 -19 20
-1 sprites/fix_graphics.png 530 630 01 19 12 11 6
-1 sprites/fix_graphics.png 562 630 01 19 12 -21 6
// Fix toyland monorail bridge alignment
-1 * 8 0A 02 01 EA 10 02 EC 10
-1 sprites/fix_graphics.png 610 630 09 35 48 -23 -7
-1 sprites/fix_graphics.png 674 630 09 35 48 -23 -7
-1 sprites/fix_graphics.png 738 630 09 21 49 -24 3
// Fix toyland maglev bridge alignment
-1 * 8 0A 02 01 12 11 02 14 11
-1 sprites/fix_graphics.png 18 678 09 35 48 -23 -7
-1 sprites/fix_graphics.png 82 678 09 35 48 -23 -7
-1 sprites/fix_graphics.png 146 678 09 21 49 -24 3
// Fix city airport's grass for temperate
-1 * 6 07 83 01 \7! 00 0A
-1 * 5 0A 01 09 4C 0A
-1 sprites/fix_graphics.png 242 678 09 31 64 -31 0
-1 sprites/fix_graphics.png 322 678 09 31 64 -31 0
-1 sprites/fix_graphics.png 402 678 09 31 64 -31 0
-1 sprites/fix_graphics.png 482 678 09 31 64 -31 0
-1 sprites/fix_graphics.png 562 678 09 31 64 -31 0
-1 sprites/fix_graphics.png 642 678 09 31 64 -31 0
-1 sprites/fix_graphics.png 722 678 09 31 64 -31 0
-1 sprites/fix_graphics.png 2 726 09 31 64 -31 0
-1 sprites/fix_graphics.png 82 726 09 31 64 -31 0
// Fix city airport's grass for arctic
-1 * 6 07 83 01 \7! 01 0A
-1 * 5 0A 01 09 4C 0A
-1 sprites/fix_graphics.png 194 726 09 31 64 -31 0
-1 sprites/fix_graphics.png 274 726 09 31 64 -31 0
-1 sprites/fix_graphics.png 354 726 09 31 64 -31 0
-1 sprites/fix_graphics.png 434 726 09 31 64 -31 0
-1 sprites/fix_graphics.png 514 726 09 31 64 -31 0
-1 sprites/fix_graphics.png 594 726 09 31 64 -31 0
-1 sprites/fix_graphics.png 674 726 09 31 64 -31 0
-1 sprites/fix_graphics.png 2 774 09 31 64 -31 0
-1 sprites/fix_graphics.png 82 774 09 31 64 -31 0
// Fix city airport's grass for tropical
-1 * 6 07 83 01 \7! 02 0A
-1 * 5 0A 01 09 4C 0A
-1 sprites/fix_graphics.png 194 774 09 31 64 -31 0
-1 sprites/fix_graphics.png 274 774 09 31 64 -31 0
-1 sprites/fix_graphics.png 354 774 09 31 64 -31 0
-1 sprites/fix_graphics.png 434 774 09 31 64 -31 0
-1 sprites/fix_graphics.png 514 774 09 31 64 -31 0
-1 sprites/fix_graphics.png 594 774 09 31 64 -31 0
-1 sprites/fix_graphics.png 674 774 09 31 64 -31 0
-1 sprites/fix_graphics.png 2 822 09 31 64 -31 0
-1 sprites/fix_graphics.png 82 822 09 31 64 -31 0
// Fix city airport's grass for toyland
-1 * 6 07 83 01 \7! 03 0A
-1 * 5 0A 01 09 4C 0A
-1 sprites/fix_graphics.png 194 822 09 31 64 -31 0
-1 sprites/fix_graphics.png 274 822 09 31 64 -31 0
-1 sprites/fix_graphics.png 354 822 09 31 64 -31 0
-1 sprites/fix_graphics.png 434 822 09 31 64 -31 0
-1 sprites/fix_graphics.png 514 822 09 31 64 -31 0
-1 sprites/fix_graphics.png 594 822 09 31 64 -31 0
-1 sprites/fix_graphics.png 674 822 09 31 64 -31 0
-1 sprites/fix_graphics.png 2 870 09 31 64 -31 0
-1 sprites/fix_graphics.png 82 870 09 31 64 -31 0
// Fix buoy in-game; don't show black outline
-1 * 4 01 05 01 \b1
-1 sprites/fix_graphics.png 575 490 09 11 7 7 4
-1 * 7 02 05 17 01 00 00 00
-1 * 7 03 05 01 08 00 17 00

Binary file not shown.

Before

Width:  |  Height:  |  Size: 63 KiB

After

Width:  |  Height:  |  Size: 29 KiB

View File

@@ -80,7 +80,6 @@
"David Dallaston: tram tracks" 0D "David Dallaston: tram tracks" 0D
"Jonathan G. Rennison: aqueducts" 0D "Jonathan G. Rennison: aqueducts" 0D
"Bilbo, Jasper Vries: font" 0D "Bilbo, Jasper Vries: font" 0D
"Andrew Parkhouse: rivers" 0D
"OpenTTD developers: other graphics" 00 "OpenTTD developers: other graphics" 00
// //
@@ -105,8 +104,3 @@
#include "chars.nfo" #include "chars.nfo"
#include "overrides.nfo" #include "overrides.nfo"
#include "fix_graphics.nfo" #include "fix_graphics.nfo"
#include "rivers/rapids.nfo"
#include "rivers/temperate.nfo"
#include "rivers/arctic.nfo"
#include "rivers/tropic.nfo"
#include "rivers/toyland.nfo"

View File

@@ -1,282 +0,0 @@
//
// $Id$
//
// This file is part of OpenTTD.
// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
//
-1 * 0 0C "Arctic river graphics by andythenorth (Andrew Parkhouse)"
-1 * 4 01 05 01 3C
-1 sprites/arctic_snowy.png 10 10 09 19 38 -5 0
-1 sprites/arctic_snowy.png 58 10 09 18 38 -5 13
-1 sprites/arctic_snowy.png 106 10 09 18 38 -31 13
-1 sprites/arctic_snowy.png 154 10 09 19 38 -31 0
-1 sprites/arctic_snowy.png 202 10 09 9 19 14 11
-1 sprites/arctic_snowy.png 234 10 09 9 16 -7 22
-1 sprites/arctic_snowy.png 266 10 09 9 19 -31 11
-1 sprites/arctic_snowy.png 298 10 09 9 16 -7 0
-1 sprites/arctic_snowy.png 330 10 09 6 8 25 13
-1 sprites/arctic_snowy.png 346 10 09 4 12 -5 27
-1 sprites/arctic_snowy.png 364 10 09 6 8 -31 13
-1 sprites/arctic_snowy.png 380 10 09 5 12 -5 0
-1 sprites/arctic_snowy.png 10 40 09 11 40 -7 0
-1 sprites/arctic_snowy.png 58 40 09 18 39 -6 5
-1 sprites/arctic_snowy.png 106 40 09 11 38 -31 12
-1 sprites/arctic_snowy.png 154 40 09 18 39 -31 0
-1 sprites/arctic_snowy.png 202 40 09 6 20 13 5
-1 sprites/arctic_snowy.png 234 40 09 7 13 -6 16
-1 sprites/arctic_snowy.png 266 40 09 6 20 -31 12
-1 sprites/arctic_snowy.png 298 40 09 7 13 -5 0
-1 sprites/arctic_snowy.png 330 40 09 5 8 25 6
-1 sprites/arctic_snowy.png 346 40 09 3 12 -5 20
-1 sprites/arctic_snowy.png 364 40 09 4 8 -31 13
-1 sprites/arctic_snowy.png 380 40 09 4 15 -7 0
-1 sprites/arctic_snowy.png 10 70 09 20 38 -5 -8
-1 sprites/arctic_snowy.png 58 70 09 26 38 -5 5
-1 sprites/arctic_snowy.png 106 70 09 20 37 -31 11
-1 sprites/arctic_snowy.png 154 70 09 27 38 -31 -8
-1 sprites/arctic_snowy.png 202 70 09 9 16 17 3
-1 sprites/arctic_snowy.png 234 70 09 9 15 -7 22
-1 sprites/arctic_snowy.png 266 70 09 9 16 -31 11
-1 sprites/arctic_snowy.png 298 70 09 9 15 -6 -8
-1 sprites/arctic_snowy.png 330 70 09 7 8 25 5
-1 sprites/arctic_snowy.png 346 70 09 5 10 -4 27
-1 sprites/arctic_snowy.png 364 70 09 7 8 -31 11
-1 sprites/arctic_snowy.png 380 70 09 6 12 -5 -8
-1 sprites/arctic_snowy.png 10 100 09 18 39 -6 0
-1 sprites/arctic_snowy.png 58 100 09 11 38 -5 12
-1 sprites/arctic_snowy.png 106 100 09 18 39 -31 5
-1 sprites/arctic_snowy.png 154 100 09 11 40 -32 0
-1 sprites/arctic_snowy.png 202 100 09 6 20 13 12
-1 sprites/arctic_snowy.png 234 100 09 7 13 -5 16
-1 sprites/arctic_snowy.png 266 100 09 6 20 -31 5
-1 sprites/arctic_snowy.png 298 100 09 7 13 -6 0
-1 sprites/arctic_snowy.png 330 100 09 4 8 26 13
-1 sprites/arctic_snowy.png 346 100 09 3 12 -5 20
-1 sprites/arctic_snowy.png 364 100 09 5 8 -31 6
-1 sprites/arctic_snowy.png 380 100 09 4 15 -6 0
-1 sprites/arctic_snowy.png 10 130 09 27 38 -5 -8
-1 sprites/arctic_snowy.png 58 130 09 20 37 -4 11
-1 sprites/arctic_snowy.png 106 130 09 26 37 -31 5
-1 sprites/arctic_snowy.png 154 130 09 20 38 -31 -8
-1 sprites/arctic_snowy.png 202 130 09 9 16 17 11
-1 sprites/arctic_snowy.png 234 130 09 9 15 -6 22
-1 sprites/arctic_snowy.png 266 130 09 9 16 -31 3
-1 sprites/arctic_snowy.png 298 130 09 9 15 -7 -8
-1 sprites/arctic_snowy.png 330 130 09 7 8 25 11
-1 sprites/arctic_snowy.png 346 130 09 5 10 -4 26
-1 sprites/arctic_snowy.png 364 130 09 7 8 -31 5
-1 sprites/arctic_snowy.png 380 130 09 6 12 -5 -8
-1 * 7 02 05 30 01 00 00 00
-1 * 4 01 05 01 3C
-1 sprites/arctic_brown.png 10 10 09 19 38 -5 0
-1 sprites/arctic_brown.png 58 10 09 18 38 -5 13
-1 sprites/arctic_brown.png 106 10 09 18 38 -31 13
-1 sprites/arctic_brown.png 154 10 09 19 38 -31 0
-1 sprites/arctic_brown.png 202 10 09 9 19 14 11
-1 sprites/arctic_brown.png 234 10 09 9 16 -7 22
-1 sprites/arctic_brown.png 266 10 09 9 19 -31 11
-1 sprites/arctic_brown.png 298 10 09 9 16 -7 0
-1 sprites/arctic_brown.png 330 10 09 6 8 25 13
-1 sprites/arctic_brown.png 346 10 09 4 12 -5 27
-1 sprites/arctic_brown.png 364 10 09 6 8 -31 13
-1 sprites/arctic_brown.png 380 10 09 5 12 -5 0
-1 sprites/arctic_brown.png 10 40 09 11 40 -7 0
-1 sprites/arctic_brown.png 58 40 09 18 39 -6 5
-1 sprites/arctic_brown.png 106 40 09 11 38 -31 12
-1 sprites/arctic_brown.png 154 40 09 18 39 -31 0
-1 sprites/arctic_brown.png 202 40 09 6 20 13 5
-1 sprites/arctic_brown.png 234 40 09 7 13 -6 16
-1 sprites/arctic_brown.png 266 40 09 6 20 -31 12
-1 sprites/arctic_brown.png 298 40 09 7 13 -5 0
-1 sprites/arctic_brown.png 330 40 09 5 8 25 6
-1 sprites/arctic_brown.png 346 40 09 3 12 -5 20
-1 sprites/arctic_brown.png 364 40 09 4 8 -31 13
-1 sprites/arctic_brown.png 380 40 09 4 15 -7 0
-1 sprites/arctic_brown.png 10 70 09 20 38 -5 -8
-1 sprites/arctic_brown.png 58 70 09 26 38 -5 5
-1 sprites/arctic_brown.png 106 70 09 20 37 -31 11
-1 sprites/arctic_brown.png 154 70 09 27 38 -31 -8
-1 sprites/arctic_brown.png 202 70 09 9 16 17 3
-1 sprites/arctic_brown.png 234 70 09 9 15 -7 22
-1 sprites/arctic_brown.png 266 70 09 9 16 -31 11
-1 sprites/arctic_brown.png 298 70 09 9 15 -6 -8
-1 sprites/arctic_brown.png 330 70 09 7 8 25 5
-1 sprites/arctic_brown.png 346 70 09 5 10 -4 27
-1 sprites/arctic_brown.png 364 70 09 7 8 -31 11
-1 sprites/arctic_brown.png 380 70 09 6 12 -5 -8
-1 sprites/arctic_brown.png 10 100 09 18 39 -6 0
-1 sprites/arctic_brown.png 58 100 09 11 38 -5 12
-1 sprites/arctic_brown.png 106 100 09 18 39 -31 5
-1 sprites/arctic_brown.png 154 100 09 11 40 -32 0
-1 sprites/arctic_brown.png 202 100 09 6 20 13 12
-1 sprites/arctic_brown.png 234 100 09 7 13 -5 16
-1 sprites/arctic_brown.png 266 100 09 6 20 -31 5
-1 sprites/arctic_brown.png 298 100 09 7 13 -6 0
-1 sprites/arctic_brown.png 330 100 09 4 8 26 13
-1 sprites/arctic_brown.png 346 100 09 3 12 -5 20
-1 sprites/arctic_brown.png 364 100 09 5 8 -31 6
-1 sprites/arctic_brown.png 380 100 09 4 15 -6 0
-1 sprites/arctic_brown.png 10 130 09 27 38 -5 -8
-1 sprites/arctic_brown.png 58 130 09 20 37 -4 11
-1 sprites/arctic_brown.png 106 130 09 26 37 -31 5
-1 sprites/arctic_brown.png 154 130 09 20 38 -31 -8
-1 sprites/arctic_brown.png 202 130 09 9 16 17 11
-1 sprites/arctic_brown.png 234 130 09 9 15 -6 22
-1 sprites/arctic_brown.png 266 130 09 9 16 -31 3
-1 sprites/arctic_brown.png 298 130 09 9 15 -7 -8
-1 sprites/arctic_brown.png 330 130 09 7 8 25 11
-1 sprites/arctic_brown.png 346 130 09 5 10 -4 26
-1 sprites/arctic_brown.png 364 130 09 7 8 -31 5
-1 sprites/arctic_brown.png 380 130 09 6 12 -5 -8
-1 * 7 02 05 31 01 00 00 00
-1 * 4 01 05 01 3C
-1 sprites/arctic_snowy.png 10 210 09 19 38 -5 0
-1 sprites/arctic_snowy.png 58 210 09 18 38 -5 13
-1 sprites/arctic_snowy.png 106 210 09 18 38 -31 13
-1 sprites/arctic_snowy.png 154 210 09 19 38 -31 0
-1 sprites/arctic_snowy.png 202 210 09 9 19 14 11
-1 sprites/arctic_snowy.png 234 210 09 9 16 -7 22
-1 sprites/arctic_snowy.png 266 210 09 9 19 -31 11
-1 sprites/arctic_snowy.png 298 210 09 9 16 -7 0
-1 sprites/arctic_snowy.png 330 210 09 6 8 25 13
-1 sprites/arctic_snowy.png 346 210 09 4 12 -5 27
-1 sprites/arctic_snowy.png 364 210 09 6 8 -31 13
-1 sprites/arctic_snowy.png 380 210 09 5 12 -5 0
-1 sprites/arctic_snowy.png 10 240 09 11 40 -7 0
-1 sprites/arctic_snowy.png 58 240 09 18 39 -6 5
-1 sprites/arctic_snowy.png 106 240 09 11 38 -31 12
-1 sprites/arctic_snowy.png 154 240 09 18 39 -31 0
-1 sprites/arctic_snowy.png 202 240 09 6 20 13 5
-1 sprites/arctic_snowy.png 234 240 09 7 13 -6 16
-1 sprites/arctic_snowy.png 266 240 09 6 20 -31 12
-1 sprites/arctic_snowy.png 298 240 09 7 13 -5 0
-1 sprites/arctic_snowy.png 330 240 09 5 8 25 6
-1 sprites/arctic_snowy.png 346 240 09 3 12 -5 20
-1 sprites/arctic_snowy.png 364 240 09 4 8 -31 13
-1 sprites/arctic_snowy.png 380 240 09 4 15 -7 0
-1 sprites/arctic_snowy.png 10 270 09 20 38 -5 -8
-1 sprites/arctic_snowy.png 58 270 09 26 38 -5 5
-1 sprites/arctic_snowy.png 106 270 09 20 37 -31 11
-1 sprites/arctic_snowy.png 154 270 09 27 38 -31 -8
-1 sprites/arctic_snowy.png 202 270 09 9 16 17 3
-1 sprites/arctic_snowy.png 234 270 09 9 15 -7 22
-1 sprites/arctic_snowy.png 266 270 09 9 16 -31 11
-1 sprites/arctic_snowy.png 298 270 09 9 15 -6 -8
-1 sprites/arctic_snowy.png 330 270 09 7 8 25 5
-1 sprites/arctic_snowy.png 346 270 09 5 10 -4 27
-1 sprites/arctic_snowy.png 364 270 09 7 8 -31 11
-1 sprites/arctic_snowy.png 380 270 09 6 12 -5 -8
-1 sprites/arctic_snowy.png 10 300 09 18 39 -6 0
-1 sprites/arctic_snowy.png 58 300 09 11 38 -5 12
-1 sprites/arctic_snowy.png 106 300 09 18 39 -31 5
-1 sprites/arctic_snowy.png 154 300 09 11 40 -32 0
-1 sprites/arctic_snowy.png 202 300 09 6 20 13 12
-1 sprites/arctic_snowy.png 234 300 09 7 13 -5 16
-1 sprites/arctic_snowy.png 266 300 09 6 20 -31 5
-1 sprites/arctic_snowy.png 298 300 09 7 13 -6 0
-1 sprites/arctic_snowy.png 330 300 09 4 8 26 13
-1 sprites/arctic_snowy.png 346 300 09 3 12 -5 20
-1 sprites/arctic_snowy.png 364 300 09 5 8 -31 6
-1 sprites/arctic_snowy.png 380 300 09 4 15 -6 0
-1 sprites/arctic_snowy.png 10 330 09 27 38 -5 -8
-1 sprites/arctic_snowy.png 58 330 09 20 37 -4 11
-1 sprites/arctic_snowy.png 106 330 09 26 37 -31 5
-1 sprites/arctic_snowy.png 154 330 09 20 38 -31 -8
-1 sprites/arctic_snowy.png 202 330 09 9 16 17 11
-1 sprites/arctic_snowy.png 234 330 09 9 15 -6 22
-1 sprites/arctic_snowy.png 266 330 09 9 16 -31 3
-1 sprites/arctic_snowy.png 298 330 09 9 15 -7 -8
-1 sprites/arctic_snowy.png 330 330 09 7 8 25 11
-1 sprites/arctic_snowy.png 346 330 09 5 10 -4 26
-1 sprites/arctic_snowy.png 364 330 09 7 8 -31 5
-1 sprites/arctic_snowy.png 380 330 09 6 12 -5 -8
-1 * 7 02 05 32 01 00 00 00
-1 * 4 01 05 01 3C
-1 sprites/arctic_brown.png 10 210 09 19 38 -5 0
-1 sprites/arctic_brown.png 58 210 09 18 38 -5 13
-1 sprites/arctic_brown.png 106 210 09 18 38 -31 13
-1 sprites/arctic_brown.png 154 210 09 19 38 -31 0
-1 sprites/arctic_brown.png 202 210 09 9 19 14 11
-1 sprites/arctic_brown.png 234 210 09 9 16 -7 22
-1 sprites/arctic_brown.png 266 210 09 9 19 -31 11
-1 sprites/arctic_brown.png 298 210 09 9 16 -7 0
-1 sprites/arctic_brown.png 330 210 09 6 8 25 13
-1 sprites/arctic_brown.png 346 210 09 4 12 -5 27
-1 sprites/arctic_brown.png 364 210 09 6 8 -31 13
-1 sprites/arctic_brown.png 380 210 09 5 12 -5 0
-1 sprites/arctic_brown.png 10 240 09 11 40 -7 0
-1 sprites/arctic_brown.png 58 240 09 18 39 -6 5
-1 sprites/arctic_brown.png 106 240 09 11 38 -31 12
-1 sprites/arctic_brown.png 154 240 09 18 39 -31 0
-1 sprites/arctic_brown.png 202 240 09 6 20 13 5
-1 sprites/arctic_brown.png 234 240 09 7 13 -6 16
-1 sprites/arctic_brown.png 266 240 09 6 20 -31 12
-1 sprites/arctic_brown.png 298 240 09 7 13 -5 0
-1 sprites/arctic_brown.png 330 240 09 5 8 25 6
-1 sprites/arctic_brown.png 346 240 09 3 12 -5 20
-1 sprites/arctic_brown.png 364 240 09 4 8 -31 13
-1 sprites/arctic_brown.png 380 240 09 4 15 -7 0
-1 sprites/arctic_brown.png 10 270 09 20 38 -5 -8
-1 sprites/arctic_brown.png 58 270 09 26 38 -5 5
-1 sprites/arctic_brown.png 106 270 09 20 37 -31 11
-1 sprites/arctic_brown.png 154 270 09 27 38 -31 -8
-1 sprites/arctic_brown.png 202 270 09 9 16 17 3
-1 sprites/arctic_brown.png 234 270 09 9 15 -7 22
-1 sprites/arctic_brown.png 266 270 09 9 16 -31 11
-1 sprites/arctic_brown.png 298 270 09 9 15 -6 -8
-1 sprites/arctic_brown.png 330 270 09 7 8 25 5
-1 sprites/arctic_brown.png 346 270 09 5 10 -4 27
-1 sprites/arctic_brown.png 364 270 09 7 8 -31 11
-1 sprites/arctic_brown.png 380 270 09 6 12 -5 -8
-1 sprites/arctic_brown.png 10 300 09 18 39 -6 0
-1 sprites/arctic_brown.png 58 300 09 11 38 -5 12
-1 sprites/arctic_brown.png 106 300 09 18 39 -31 5
-1 sprites/arctic_brown.png 154 300 09 11 40 -32 0
-1 sprites/arctic_brown.png 202 300 09 6 20 13 12
-1 sprites/arctic_brown.png 234 300 09 7 13 -5 16
-1 sprites/arctic_brown.png 266 300 09 6 20 -31 5
-1 sprites/arctic_brown.png 298 300 09 7 13 -6 0
-1 sprites/arctic_brown.png 330 300 09 4 8 26 13
-1 sprites/arctic_brown.png 346 300 09 3 12 -5 20
-1 sprites/arctic_brown.png 364 300 09 5 8 -31 6
-1 sprites/arctic_brown.png 380 300 09 4 15 -6 0
-1 sprites/arctic_brown.png 10 330 09 27 38 -5 -8
-1 sprites/arctic_brown.png 58 330 09 20 37 -4 11
-1 sprites/arctic_brown.png 106 330 09 26 37 -31 5
-1 sprites/arctic_brown.png 154 330 09 20 38 -31 -8
-1 sprites/arctic_brown.png 202 330 09 9 16 17 11
-1 sprites/arctic_brown.png 234 330 09 9 15 -6 22
-1 sprites/arctic_brown.png 266 330 09 9 16 -31 3
-1 sprites/arctic_brown.png 298 330 09 9 15 -7 -8
-1 sprites/arctic_brown.png 330 330 09 7 8 25 11
-1 sprites/arctic_brown.png 346 330 09 5 10 -4 26
-1 sprites/arctic_brown.png 364 330 09 7 8 -31 5
-1 sprites/arctic_brown.png 380 330 09 6 12 -5 -8
-1 * 7 02 05 33 01 00 00 00
-1 * 14 02 05 34 81 81 00 FF 01 30 00 04 04 31 00
-1 * 14 02 05 35 81 81 00 FF 01 32 00 04 04 33 00
-1 * 14 02 05 36 81 80 00 FF 01 34 00 00 00 35 00
-1 * 6 07 83 01 \7! 01 01
-1 * 7 03 05 01 06 00 36 00

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

View File

@@ -1,139 +0,0 @@
//
// $Id$
//
// This file is part of OpenTTD.
// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
//
-1 * 0 0C "Rapid graphics"
-1 * 4 01 05 01 04
-1 sprites/rapids.png 10 10 09 23 64 -31 0
-1 sprites/rapids.png 90 10 09 39 64 -31 -8
-1 sprites/rapids.png 170 10 09 23 64 -31 0
-1 sprites/rapids.png 250 10 09 39 64 -31 -8
-1 * 7 02 05 00 01 00 00 00
-1 * 4 01 05 01 04
-1 sprites/rapids.png 10 60 09 23 64 -31 0
-1 sprites/rapids.png 90 60 09 39 64 -31 -8
-1 sprites/rapids.png 170 60 09 23 64 -31 0
-1 sprites/rapids.png 250 60 09 39 64 -31 -8
-1 * 7 02 05 01 01 00 00 00
-1 * 4 01 05 01 04
-1 sprites/rapids.png 10 110 09 23 64 -31 0
-1 sprites/rapids.png 90 110 09 39 64 -31 -8
-1 sprites/rapids.png 170 110 09 23 64 -31 0
-1 sprites/rapids.png 250 110 09 39 64 -31 -8
-1 * 7 02 05 02 01 00 00 00
-1 * 4 01 05 01 04
-1 sprites/rapids.png 10 160 09 23 64 -31 0
-1 sprites/rapids.png 90 160 09 39 64 -31 -8
-1 sprites/rapids.png 170 160 09 23 64 -31 0
-1 sprites/rapids.png 250 160 09 39 64 -31 -8
-1 * 7 02 05 03 01 00 00 00
-1 * 4 01 05 01 04
-1 sprites/rapids.png 10 210 09 23 64 -31 0
-1 sprites/rapids.png 90 210 09 39 64 -31 -8
-1 sprites/rapids.png 170 210 09 23 64 -31 0
-1 sprites/rapids.png 250 210 09 39 64 -31 -8
-1 * 7 02 05 04 01 00 00 00
-1 * 4 01 05 01 04
-1 sprites/rapids.png 10 260 09 23 64 -31 0
-1 sprites/rapids.png 90 260 09 39 64 -31 -8
-1 sprites/rapids.png 170 260 09 23 64 -31 0
-1 sprites/rapids.png 250 260 09 39 64 -31 -8
-1 * 7 02 05 05 01 00 00 00
-1 * 4 01 05 01 04
-1 sprites/rapids.png 10 310 09 23 64 -31 0
-1 sprites/rapids.png 90 310 09 39 64 -31 -8
-1 sprites/rapids.png 170 310 09 23 64 -31 0
-1 sprites/rapids.png 250 310 09 39 64 -31 -8
-1 * 7 02 05 06 01 00 00 00
-1 * 4 01 05 01 04
-1 sprites/rapids.png 10 360 09 23 64 -31 0
-1 sprites/rapids.png 90 360 09 39 64 -31 -8
-1 sprites/rapids.png 170 360 09 23 64 -31 0
-1 sprites/rapids.png 250 360 09 39 64 -31 -8
-1 * 7 02 05 07 01 00 00 00
-1 * 4 01 05 01 04
-1 sprites/rapids.png 10 410 09 23 64 -31 0
-1 sprites/rapids.png 90 410 09 39 64 -31 -8
-1 sprites/rapids.png 170 410 09 23 64 -31 0
-1 sprites/rapids.png 250 410 09 39 64 -31 -8
-1 * 7 02 05 08 01 00 00 00
-1 * 4 01 05 01 04
-1 sprites/rapids.png 10 460 09 23 64 -31 0
-1 sprites/rapids.png 90 460 09 39 64 -31 -8
-1 sprites/rapids.png 170 460 09 23 64 -31 0
-1 sprites/rapids.png 250 460 09 39 64 -31 -8
-1 * 7 02 05 09 01 00 00 00
-1 * 4 01 05 01 04
-1 sprites/rapids.png 10 510 09 23 64 -31 0
-1 sprites/rapids.png 90 510 09 39 64 -31 -8
-1 sprites/rapids.png 170 510 09 23 64 -31 0
-1 sprites/rapids.png 250 510 09 39 64 -31 -8
-1 * 7 02 05 0A 01 00 00 00
-1 * 4 01 05 01 04
-1 sprites/rapids.png 10 560 09 23 64 -31 0
-1 sprites/rapids.png 90 560 09 39 64 -31 -8
-1 sprites/rapids.png 170 560 09 23 64 -31 0
-1 sprites/rapids.png 250 560 09 39 64 -31 -8
-1 * 7 02 05 0B 01 00 00 00
-1 * 4 01 05 01 04
-1 sprites/rapids.png 10 610 09 23 64 -31 0
-1 sprites/rapids.png 90 610 09 39 64 -31 -8
-1 sprites/rapids.png 170 610 09 23 64 -31 0
-1 sprites/rapids.png 250 610 09 39 64 -31 -8
-1 * 7 02 05 0C 01 00 00 00
-1 * 4 01 05 01 04
-1 sprites/rapids.png 10 660 09 23 64 -31 0
-1 sprites/rapids.png 90 660 09 39 64 -31 -8
-1 sprites/rapids.png 170 660 09 23 64 -31 0
-1 sprites/rapids.png 250 660 09 39 64 -31 -8
-1 * 7 02 05 0D 01 00 00 00
-1 * 4 01 05 01 04
-1 sprites/rapids.png 10 710 09 23 64 -31 0
-1 sprites/rapids.png 90 710 09 39 64 -31 -8
-1 sprites/rapids.png 170 710 09 23 64 -31 0
-1 sprites/rapids.png 250 710 09 39 64 -31 -8
-1 * 7 02 05 0E 01 00 00 00
-1 * 4 01 05 01 04
-1 sprites/rapids.png 10 760 09 23 64 -31 0
-1 sprites/rapids.png 90 760 09 39 64 -31 -8
-1 sprites/rapids.png 170 760 09 23 64 -31 0
-1 sprites/rapids.png 250 760 09 39 64 -31 -8
-1 * 7 02 05 0F 01 00 00 00
-1 * 39 02 05 10 80 00 01 10
00 00
01 00
02 00
03 00
04 00
05 00
06 00
07 00
08 00
09 00
0A 00
0B 00
0C 00
0D 00
0E 00
0F 00
-1 * 7 03 05 01 05 00 10 00

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

View File

@@ -1,146 +0,0 @@
//
// $Id$
//
// This file is part of OpenTTD.
// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
//
-1 * 0 0C "Temperate river graphics by andythenorth (Andrew Parkhouse)"
-1 * 4 01 05 01 3C
-1 sprites/temperate.png 10 10 09 19 38 -5 0
-1 sprites/temperate.png 58 10 09 18 38 -5 13
-1 sprites/temperate.png 106 10 09 18 38 -31 13
-1 sprites/temperate.png 154 10 09 19 38 -31 0
-1 sprites/temperate.png 202 10 09 9 19 14 11
-1 sprites/temperate.png 234 10 09 9 16 -7 22
-1 sprites/temperate.png 266 10 09 9 19 -31 11
-1 sprites/temperate.png 298 10 09 9 16 -7 0
-1 sprites/temperate.png 330 10 09 6 8 25 13
-1 sprites/temperate.png 346 10 09 4 12 -5 27
-1 sprites/temperate.png 364 10 09 6 8 -31 13
-1 sprites/temperate.png 380 10 09 5 12 -5 0
-1 sprites/temperate.png 10 40 09 11 40 -7 0
-1 sprites/temperate.png 58 40 09 18 39 -6 5
-1 sprites/temperate.png 106 40 09 11 38 -31 12
-1 sprites/temperate.png 154 40 09 18 39 -31 0
-1 sprites/temperate.png 202 40 09 6 20 13 5
-1 sprites/temperate.png 234 40 09 7 13 -6 16
-1 sprites/temperate.png 266 40 09 6 20 -31 12
-1 sprites/temperate.png 298 40 09 7 13 -5 0
-1 sprites/temperate.png 330 40 09 5 8 25 6
-1 sprites/temperate.png 346 40 09 3 12 -5 20
-1 sprites/temperate.png 364 40 09 4 8 -31 13
-1 sprites/temperate.png 380 40 09 4 15 -7 0
-1 sprites/temperate.png 10 70 09 20 38 -5 -8
-1 sprites/temperate.png 58 70 09 26 38 -5 5
-1 sprites/temperate.png 106 70 09 20 37 -31 11
-1 sprites/temperate.png 154 70 09 27 38 -31 -8
-1 sprites/temperate.png 202 70 09 9 16 17 3
-1 sprites/temperate.png 234 70 09 9 15 -7 22
-1 sprites/temperate.png 266 70 09 9 16 -31 11
-1 sprites/temperate.png 298 70 09 9 15 -6 -8
-1 sprites/temperate.png 330 70 09 7 8 25 5
-1 sprites/temperate.png 346 70 09 5 10 -4 27
-1 sprites/temperate.png 364 70 09 7 8 -31 11
-1 sprites/temperate.png 380 70 09 6 12 -5 -8
-1 sprites/temperate.png 10 100 09 18 39 -6 0
-1 sprites/temperate.png 58 100 09 11 38 -5 12
-1 sprites/temperate.png 106 100 09 18 39 -31 5
-1 sprites/temperate.png 154 100 09 11 40 -32 0
-1 sprites/temperate.png 202 100 09 6 20 13 12
-1 sprites/temperate.png 234 100 09 7 13 -5 16
-1 sprites/temperate.png 266 100 09 6 20 -31 5
-1 sprites/temperate.png 298 100 09 7 13 -6 0
-1 sprites/temperate.png 330 100 09 4 8 26 13
-1 sprites/temperate.png 346 100 09 3 12 -5 20
-1 sprites/temperate.png 364 100 09 5 8 -31 6
-1 sprites/temperate.png 380 100 09 4 15 -6 0
-1 sprites/temperate.png 10 130 09 27 38 -5 -8
-1 sprites/temperate.png 58 130 09 20 37 -4 11
-1 sprites/temperate.png 106 130 09 26 37 -31 5
-1 sprites/temperate.png 154 130 09 20 38 -31 -8
-1 sprites/temperate.png 202 130 09 9 16 17 11
-1 sprites/temperate.png 234 130 09 9 15 -6 22
-1 sprites/temperate.png 266 130 09 9 16 -31 3
-1 sprites/temperate.png 298 130 09 9 15 -7 -8
-1 sprites/temperate.png 330 130 09 7 8 25 11
-1 sprites/temperate.png 346 130 09 5 10 -4 26
-1 sprites/temperate.png 364 130 09 7 8 -31 5
-1 sprites/temperate.png 380 130 09 6 12 -5 -8
-1 * 7 02 05 20 01 00 00 00
-1 * 4 01 05 01 3C
-1 sprites/temperate.png 10 210 09 19 38 -5 0
-1 sprites/temperate.png 58 210 09 18 38 -5 13
-1 sprites/temperate.png 106 210 09 18 38 -31 13
-1 sprites/temperate.png 154 210 09 19 38 -31 0
-1 sprites/temperate.png 202 210 09 9 19 14 11
-1 sprites/temperate.png 234 210 09 9 16 -7 22
-1 sprites/temperate.png 266 210 09 9 19 -31 11
-1 sprites/temperate.png 298 210 09 9 16 -7 0
-1 sprites/temperate.png 330 210 09 6 8 25 13
-1 sprites/temperate.png 346 210 09 4 12 -5 27
-1 sprites/temperate.png 364 210 09 6 8 -31 13
-1 sprites/temperate.png 380 210 09 5 12 -5 0
-1 sprites/temperate.png 10 240 09 11 40 -7 0
-1 sprites/temperate.png 58 240 09 18 39 -6 5
-1 sprites/temperate.png 106 240 09 11 38 -31 12
-1 sprites/temperate.png 154 240 09 18 39 -31 0
-1 sprites/temperate.png 202 240 09 6 20 13 5
-1 sprites/temperate.png 234 240 09 7 13 -6 16
-1 sprites/temperate.png 266 240 09 6 20 -31 12
-1 sprites/temperate.png 298 240 09 7 13 -5 0
-1 sprites/temperate.png 330 240 09 5 8 25 6
-1 sprites/temperate.png 346 240 09 3 12 -5 20
-1 sprites/temperate.png 364 240 09 4 8 -31 13
-1 sprites/temperate.png 380 240 09 4 15 -7 0
-1 sprites/temperate.png 10 270 09 20 38 -5 -8
-1 sprites/temperate.png 58 270 09 26 38 -5 5
-1 sprites/temperate.png 106 270 09 20 37 -31 11
-1 sprites/temperate.png 154 270 09 27 38 -31 -8
-1 sprites/temperate.png 202 270 09 9 16 17 3
-1 sprites/temperate.png 234 270 09 9 15 -7 22
-1 sprites/temperate.png 266 270 09 9 16 -31 11
-1 sprites/temperate.png 298 270 09 9 15 -6 -8
-1 sprites/temperate.png 330 270 09 7 8 25 5
-1 sprites/temperate.png 346 270 09 5 10 -4 27
-1 sprites/temperate.png 364 270 09 7 8 -31 11
-1 sprites/temperate.png 380 270 09 6 12 -5 -8
-1 sprites/temperate.png 10 300 09 18 39 -6 0
-1 sprites/temperate.png 58 300 09 11 38 -5 12
-1 sprites/temperate.png 106 300 09 18 39 -31 5
-1 sprites/temperate.png 154 300 09 11 40 -32 0
-1 sprites/temperate.png 202 300 09 6 20 13 12
-1 sprites/temperate.png 234 300 09 7 13 -5 16
-1 sprites/temperate.png 266 300 09 6 20 -31 5
-1 sprites/temperate.png 298 300 09 7 13 -6 0
-1 sprites/temperate.png 330 300 09 4 8 26 13
-1 sprites/temperate.png 346 300 09 3 12 -5 20
-1 sprites/temperate.png 364 300 09 5 8 -31 6
-1 sprites/temperate.png 380 300 09 4 15 -6 0
-1 sprites/temperate.png 10 330 09 27 38 -5 -8
-1 sprites/temperate.png 58 330 09 20 37 -4 11
-1 sprites/temperate.png 106 330 09 26 37 -31 5
-1 sprites/temperate.png 154 330 09 20 38 -31 -8
-1 sprites/temperate.png 202 330 09 9 16 17 11
-1 sprites/temperate.png 234 330 09 9 15 -6 22
-1 sprites/temperate.png 266 330 09 9 16 -31 3
-1 sprites/temperate.png 298 330 09 9 15 -7 -8
-1 sprites/temperate.png 330 330 09 7 8 25 11
-1 sprites/temperate.png 346 330 09 5 10 -4 26
-1 sprites/temperate.png 364 330 09 7 8 -31 5
-1 sprites/temperate.png 380 330 09 6 12 -5 -8
-1 * 7 02 05 21 01 00 00 00
-1 * 14 02 05 22 81 80 00 FF 01 20 00 00 00 21 00
-1 * 6 07 83 01 \7! 00 01
-1 * 7 03 05 01 06 00 22 00

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

View File

@@ -1,146 +0,0 @@
//
// $Id$
//
// This file is part of OpenTTD.
// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
//
-1 * 0 0C "Toyland river graphics by andythenorth (Andrew Parkhouse)"
-1 * 4 01 05 01 3C
-1 sprites/toyland.png 10 10 09 19 38 -5 0
-1 sprites/toyland.png 58 10 09 18 38 -5 13
-1 sprites/toyland.png 106 10 09 18 38 -31 13
-1 sprites/toyland.png 154 10 09 19 38 -31 0
-1 sprites/toyland.png 202 10 09 9 19 14 11
-1 sprites/toyland.png 234 10 09 9 16 -7 22
-1 sprites/toyland.png 266 10 09 9 19 -31 11
-1 sprites/toyland.png 298 10 09 9 16 -7 0
-1 sprites/toyland.png 330 10 09 6 8 25 13
-1 sprites/toyland.png 346 10 09 4 12 -5 27
-1 sprites/toyland.png 364 10 09 6 8 -31 13
-1 sprites/toyland.png 380 10 09 5 12 -5 0
-1 sprites/toyland.png 10 40 09 11 40 -7 0
-1 sprites/toyland.png 58 40 09 18 39 -6 5
-1 sprites/toyland.png 106 40 09 11 38 -31 12
-1 sprites/toyland.png 154 40 09 18 39 -31 0
-1 sprites/toyland.png 202 40 09 6 20 13 5
-1 sprites/toyland.png 234 40 09 7 13 -6 16
-1 sprites/toyland.png 266 40 09 6 20 -31 12
-1 sprites/toyland.png 298 40 09 7 13 -5 0
-1 sprites/toyland.png 330 40 09 5 8 25 6
-1 sprites/toyland.png 346 40 09 3 12 -5 20
-1 sprites/toyland.png 364 40 09 4 8 -31 13
-1 sprites/toyland.png 380 40 09 4 15 -7 0
-1 sprites/toyland.png 10 70 09 20 38 -5 -8
-1 sprites/toyland.png 58 70 09 26 38 -5 5
-1 sprites/toyland.png 106 70 09 20 37 -31 11
-1 sprites/toyland.png 154 70 09 27 38 -31 -8
-1 sprites/toyland.png 202 70 09 9 16 17 3
-1 sprites/toyland.png 234 70 09 9 15 -7 22
-1 sprites/toyland.png 266 70 09 9 16 -31 11
-1 sprites/toyland.png 298 70 09 9 15 -6 -8
-1 sprites/toyland.png 330 70 09 7 8 25 5
-1 sprites/toyland.png 346 70 09 5 10 -4 27
-1 sprites/toyland.png 364 70 09 7 8 -31 11
-1 sprites/toyland.png 380 70 09 6 12 -5 -8
-1 sprites/toyland.png 10 100 09 18 39 -6 0
-1 sprites/toyland.png 58 100 09 11 38 -5 12
-1 sprites/toyland.png 106 100 09 18 39 -31 5
-1 sprites/toyland.png 154 100 09 11 40 -32 0
-1 sprites/toyland.png 202 100 09 6 20 13 12
-1 sprites/toyland.png 234 100 09 7 13 -5 16
-1 sprites/toyland.png 266 100 09 6 20 -31 5
-1 sprites/toyland.png 298 100 09 7 13 -6 0
-1 sprites/toyland.png 330 100 09 4 8 26 13
-1 sprites/toyland.png 346 100 09 3 12 -5 20
-1 sprites/toyland.png 364 100 09 5 8 -31 6
-1 sprites/toyland.png 380 100 09 4 15 -6 0
-1 sprites/toyland.png 10 130 09 27 38 -5 -8
-1 sprites/toyland.png 58 130 09 20 37 -4 11
-1 sprites/toyland.png 106 130 09 26 37 -31 5
-1 sprites/toyland.png 154 130 09 20 38 -31 -8
-1 sprites/toyland.png 202 130 09 9 16 17 11
-1 sprites/toyland.png 234 130 09 9 15 -6 22
-1 sprites/toyland.png 266 130 09 9 16 -31 3
-1 sprites/toyland.png 298 130 09 9 15 -7 -8
-1 sprites/toyland.png 330 130 09 7 8 25 11
-1 sprites/toyland.png 346 130 09 5 10 -4 26
-1 sprites/toyland.png 364 130 09 7 8 -31 5
-1 sprites/toyland.png 380 130 09 6 12 -5 -8
-1 * 7 02 05 50 01 00 00 00
-1 * 4 01 05 01 3C
-1 sprites/toyland.png 10 210 09 19 38 -5 0
-1 sprites/toyland.png 58 210 09 18 38 -5 13
-1 sprites/toyland.png 106 210 09 18 38 -31 13
-1 sprites/toyland.png 154 210 09 19 38 -31 0
-1 sprites/toyland.png 202 210 09 9 19 14 11
-1 sprites/toyland.png 234 210 09 9 16 -7 22
-1 sprites/toyland.png 266 210 09 9 19 -31 11
-1 sprites/toyland.png 298 210 09 9 16 -7 0
-1 sprites/toyland.png 330 210 09 6 8 25 13
-1 sprites/toyland.png 346 210 09 4 12 -5 27
-1 sprites/toyland.png 364 210 09 6 8 -31 13
-1 sprites/toyland.png 380 210 09 5 12 -5 0
-1 sprites/toyland.png 10 240 09 11 40 -7 0
-1 sprites/toyland.png 58 240 09 18 39 -6 5
-1 sprites/toyland.png 106 240 09 11 38 -31 12
-1 sprites/toyland.png 154 240 09 18 39 -31 0
-1 sprites/toyland.png 202 240 09 6 20 13 5
-1 sprites/toyland.png 234 240 09 7 13 -6 16
-1 sprites/toyland.png 266 240 09 6 20 -31 12
-1 sprites/toyland.png 298 240 09 7 13 -5 0
-1 sprites/toyland.png 330 240 09 5 8 25 6
-1 sprites/toyland.png 346 240 09 3 12 -5 20
-1 sprites/toyland.png 364 240 09 4 8 -31 13
-1 sprites/toyland.png 380 240 09 4 15 -7 0
-1 sprites/toyland.png 10 270 09 20 38 -5 -8
-1 sprites/toyland.png 58 270 09 26 38 -5 5
-1 sprites/toyland.png 106 270 09 20 37 -31 11
-1 sprites/toyland.png 154 270 09 27 38 -31 -8
-1 sprites/toyland.png 202 270 09 9 16 17 3
-1 sprites/toyland.png 234 270 09 9 15 -7 22
-1 sprites/toyland.png 266 270 09 9 16 -31 11
-1 sprites/toyland.png 298 270 09 9 15 -6 -8
-1 sprites/toyland.png 330 270 09 7 8 25 5
-1 sprites/toyland.png 346 270 09 5 10 -4 27
-1 sprites/toyland.png 364 270 09 7 8 -31 11
-1 sprites/toyland.png 380 270 09 6 12 -5 -8
-1 sprites/toyland.png 10 300 09 18 39 -6 0
-1 sprites/toyland.png 58 300 09 11 38 -5 12
-1 sprites/toyland.png 106 300 09 18 39 -31 5
-1 sprites/toyland.png 154 300 09 11 40 -32 0
-1 sprites/toyland.png 202 300 09 6 20 13 12
-1 sprites/toyland.png 234 300 09 7 13 -5 16
-1 sprites/toyland.png 266 300 09 6 20 -31 5
-1 sprites/toyland.png 298 300 09 7 13 -6 0
-1 sprites/toyland.png 330 300 09 4 8 26 13
-1 sprites/toyland.png 346 300 09 3 12 -5 20
-1 sprites/toyland.png 364 300 09 5 8 -31 6
-1 sprites/toyland.png 380 300 09 4 15 -6 0
-1 sprites/toyland.png 10 330 09 27 38 -5 -8
-1 sprites/toyland.png 58 330 09 20 37 -4 11
-1 sprites/toyland.png 106 330 09 26 37 -31 5
-1 sprites/toyland.png 154 330 09 20 38 -31 -8
-1 sprites/toyland.png 202 330 09 9 16 17 11
-1 sprites/toyland.png 234 330 09 9 15 -6 22
-1 sprites/toyland.png 266 330 09 9 16 -31 3
-1 sprites/toyland.png 298 330 09 9 15 -7 -8
-1 sprites/toyland.png 330 330 09 7 8 25 11
-1 sprites/toyland.png 346 330 09 5 10 -4 26
-1 sprites/toyland.png 364 330 09 7 8 -31 5
-1 sprites/toyland.png 380 330 09 6 12 -5 -8
-1 * 7 02 05 51 01 00 00 00
-1 * 14 02 05 52 81 80 00 FF 01 50 00 00 00 51 00
-1 * 6 07 83 01 \7! 03 01
-1 * 7 03 05 01 06 00 52 00

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

View File

@@ -1,282 +0,0 @@
//
// $Id$
//
// This file is part of OpenTTD.
// OpenTTD is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, version 2.
// OpenTTD is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
// See the GNU General Public License for more details. You should have received a copy of the GNU General Public License along with OpenTTD. If not, see <http://www.gnu.org/licenses/>.
//
-1 * 0 0C "Tropic river graphics by andythenorth (Andrew Parkhouse)"
-1 * 4 01 05 01 3C
-1 sprites/tropic_desert.png 10 10 09 19 38 -5 0
-1 sprites/tropic_desert.png 58 10 09 18 38 -5 13
-1 sprites/tropic_desert.png 106 10 09 18 38 -31 13
-1 sprites/tropic_desert.png 154 10 09 19 38 -31 0
-1 sprites/tropic_desert.png 202 10 09 9 19 14 11
-1 sprites/tropic_desert.png 234 10 09 9 16 -7 22
-1 sprites/tropic_desert.png 266 10 09 9 19 -31 11
-1 sprites/tropic_desert.png 298 10 09 9 16 -7 0
-1 sprites/tropic_desert.png 330 10 09 6 8 25 13
-1 sprites/tropic_desert.png 346 10 09 4 12 -5 27
-1 sprites/tropic_desert.png 364 10 09 6 8 -31 13
-1 sprites/tropic_desert.png 380 10 09 5 12 -5 0
-1 sprites/tropic_desert.png 10 40 09 11 40 -7 0
-1 sprites/tropic_desert.png 58 40 09 18 39 -6 5
-1 sprites/tropic_desert.png 106 40 09 11 38 -31 12
-1 sprites/tropic_desert.png 154 40 09 18 39 -31 0
-1 sprites/tropic_desert.png 202 40 09 6 20 13 5
-1 sprites/tropic_desert.png 234 40 09 7 13 -6 16
-1 sprites/tropic_desert.png 266 40 09 6 20 -31 12
-1 sprites/tropic_desert.png 298 40 09 7 13 -5 0
-1 sprites/tropic_desert.png 330 40 09 5 8 25 6
-1 sprites/tropic_desert.png 346 40 09 3 12 -5 20
-1 sprites/tropic_desert.png 364 40 09 4 8 -31 13
-1 sprites/tropic_desert.png 380 40 09 4 15 -7 0
-1 sprites/tropic_desert.png 10 70 09 20 38 -5 -8
-1 sprites/tropic_desert.png 58 70 09 26 38 -5 5
-1 sprites/tropic_desert.png 106 70 09 20 37 -31 11
-1 sprites/tropic_desert.png 154 70 09 27 38 -31 -8
-1 sprites/tropic_desert.png 202 70 09 9 16 17 3
-1 sprites/tropic_desert.png 234 70 09 9 15 -7 22
-1 sprites/tropic_desert.png 266 70 09 9 16 -31 11
-1 sprites/tropic_desert.png 298 70 09 9 15 -6 -8
-1 sprites/tropic_desert.png 330 70 09 7 8 25 5
-1 sprites/tropic_desert.png 346 70 09 5 10 -4 27
-1 sprites/tropic_desert.png 364 70 09 7 8 -31 11
-1 sprites/tropic_desert.png 380 70 09 6 12 -5 -8
-1 sprites/tropic_desert.png 10 100 09 18 39 -6 0
-1 sprites/tropic_desert.png 58 100 09 11 38 -5 12
-1 sprites/tropic_desert.png 106 100 09 18 39 -31 5
-1 sprites/tropic_desert.png 154 100 09 11 40 -32 0
-1 sprites/tropic_desert.png 202 100 09 6 20 13 12
-1 sprites/tropic_desert.png 234 100 09 7 13 -5 16
-1 sprites/tropic_desert.png 266 100 09 6 20 -31 5
-1 sprites/tropic_desert.png 298 100 09 7 13 -6 0
-1 sprites/tropic_desert.png 330 100 09 4 8 26 13
-1 sprites/tropic_desert.png 346 100 09 3 12 -5 20
-1 sprites/tropic_desert.png 364 100 09 5 8 -31 6
-1 sprites/tropic_desert.png 380 100 09 4 15 -6 0
-1 sprites/tropic_desert.png 10 130 09 27 38 -5 -8
-1 sprites/tropic_desert.png 58 130 09 20 37 -4 11
-1 sprites/tropic_desert.png 106 130 09 26 37 -31 5
-1 sprites/tropic_desert.png 154 130 09 20 38 -31 -8
-1 sprites/tropic_desert.png 202 130 09 9 16 17 11
-1 sprites/tropic_desert.png 234 130 09 9 15 -6 22
-1 sprites/tropic_desert.png 266 130 09 9 16 -31 3
-1 sprites/tropic_desert.png 298 130 09 9 15 -7 -8
-1 sprites/tropic_desert.png 330 130 09 7 8 25 11
-1 sprites/tropic_desert.png 346 130 09 5 10 -4 26
-1 sprites/tropic_desert.png 364 130 09 7 8 -31 5
-1 sprites/tropic_desert.png 380 130 09 6 12 -5 -8
-1 * 7 02 05 40 01 00 00 00
-1 * 4 01 05 01 3C
-1 sprites/tropic_forest.png 10 10 09 19 38 -5 0
-1 sprites/tropic_forest.png 58 10 09 18 38 -5 13
-1 sprites/tropic_forest.png 106 10 09 18 38 -31 13
-1 sprites/tropic_forest.png 154 10 09 19 38 -31 0
-1 sprites/tropic_forest.png 202 10 09 9 19 14 11
-1 sprites/tropic_forest.png 234 10 09 9 16 -7 22
-1 sprites/tropic_forest.png 266 10 09 9 19 -31 11
-1 sprites/tropic_forest.png 298 10 09 9 16 -7 0
-1 sprites/tropic_forest.png 330 10 09 6 8 25 13
-1 sprites/tropic_forest.png 346 10 09 4 12 -5 27
-1 sprites/tropic_forest.png 364 10 09 6 8 -31 13
-1 sprites/tropic_forest.png 380 10 09 5 12 -5 0
-1 sprites/tropic_forest.png 10 40 09 11 40 -7 0
-1 sprites/tropic_forest.png 58 40 09 18 39 -6 5
-1 sprites/tropic_forest.png 106 40 09 11 38 -31 12
-1 sprites/tropic_forest.png 154 40 09 18 39 -31 0
-1 sprites/tropic_forest.png 202 40 09 6 20 13 5
-1 sprites/tropic_forest.png 234 40 09 7 13 -6 16
-1 sprites/tropic_forest.png 266 40 09 6 20 -31 12
-1 sprites/tropic_forest.png 298 40 09 7 13 -5 0
-1 sprites/tropic_forest.png 330 40 09 5 8 25 6
-1 sprites/tropic_forest.png 346 40 09 3 12 -5 20
-1 sprites/tropic_forest.png 364 40 09 4 8 -31 13
-1 sprites/tropic_forest.png 380 40 09 4 15 -7 0
-1 sprites/tropic_forest.png 10 70 09 20 38 -5 -8
-1 sprites/tropic_forest.png 58 70 09 26 38 -5 5
-1 sprites/tropic_forest.png 106 70 09 20 37 -31 11
-1 sprites/tropic_forest.png 154 70 09 27 38 -31 -8
-1 sprites/tropic_forest.png 202 70 09 9 16 17 3
-1 sprites/tropic_forest.png 234 70 09 9 15 -7 22
-1 sprites/tropic_forest.png 266 70 09 9 16 -31 11
-1 sprites/tropic_forest.png 298 70 09 9 15 -6 -8
-1 sprites/tropic_forest.png 330 70 09 7 8 25 5
-1 sprites/tropic_forest.png 346 70 09 5 10 -4 27
-1 sprites/tropic_forest.png 364 70 09 7 8 -31 11
-1 sprites/tropic_forest.png 380 70 09 6 12 -5 -8
-1 sprites/tropic_forest.png 10 100 09 18 39 -6 0
-1 sprites/tropic_forest.png 58 100 09 11 38 -5 12
-1 sprites/tropic_forest.png 106 100 09 18 39 -31 5
-1 sprites/tropic_forest.png 154 100 09 11 40 -32 0
-1 sprites/tropic_forest.png 202 100 09 6 20 13 12
-1 sprites/tropic_forest.png 234 100 09 7 13 -5 16
-1 sprites/tropic_forest.png 266 100 09 6 20 -31 5
-1 sprites/tropic_forest.png 298 100 09 7 13 -6 0
-1 sprites/tropic_forest.png 330 100 09 4 8 26 13
-1 sprites/tropic_forest.png 346 100 09 3 12 -5 20
-1 sprites/tropic_forest.png 364 100 09 5 8 -31 6
-1 sprites/tropic_forest.png 380 100 09 4 15 -6 0
-1 sprites/tropic_forest.png 10 130 09 27 38 -5 -8
-1 sprites/tropic_forest.png 58 130 09 20 37 -4 11
-1 sprites/tropic_forest.png 106 130 09 26 37 -31 5
-1 sprites/tropic_forest.png 154 130 09 20 38 -31 -8
-1 sprites/tropic_forest.png 202 130 09 9 16 17 11
-1 sprites/tropic_forest.png 234 130 09 9 15 -6 22
-1 sprites/tropic_forest.png 266 130 09 9 16 -31 3
-1 sprites/tropic_forest.png 298 130 09 9 15 -7 -8
-1 sprites/tropic_forest.png 330 130 09 7 8 25 11
-1 sprites/tropic_forest.png 346 130 09 5 10 -4 26
-1 sprites/tropic_forest.png 364 130 09 7 8 -31 5
-1 sprites/tropic_forest.png 380 130 09 6 12 -5 -8
-1 * 7 02 05 41 01 00 00 00
-1 * 4 01 05 01 3C
-1 sprites/tropic_desert.png 10 210 09 19 38 -5 0
-1 sprites/tropic_desert.png 58 210 09 18 38 -5 13
-1 sprites/tropic_desert.png 106 210 09 18 38 -31 13
-1 sprites/tropic_desert.png 154 210 09 19 38 -31 0
-1 sprites/tropic_desert.png 202 210 09 9 19 14 11
-1 sprites/tropic_desert.png 234 210 09 9 16 -7 22
-1 sprites/tropic_desert.png 266 210 09 9 19 -31 11
-1 sprites/tropic_desert.png 298 210 09 9 16 -7 0
-1 sprites/tropic_desert.png 330 210 09 6 8 25 13
-1 sprites/tropic_desert.png 346 210 09 4 12 -5 27
-1 sprites/tropic_desert.png 364 210 09 6 8 -31 13
-1 sprites/tropic_desert.png 380 210 09 5 12 -5 0
-1 sprites/tropic_desert.png 10 240 09 11 40 -7 0
-1 sprites/tropic_desert.png 58 240 09 18 39 -6 5
-1 sprites/tropic_desert.png 106 240 09 11 38 -31 12
-1 sprites/tropic_desert.png 154 240 09 18 39 -31 0
-1 sprites/tropic_desert.png 202 240 09 6 20 13 5
-1 sprites/tropic_desert.png 234 240 09 7 13 -6 16
-1 sprites/tropic_desert.png 266 240 09 6 20 -31 12
-1 sprites/tropic_desert.png 298 240 09 7 13 -5 0
-1 sprites/tropic_desert.png 330 240 09 5 8 25 6
-1 sprites/tropic_desert.png 346 240 09 3 12 -5 20
-1 sprites/tropic_desert.png 364 240 09 4 8 -31 13
-1 sprites/tropic_desert.png 380 240 09 4 15 -7 0
-1 sprites/tropic_desert.png 10 270 09 20 38 -5 -8
-1 sprites/tropic_desert.png 58 270 09 26 38 -5 5
-1 sprites/tropic_desert.png 106 270 09 20 37 -31 11
-1 sprites/tropic_desert.png 154 270 09 27 38 -31 -8
-1 sprites/tropic_desert.png 202 270 09 9 16 17 3
-1 sprites/tropic_desert.png 234 270 09 9 15 -7 22
-1 sprites/tropic_desert.png 266 270 09 9 16 -31 11
-1 sprites/tropic_desert.png 298 270 09 9 15 -6 -8
-1 sprites/tropic_desert.png 330 270 09 7 8 25 5
-1 sprites/tropic_desert.png 346 270 09 5 10 -4 27
-1 sprites/tropic_desert.png 364 270 09 7 8 -31 11
-1 sprites/tropic_desert.png 380 270 09 6 12 -5 -8
-1 sprites/tropic_desert.png 10 300 09 18 39 -6 0
-1 sprites/tropic_desert.png 58 300 09 11 38 -5 12
-1 sprites/tropic_desert.png 106 300 09 18 39 -31 5
-1 sprites/tropic_desert.png 154 300 09 11 40 -32 0
-1 sprites/tropic_desert.png 202 300 09 6 20 13 12
-1 sprites/tropic_desert.png 234 300 09 7 13 -5 16
-1 sprites/tropic_desert.png 266 300 09 6 20 -31 5
-1 sprites/tropic_desert.png 298 300 09 7 13 -6 0
-1 sprites/tropic_desert.png 330 300 09 4 8 26 13
-1 sprites/tropic_desert.png 346 300 09 3 12 -5 20
-1 sprites/tropic_desert.png 364 300 09 5 8 -31 6
-1 sprites/tropic_desert.png 380 300 09 4 15 -6 0
-1 sprites/tropic_desert.png 10 330 09 27 38 -5 -8
-1 sprites/tropic_desert.png 58 330 09 20 37 -4 11
-1 sprites/tropic_desert.png 106 330 09 26 37 -31 5
-1 sprites/tropic_desert.png 154 330 09 20 38 -31 -8
-1 sprites/tropic_desert.png 202 330 09 9 16 17 11
-1 sprites/tropic_desert.png 234 330 09 9 15 -6 22
-1 sprites/tropic_desert.png 266 330 09 9 16 -31 3
-1 sprites/tropic_desert.png 298 330 09 9 15 -7 -8
-1 sprites/tropic_desert.png 330 330 09 7 8 25 11
-1 sprites/tropic_desert.png 346 330 09 5 10 -4 26
-1 sprites/tropic_desert.png 364 330 09 7 8 -31 5
-1 sprites/tropic_desert.png 380 330 09 6 12 -5 -8
-1 * 7 02 05 42 01 00 00 00
-1 * 4 01 05 01 3C
-1 sprites/tropic_forest.png 10 210 09 19 38 -5 0
-1 sprites/tropic_forest.png 58 210 09 18 38 -5 13
-1 sprites/tropic_forest.png 106 210 09 18 38 -31 13
-1 sprites/tropic_forest.png 154 210 09 19 38 -31 0
-1 sprites/tropic_forest.png 202 210 09 9 19 14 11
-1 sprites/tropic_forest.png 234 210 09 9 16 -7 22
-1 sprites/tropic_forest.png 266 210 09 9 19 -31 11
-1 sprites/tropic_forest.png 298 210 09 9 16 -7 0
-1 sprites/tropic_forest.png 330 210 09 6 8 25 13
-1 sprites/tropic_forest.png 346 210 09 4 12 -5 27
-1 sprites/tropic_forest.png 364 210 09 6 8 -31 13
-1 sprites/tropic_forest.png 380 210 09 5 12 -5 0
-1 sprites/tropic_forest.png 10 240 09 11 40 -7 0
-1 sprites/tropic_forest.png 58 240 09 18 39 -6 5
-1 sprites/tropic_forest.png 106 240 09 11 38 -31 12
-1 sprites/tropic_forest.png 154 240 09 18 39 -31 0
-1 sprites/tropic_forest.png 202 240 09 6 20 13 5
-1 sprites/tropic_forest.png 234 240 09 7 13 -6 16
-1 sprites/tropic_forest.png 266 240 09 6 20 -31 12
-1 sprites/tropic_forest.png 298 240 09 7 13 -5 0
-1 sprites/tropic_forest.png 330 240 09 5 8 25 6
-1 sprites/tropic_forest.png 346 240 09 3 12 -5 20
-1 sprites/tropic_forest.png 364 240 09 4 8 -31 13
-1 sprites/tropic_forest.png 380 240 09 4 15 -7 0
-1 sprites/tropic_forest.png 10 270 09 20 38 -5 -8
-1 sprites/tropic_forest.png 58 270 09 26 38 -5 5
-1 sprites/tropic_forest.png 106 270 09 20 37 -31 11
-1 sprites/tropic_forest.png 154 270 09 27 38 -31 -8
-1 sprites/tropic_forest.png 202 270 09 9 16 17 3
-1 sprites/tropic_forest.png 234 270 09 9 15 -7 22
-1 sprites/tropic_forest.png 266 270 09 9 16 -31 11
-1 sprites/tropic_forest.png 298 270 09 9 15 -6 -8
-1 sprites/tropic_forest.png 330 270 09 7 8 25 5
-1 sprites/tropic_forest.png 346 270 09 5 10 -4 27
-1 sprites/tropic_forest.png 364 270 09 7 8 -31 11
-1 sprites/tropic_forest.png 380 270 09 6 12 -5 -8
-1 sprites/tropic_forest.png 10 300 09 18 39 -6 0
-1 sprites/tropic_forest.png 58 300 09 11 38 -5 12
-1 sprites/tropic_forest.png 106 300 09 18 39 -31 5
-1 sprites/tropic_forest.png 154 300 09 11 40 -32 0
-1 sprites/tropic_forest.png 202 300 09 6 20 13 12
-1 sprites/tropic_forest.png 234 300 09 7 13 -5 16
-1 sprites/tropic_forest.png 266 300 09 6 20 -31 5
-1 sprites/tropic_forest.png 298 300 09 7 13 -6 0
-1 sprites/tropic_forest.png 330 300 09 4 8 26 13
-1 sprites/tropic_forest.png 346 300 09 3 12 -5 20
-1 sprites/tropic_forest.png 364 300 09 5 8 -31 6
-1 sprites/tropic_forest.png 380 300 09 4 15 -6 0
-1 sprites/tropic_forest.png 10 330 09 27 38 -5 -8
-1 sprites/tropic_forest.png 58 330 09 20 37 -4 11
-1 sprites/tropic_forest.png 106 330 09 26 37 -31 5
-1 sprites/tropic_forest.png 154 330 09 20 38 -31 -8
-1 sprites/tropic_forest.png 202 330 09 9 16 17 11
-1 sprites/tropic_forest.png 234 330 09 9 15 -6 22
-1 sprites/tropic_forest.png 266 330 09 9 16 -31 3
-1 sprites/tropic_forest.png 298 330 09 9 15 -7 -8
-1 sprites/tropic_forest.png 330 330 09 7 8 25 11
-1 sprites/tropic_forest.png 346 330 09 5 10 -4 26
-1 sprites/tropic_forest.png 364 330 09 7 8 -31 5
-1 sprites/tropic_forest.png 380 330 09 6 12 -5 -8
-1 * 7 02 05 43 01 00 00 00
-1 * 14 02 05 44 81 81 00 FF 01 40 00 01 01 41 00
-1 * 14 02 05 45 81 81 00 FF 01 42 00 01 01 43 00
-1 * 14 02 05 46 81 80 00 FF 01 44 00 00 00 45 00
-1 * 6 07 83 01 \7! 02 01
-1 * 7 03 05 01 06 00 46 00

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

View File

@@ -1,39 +1,3 @@
openttd (1.1.4) unstable; urgency=low
* New upstream release 1.1.4
-- Matthijs Kooijman <matthijs@stdin.nl> Mon, 05 Dec 2011 00:00:00 +0400
openttd (1.1.4-RC1) unstable; urgency=low
* New upstream release 1.1.4-RC1
-- Matthijs Kooijman <matthijs@stdin.nl> Sun, 20 Nov 2011 17:00:00 +0100
openttd (1.1.3) unstable; urgency=low
* New upstream release 1.1.3
-- Matthijs Kooijman <matthijs@stdin.nl> Thu, 15 Sep 2011 21:00:00 +0200
openttd (1.1.3-RC1) unstable; urgency=low
* New upstream release 1.1.3-RC1
-- Matthijs Kooijman <matthijs@stdin.nl> Sun, 04 Sep 2011 17:00:00 +0200
openttd (1.1.2) unstable; urgency=low
* New upstream release 1.1.2
-- Matthijs Kooijman <matthijs@stdin.nl> Sun, 14 Aug 2011 17:00:00 +0200
openttd (1.1.2~RC2) unstable; urgency=low
* New upstream release 1.1.2-RC2
-- Matthijs Kooijman <matthijs@stdin.nl> Sat, 30 Jul 2011 21:00:00 +0200
openttd (1.1.2~RC1) unstable; urgency=low openttd (1.1.2~RC1) unstable; urgency=low
* New upstream release 1.1.2-RC1 * New upstream release 1.1.2-RC1

View File

@@ -1,6 +1,6 @@
@echo off @echo off
set OPENTTD_VERSION=1.1.4 set OPENTTD_VERSION=1.1.2-RC1
set OPENSFX_VERSION=0.8.0 set OPENSFX_VERSION=0.8.0
set NOSOUND_VERSION=0.8.0 set NOSOUND_VERSION=0.8.0
set OPENGFX_VERSION=0.7.0 set OPENGFX_VERSION=0.7.0

View File

@@ -2,7 +2,7 @@
%define binname openttd %define binname openttd
%define srcver 1.1.4 %define srcver 1.1.2
%if %{dedicated} %if %{dedicated}
Name: %{binname}-dedicated Name: %{binname}-dedicated

View File

@@ -1,9 +1,9 @@
# Version numbers to update # Version numbers to update
!define APPV_MAJOR 1 !define APPV_MAJOR 1
!define APPV_MINOR 1 !define APPV_MINOR 1
!define APPV_MAINT 4 !define APPV_MAINT 2
!define APPV_BUILD 1 !define APPV_BUILD 0
!define APPV_EXTRA "" !define APPV_EXTRA "-RC1"
!define APPNAME "OpenTTD" ; Define application name !define APPNAME "OpenTTD" ; Define application name
!define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}" ; Define application version !define APPVERSION "${APPV_MAJOR}.${APPV_MINOR}.${APPV_MAINT}${APPV_EXTRA}" ; Define application version
@@ -57,7 +57,6 @@ Var CDDRIVE
; Modern interface settings ; Modern interface settings
!include "MUI2.nsh" !include "MUI2.nsh"
!include "InstallOptions.nsh" !include "InstallOptions.nsh"
!include "WinVer.nsh"
!define MUI_ABORTWARNING !define MUI_ABORTWARNING
!define MUI_WELCOMEPAGE_TITLE_3LINES !define MUI_WELCOMEPAGE_TITLE_3LINES
@@ -86,7 +85,7 @@ Page custom SelectCDEnter SelectCDExit ": TTD folder"
!define MUI_FINISHPAGE_TITLE_3LINES !define MUI_FINISHPAGE_TITLE_3LINES
!define MUI_FINISHPAGE_RUN_TEXT "Run ${APPNAMEANDVERSION} now!" !define MUI_FINISHPAGE_RUN_TEXT "Run ${APPNAMEANDVERSION} now!"
!define MUI_FINISHPAGE_RUN "$INSTDIR\openttd.exe" !define MUI_FINISHPAGE_RUN "$INSTDIR\openttd.exe"
!define MUI_FINISHPAGE_LINK "Visit the OpenTTD site for more information" !define MUI_FINISHPAGE_LINK "Visit the OpenTTD site for the latest news, FAQs and downloads"
!define MUI_FINISHPAGE_LINK_LOCATION "${APPURLLINK}" !define MUI_FINISHPAGE_LINK_LOCATION "${APPURLLINK}"
!define MUI_FINISHPAGE_NOREBOOTSUPPORT !define MUI_FINISHPAGE_NOREBOOTSUPPORT
!define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\readme.txt" !define MUI_FINISHPAGE_SHOWREADME "$INSTDIR\readme.txt"
@@ -519,17 +518,17 @@ hasCD:
FunctionEnd FunctionEnd
;------------------------------------------------------------------------------- ;-------------------------------------------------------------------------------
; Determine windows version, returns "win9x" if Win9x/Me/2000/XP SP2- or "winnt" for the rest on the stack ; Determine windows version, returns "win9x" if Win9x/Me or "winnt" on the stack
Function GetWindowsVersion Function GetWindowsVersion
ClearErrors ClearErrors
StrCpy $R0 "winnt"
GetVersion::WindowsPlatformId
Pop $R0
IntCmp $R0 2 WinNT 0
StrCpy $R0 "win9x" StrCpy $R0 "win9x"
${If} ${IsNT} WinNT:
${If} ${IsWinXP} ClearErrors
${AndIf} ${AtLeastServicePack} 3
${OrIf} ${AtLeastWin2003}
StrCpy $R0 "winnt"
${EndIf}
${EndIf}
Push $R0 Push $R0
FunctionEnd FunctionEnd
@@ -541,12 +540,12 @@ Function CheckProcessorArchitecture
IntCmp $R0 64 Win64 0 IntCmp $R0 64 Win64 0
ClearErrors ClearErrors
IntCmp ${APPBITS} 64 0 Done IntCmp ${APPBITS} 64 0 Done
MessageBox MB_YESNO|MB_ICONSTOP "You are trying to install the 64-bit OpenTTD on a 32-bit operating system. This is not going to work. Please download the correct version. Do you really want to continue?" IDYES Done IDNO Abort MessageBox MB_OKCANCEL|MB_ICONSTOP "You are trying to install the 64-bit OpenTTD on a 32-bit operating system. This is not going to work. Please download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
GoTo Done GoTo Done
Win64: Win64:
ClearErrors ClearErrors
IntCmp ${APPBITS} 64 Done 0 IntCmp ${APPBITS} 64 Done 0
MessageBox MB_YESNO|MB_ICONINFORMATION "You are trying to install the 32-bit OpenTTD on a 64-bit operating system. This is not advised, but will work with reduced capabilities. We suggest that you download the correct version. Do you really want to continue?" IDYES Done IDNO Abort MessageBox MB_OKCANCEL|MB_ICONINFORMATION "You are trying to install the 32-bit OpenTTD on a 64-bit operating system. This is not advised, but will work with reduced capabilities. We suggest that you download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
GoTo Done GoTo Done
Abort: Abort:
Quit Quit
@@ -561,12 +560,12 @@ Function CheckWindowsVersion
StrCmp $R0 "win9x" 0 WinNT StrCmp $R0 "win9x" 0 WinNT
ClearErrors ClearErrors
StrCmp ${APPARCH} "win9x" Done 0 StrCmp ${APPARCH} "win9x" Done 0
MessageBox MB_YESNO|MB_ICONSTOP "You are trying to install the Windows XP SP3, Vista and 7 version on Windows 95, 98, ME, 2000 and XP without SP3. This is will not work. Please download the correct version. Do you really want to continue?" IDYES Done IDNO Abort MessageBox MB_OKCANCEL|MB_ICONSTOP "You are trying to install the Windows 2000, XP and Vista version on Windows 95, 98 or ME. This is will not work. Please download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
GoTo Done GoTo Done
WinNT: WinNT:
ClearErrors ClearErrors
StrCmp ${APPARCH} "win9x" 0 Done StrCmp ${APPARCH} "win9x" 0 Done
MessageBox MB_YESNO|MB_ICONEXCLAMATION "You are trying to install the Windows 95, 98, 2000 and XP without SP3 version on Windows XP SP3, Vista or 7. This is not advised, but will work with reduced capabilities. We suggest that you download the correct version. Do you really want to continue?" IDYES Done IDNO Abort MessageBox MB_OKCANCEL|MB_ICONEXCLAMATION "You are trying to install the Windows 95, 98 and ME version on Windows 2000, XP or Vista. This is not advised, but will work with reduced capabilities. We suggest that you download the correct version. Do you really want to continue?" IDOK Done IDCANCEL Abort
Abort: Abort:
Quit Quit
Done: Done:
@@ -675,7 +674,8 @@ WelcomeToSetup:
ReadRegStr $OLDVERSION HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "DisplayVersion" ReadRegStr $OLDVERSION HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "DisplayVersion"
; Gets the older version then displays it in a message box ; Gets the older version then displays it in a message box
MessageBox MB_OK|MB_ICONINFORMATION \ MessageBox MB_OK|MB_ICONINFORMATION \
"Welcome to ${APPNAMEANDVERSION} Setup.$\nThis will allow you to upgrade from version $OLDVERSION." "Welcome to ${APPNAMEANDVERSION} Setup.$\n \
This will allow you to upgrade from version $OLDVERSION."
SectionSetFlags ${Section2} 0x80 ; set bit 7 SectionSetFlags ${Section2} 0x80 ; set bit 7
SectionSetFlags ${Section3} 0x80 ; set bit 7 SectionSetFlags ${Section3} 0x80 ; set bit 7
SectionSetFlags ${Section4} 0x80 ; set bit 7 SectionSetFlags ${Section4} 0x80 ; set bit 7
@@ -686,7 +686,8 @@ VersionsAreEqual:
ReadRegStr $UninstallString HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "UninstallString" ReadRegStr $UninstallString HKEY_LOCAL_MACHINE "SOFTWARE\Microsoft\Windows\CurrentVersion\Uninstall\OpenTTD" "UninstallString"
IfFileExists "$UninstallString" "" FinishCallback IfFileExists "$UninstallString" "" FinishCallback
MessageBox MB_YESNO|MB_ICONQUESTION \ MessageBox MB_YESNO|MB_ICONQUESTION \
"Setup detected ${APPNAMEANDVERSION} on your system. This is the same version that this program will install.$\nAre you trying to uninstall it?" \ "Setup detected ${APPNAMEANDVERSION} on your system. This is the same version that this program will install.$\n \
Are you trying to uninstall it?" \
IDYES DoUninstall IDNO FinishCallback IDYES DoUninstall IDNO FinishCallback
DoUninstall: ; You have the same version as this installer. This allows you to uninstall. DoUninstall: ; You have the same version as this installer. This allows you to uninstall.
Exec "$UninstallString" Exec "$UninstallString"
@@ -694,7 +695,8 @@ DoUninstall: ; You have the same version as this installer. This allows you to
InstallerIsOlder: InstallerIsOlder:
MessageBox MB_OK|MB_ICONSTOP \ MessageBox MB_OK|MB_ICONSTOP \
"You have a newer version of ${APPNAME}.$\nSetup will now exit." "You have a newer version of ${APPNAME}.$\n \
Setup will now exit."
Quit Quit
FinishCallback: FinishCallback:

View File

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

View File

@@ -1,5 +1,5 @@
!define APPBITS 32 ; Define number of bits for the architecture !define APPBITS 32 ; Define number of bits for the architecture
!define EXTRA_VERSION "95, 98, ME, 2000 and XP without SP3" !define EXTRA_VERSION "95, 98 and ME"
!define APPARCH "win9x" ; Define the application architecture !define APPARCH "win9x" ; Define the application architecture
!define BINARY_DIR "${PATH_ROOT}bin" !define BINARY_DIR "${PATH_ROOT}bin"
InstallDir "$PROGRAMFILES32\OpenTTD\" InstallDir "$PROGRAMFILES32\OpenTTD\"

View File

@@ -102,7 +102,7 @@
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed> <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers> <OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>..\objs\langs;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\objs\langs;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<ExceptionHandling>Sync</ExceptionHandling> <ExceptionHandling>Sync</ExceptionHandling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -204,7 +204,7 @@
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed> <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers> <OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>..\objs\langs;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\objs\langs;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<ExceptionHandling>Sync</ExceptionHandling> <ExceptionHandling>Sync</ExceptionHandling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

View File

@@ -102,7 +102,7 @@
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed> <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers> <OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>..\objs\langs;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\objs\langs;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<ExceptionHandling>Sync</ExceptionHandling> <ExceptionHandling>Sync</ExceptionHandling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>
@@ -204,7 +204,7 @@
<FavorSizeOrSpeed>Size</FavorSizeOrSpeed> <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
<OmitFramePointers>true</OmitFramePointers> <OmitFramePointers>true</OmitFramePointers>
<AdditionalIncludeDirectories>..\objs\langs;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <AdditionalIncludeDirectories>..\objs\langs;..\src\3rdparty\squirrel\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;%(PreprocessorDefinitions)</PreprocessorDefinitions> <PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR="OpenTTD";_SQ64;WITH_ASSERT;%(PreprocessorDefinitions)</PreprocessorDefinitions>
<StringPooling>true</StringPooling> <StringPooling>true</StringPooling>
<ExceptionHandling>Sync</ExceptionHandling> <ExceptionHandling>Sync</ExceptionHandling>
<RuntimeLibrary>MultiThreaded</RuntimeLibrary> <RuntimeLibrary>MultiThreaded</RuntimeLibrary>

View File

@@ -52,7 +52,7 @@
FavorSizeOrSpeed="2" FavorSizeOrSpeed="2"
OmitFramePointers="true" OmitFramePointers="true"
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include" AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
StringPooling="true" StringPooling="true"
ExceptionHandling="1" ExceptionHandling="1"
RuntimeLibrary="0" RuntimeLibrary="0"
@@ -257,7 +257,7 @@
FavorSizeOrSpeed="2" FavorSizeOrSpeed="2"
OmitFramePointers="true" OmitFramePointers="true"
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include" AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
StringPooling="true" StringPooling="true"
ExceptionHandling="1" ExceptionHandling="1"
RuntimeLibrary="0" RuntimeLibrary="0"

View File

@@ -52,7 +52,7 @@
FavorSizeOrSpeed="2" FavorSizeOrSpeed="2"
OmitFramePointers="true" OmitFramePointers="true"
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include" AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
StringPooling="true" StringPooling="true"
ExceptionHandling="1" ExceptionHandling="1"
RuntimeLibrary="0" RuntimeLibrary="0"
@@ -257,7 +257,7 @@
FavorSizeOrSpeed="2" FavorSizeOrSpeed="2"
OmitFramePointers="true" OmitFramePointers="true"
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include" AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
StringPooling="true" StringPooling="true"
ExceptionHandling="1" ExceptionHandling="1"
RuntimeLibrary="0" RuntimeLibrary="0"

View File

@@ -53,7 +53,7 @@
FavorSizeOrSpeed="2" FavorSizeOrSpeed="2"
OmitFramePointers="true" OmitFramePointers="true"
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include" AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
StringPooling="true" StringPooling="true"
ExceptionHandling="1" ExceptionHandling="1"
RuntimeLibrary="0" RuntimeLibrary="0"
@@ -255,7 +255,7 @@
FavorSizeOrSpeed="2" FavorSizeOrSpeed="2"
OmitFramePointers="true" OmitFramePointers="true"
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include" AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
StringPooling="true" StringPooling="true"
ExceptionHandling="1" ExceptionHandling="1"
RuntimeLibrary="0" RuntimeLibrary="0"

View File

@@ -53,7 +53,7 @@
FavorSizeOrSpeed="2" FavorSizeOrSpeed="2"
OmitFramePointers="true" OmitFramePointers="true"
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include" AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;WITH_ASSERT"
StringPooling="true" StringPooling="true"
ExceptionHandling="1" ExceptionHandling="1"
RuntimeLibrary="0" RuntimeLibrary="0"
@@ -255,7 +255,7 @@
FavorSizeOrSpeed="2" FavorSizeOrSpeed="2"
OmitFramePointers="true" OmitFramePointers="true"
AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include" AdditionalIncludeDirectories="..\objs\langs;..\src\3rdparty\squirrel\include"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64" PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WITH_ZLIB;WITH_LZO;WITH_LZMA;LZMA_API_STATIC;WITH_PNG;WITH_FREETYPE;WITH_ICU;U_STATIC_IMPLEMENTATION;ENABLE_NETWORK;ENABLE_AI;WITH_PERSONAL_DIR;PERSONAL_DIR=\&quot;OpenTTD\&quot;;_SQ64;WITH_ASSERT"
StringPooling="true" StringPooling="true"
ExceptionHandling="1" ExceptionHandling="1"
RuntimeLibrary="0" RuntimeLibrary="0"

View File

@@ -1,6 +1,6 @@
OpenTTD readme OpenTTD readme
Last updated: 2011-12-05 Last updated: 2011-07-24
Release version: 1.1.4 Release version: 1.1.2-RC1
------------------------------------------------------------------------ ------------------------------------------------------------------------
@@ -470,8 +470,7 @@ The following compilers are known to compile OpenTTD:
Version 2005 gives bogus warnings about scoping issues. Version 2005 gives bogus warnings about scoping issues.
- GNU Compiler Collection (GCC) 3.3 - 4.7. - GNU Compiler Collection (GCC) 3.3 - 4.7.
Versions 4.1 and earlier give bogus warnings about uninitialised variables. Versions 4.1 and earlier give bogus warnings about uninitialised variables.
Versions 4.4 - 4.6 give bogus warnings about freeing non-heap objects. Versions 4.4 and later give bogus warnings about freeing non-heap objects.
Versions 4.5 and later give invalid warnings when lto is enabled.
- Intel C++ Compiler (ICC) 12.0. - Intel C++ Compiler (ICC) 12.0.
The following compilers are known not to compile OpenTTD: The following compilers are known not to compile OpenTTD:
@@ -591,52 +590,51 @@ Once you have all missing files, you are set to go.
X.X) Credits X.X) Credits
---- ------- ---- -------
The OpenTTD team (in alphabetical order): The OpenTTD team (in alphabetical order):
Albert Hofkamp (Alberth) - GUI expert Albert Hofkamp (Alberth) - GUI expert
Jean-François Claeys (Belugas) - GUI, newindustries and more Jean-François Claeys (Belugas) - GUI, newindustries and more
Matthijs Kooijman (blathijs) - Pathfinder-guru, pool rework Matthijs Kooijman (blathijs) - Pathfinder-guru, pool rework
Christoph Elsenhans (frosch) - General coding Christoph Elsenhans (frosch) - General coding
Loïc Guilloux (glx) - Windows Expert Loïc Guilloux (glx) - Windows Expert
Michael Lutz (michi_cc) - Path based signals Michael Lutz (michi_cc) - Path based signals
Owen Rudge (orudge) - Forum host, OS/2 port Owen Rudge (orudge) - Forum host, OS/2 port
Peter Nelson (peter1138) - Spiritual descendant from newGRF gods Peter Nelson (peter1138) - Spiritual descendant from newGRF gods
Ingo von Borstel (planetmaker) - Support Ingo von Borstel (planetmaker) - Support
Remko Bijker (Rubidium) - Lead coder and way more Remko Bijker (Rubidium) - Lead coder and way more
Zdeněk Sojka (SmatZ) - Bug finder and fixer Zdeněk Sojka (SmatZ) - Bug finder and fixer
José Soler (Terkhen) - General coding José Soler (Terkhen) - General coding
Thijs Marinussen (Yexo) - AI Framework Thijs Marinussen (Yexo) - AI Framework
Inactive Developers: Inactive Developers:
Bjarni Corfitzen (Bjarni) - MacOSX port, coder and vehicles Bjarni Corfitzen (Bjarni) - MacOSX port, coder and vehicles
Victor Fischer (Celestar) - Programming everywhere you need him to Victor Fischer (Celestar) - Programming everywhere you need him to
Tamás Faragó (Darkvater) - Ex-Lead coder Tamás Faragó (Darkvater) - Ex-Lead coder
Jaroslav Mazanec (KUDr) - YAPG (Yet Another Pathfinder God) ;) Jaroslav Mazanec (KUDr) - YAPG (Yet Another Pathfinder God) ;)
Jonathan Coome (Maedhros) - High priest of the NewGRF Temple Jonathan Coome (Maedhros) - High priest of the NewGRF Temple
Attila Bán (MiHaMiX) - WebTranslator 1 and 2 Attila Bán (MiHaMiX) - WebTranslator 1 and 2
Christoph Mallon (Tron) - Programmer, code correctness police Christoph Mallon (Tron) - Programmer, code correctness police
Retired Developers: Retired Developers:
Ludvig Strigeus (ludde) - OpenTTD author, main coder (0.1 - 0.3.3) Ludvig Strigeus (ludde) - OpenTTD author, main coder (0.1 - 0.3.3)
Serge Paquet (vurlix) - Assistant project manager, coder (0.1 - 0.3.3) Serge Paquet (vurlix) - Assistant project manager, coder (0.1 - 0.3.3)
Dominik Scherer (dominik81) - Lead programmer, GUI expert (0.3.0 - 0.3.6) Dominik Scherer (dominik81) - Lead programmer, GUI expert (0.3.0 - 0.3.6)
Benedikt Brüggemeier (skidd13) - Bug fixer and code reworker Benedikt Brüggemeier (skidd13) - Bug fixer and code reworker
Patric Stout (TrueLight) - Programmer (0.3 - pre0.7), sys op (active) Patric Stout (TrueLight) - Programmer (0.3 - pre0.7), sys op (active)
Thanks to: Thanks to:
Josef Drexler - For his great work on TTDPatch. Josef Drexler - For his great work on TTDPatch.
Marcin Grzegorczyk - For his TTDPatch work and documentation of Transport Tycoon Deluxe internals and graphics (signals and track foundations) Marcin Grzegorczyk - For his TTDPatch work and documentation of Transport Tycoon Deluxe internals and graphics (signals and track foundations)
Petr Baudiš (pasky) - Many patches, newgrf support, etc. Petr Baudiš (pasky) - Many patches, newgrf support, etc.
Simon Sasburg (HackyKid) - For the many bugfixes he has blessed us with Simon Sasburg (HackyKid) - For the many bugfixes he has blessed us with
Stefan Meißner (sign_de) - For his work on the console Stefan Meißner (sign_de) - For his work on the console
Mike Ragsdale - OpenTTD installer Mike Ragsdale - OpenTTD installer
Cian Duffy (MYOB) - BeOS port / manual writing Cian Duffy (MYOB) - BeOS port / manual writing
Christian Rosentreter (tokai) - MorphOS / AmigaOS port Christian Rosentreter (tokai) - MorphOS / AmigaOS port
Richard Kempton (RichK67) - Additional airports, initial TGP implementation Richard Kempton (RichK67) - Additional airports, initial TGP implementation
Alberto Demichelis - Squirrel scripting language Alberto Demichelis - Squirrel scripting language
L. Peter Deutsch - MD5 implementation L. Peter Deutsch - MD5 implementation
Michael Blunck - For revolutionizing TTD with awesome graphics Michael Blunck - For revolutionizing TTD with awesome graphics
George - Canal graphics George - Canal graphics
Andrew Parkhouse (andythenorth) - River graphics David Dallaston (Pikka) - Tram tracks
David Dallaston (Pikka) - Tram tracks All Translators - For their support to make OpenTTD a truly international game
All Translators - For their support to make OpenTTD a truly international game Bug Reporters - Thanks for all bug reports
Bug Reporters - Thanks for all bug reports Chris Sawyer - For an amazing game!
Chris Sawyer - For an amazing game!

View File

@@ -1,9 +1,6 @@
/* /*
see copyright notice in squirrel.h see copyright notice in squirrel.h
*/ */
/* Needs to be first due to a squirrel header defining type() and type()
* being used in some versions of the headers included by algorithm. */
#include <algorithm>
#include "sqpcheader.h" #include "sqpcheader.h"
#include "sqvm.h" #include "sqvm.h"
#include "sqstring.h" #include "sqstring.h"
@@ -487,7 +484,7 @@ static SQInteger array_resize(HSQUIRRELVM v)
//QSORT ala Sedgewick //QSORT ala Sedgewick
bool _qsort_compare(HSQUIRRELVM v,SQObjectPtr &arr,const SQObjectPtr &a,const SQObjectPtr &b,SQInteger func,SQInteger &ret) bool _qsort_compare(HSQUIRRELVM v,SQObjectPtr &arr,SQObjectPtr &a,SQObjectPtr &b,SQInteger func,SQInteger &ret)
{ {
if(func < 0) { if(func < 0) {
if(!v->ObjCmp(a,b,ret)) return false; if(!v->ObjCmp(a,b,ret)) return false;
@@ -509,26 +506,40 @@ bool _qsort_compare(HSQUIRRELVM v,SQObjectPtr &arr,const SQObjectPtr &a,const SQ
} }
return true; return true;
} }
struct qsort_cmp //QSORT ala Sedgewick
{ bool _qsort(HSQUIRRELVM v,SQObjectPtr &arr, SQInteger l, SQInteger r,SQInteger func)
HSQUIRRELVM v;
SQInteger func;
bool operator() (const SQObjectPtr &a, const SQObjectPtr &b) const
{
SQInteger res;
SQObjectPtr dummy;
if (!_qsort_compare(v, dummy, a, b, func, res)) return false;
return res < 0;
}
};
bool _qsort(HSQUIRRELVM v,SQObjectPtr &arr, SQInteger func)
{ {
SQInteger i, j;
SQArray *a=_array(arr); SQArray *a=_array(arr);
qsort_cmp cur_cmp; SQObjectPtr pivot,t;
cur_cmp.v = v; if( l < r ){
cur_cmp.func = func; pivot = a->_values[l];
std::sort(a->_values._vals, a->_values._vals + a->Size(), cur_cmp); i = l; j = r+1;
while(1){
SQInteger ret;
do {
++i;
if(i > r) break;
if(!_qsort_compare(v,arr,a->_values[i],pivot,func,ret))
return false;
} while( ret <= 0);
do {
--j;
if ( j < 0 ) {
v->Raise_Error( _SC("Invalid qsort, probably compare function defect") );
return false;
}
if(!_qsort_compare(v,arr,a->_values[j],pivot,func,ret))
return false;
}
while( ret > 0 );
if( i >= j ) break;
t = a->_values[i]; a->_values[i] = a->_values[j]; a->_values[j] = t;
}
t = a->_values[l]; a->_values[l] = a->_values[j]; a->_values[j] = t;
if(!_qsort( v, arr, l, j-1,func)) return false;
if(!_qsort( v, arr, j+1, r,func)) return false;
}
return true; return true;
} }
@@ -539,7 +550,7 @@ static SQInteger array_sort(HSQUIRRELVM v)
SQObject &funcobj = stack_get(v,2); SQObject &funcobj = stack_get(v,2);
if(_array(o)->Size() > 1) { if(_array(o)->Size() > 1) {
if(type(funcobj) == OT_CLOSURE || type(funcobj) == OT_NATIVECLOSURE) func = 2; if(type(funcobj) == OT_CLOSURE || type(funcobj) == OT_NATIVECLOSURE) func = 2;
if(!_qsort(v, o, func)) if(!_qsort(v, o, 0, _array(o)->Size()-1, func))
return SQ_ERROR; return SQ_ERROR;
} }

View File

@@ -1002,7 +1002,7 @@ struct AIDebugWindow : public QueryStringBaseWindow {
switch (widget) { switch (widget) {
case AID_WIDGET_RELOAD_TOGGLE: case AID_WIDGET_RELOAD_TOGGLE:
/* First kill the company of the AI, then start a new one. This should start the current AI again */ /* First kill the company of the AI, then start a new one. This should start the current AI again */
DoCommandP(0, 2 | ai_debug_company << 16, CRR_MANUAL, CMD_COMPANY_CTRL); DoCommandP(0, 2 | ai_debug_company << 16, 0, CMD_COMPANY_CTRL);
DoCommandP(0, 1 | ai_debug_company << 16, 0, CMD_COMPANY_CTRL); DoCommandP(0, 1 | ai_debug_company << 16, 0, CMD_COMPANY_CTRL);
break; break;

View File

@@ -206,7 +206,7 @@ EXPAND_ONLY_PREDEF = YES
SEARCH_INCLUDES = YES SEARCH_INCLUDES = YES
INCLUDE_PATH = INCLUDE_PATH =
INCLUDE_FILE_PATTERNS = INCLUDE_FILE_PATTERNS =
PREDEFINED = DOXYGEN_AI_DOCS PREDEFINED = DOXYGEN_SKIP
EXPAND_AS_DEFINED = DEF_COMMAND EXPAND_AS_DEFINED = DEF_COMMAND
SKIP_FUNCTION_MACROS = YES SKIP_FUNCTION_MACROS = YES
#--------------------------------------------------------------------------- #---------------------------------------------------------------------------

View File

@@ -131,7 +131,7 @@
extern uint8 GetAirportNoiseLevelForTown(const AirportSpec *as, TileIndex town_tile, TileIndex tile); extern uint8 GetAirportNoiseLevelForTown(const AirportSpec *as, TileIndex town_tile, TileIndex tile);
if (!::IsValidTile(tile)) return -1; if (!::IsValidTile(tile)) return -1;
if (!IsAirportInformationAvailable(type)) return -1; if (!IsValidAirportType(type)) return -1;
if (_settings_game.economy.station_noise_level) { if (_settings_game.economy.station_noise_level) {
const AirportSpec *as = ::AirportSpec::Get(type); const AirportSpec *as = ::AirportSpec::Get(type);

View File

@@ -180,7 +180,6 @@ public:
* built at this tile. * built at this tile.
* @param tile The tile to check. * @param tile The tile to check.
* @param type The AirportType to check. * @param type The AirportType to check.
* @pre IsAirportInformationAvailable(type).
* @return The amount of noise added to the nearest town. * @return The amount of noise added to the nearest town.
* @note The noise will be added to the town with TownID GetNearestTown(tile, type). * @note The noise will be added to the town with TownID GetNearestTown(tile, type).
*/ */

View File

@@ -109,7 +109,7 @@ public:
*/ */
static int32 GetMinLength(BridgeID bridge_id); static int32 GetMinLength(BridgeID bridge_id);
#ifndef DOXYGEN_AI_DOCS #ifndef DOXYGEN_SKIP
/** /**
* Internal function to help BuildBridge in case of road. * Internal function to help BuildBridge in case of road.
*/ */

View File

@@ -15,15 +15,6 @@
* functions may still be available if you return an older API version * functions may still be available if you return an older API version
* in GetAPIVersion() in info.nut. * in GetAPIVersion() in info.nut.
* *
* \b 1.1.4
*
* API additions:
* \li AIVehicle::ERR_VEHICLE_TOO_LONG in case vehicle length limit is reached.
*
* \b 1.1.3
*
* No changes
*
* \b 1.1.2 * \b 1.1.2
* *
* No changes * No changes

View File

@@ -278,7 +278,7 @@ public:
*/ */
Money GetRunningCost(); Money GetRunningCost();
#ifdef DOXYGEN_AI_DOCS #ifdef DOXYGEN_SKIP
/** /**
* Get the type of the offered engine. * Get the type of the offered engine.
* @return The type the engine has. * @return The type the engine has.

View File

@@ -10,7 +10,7 @@
/** @file ai_info_docs.hpp Description of the functions an AI can/must provide in AIInfo. */ /** @file ai_info_docs.hpp Description of the functions an AI can/must provide in AIInfo. */
/* This file exists purely for doxygen purposes. */ /* This file exists purely for doxygen purposes. */
#ifdef DOXYGEN_AI_DOCS #ifdef DOXYGEN_SKIP
/** /**
* 'Abstract' class of the class AIs/AI libraries use to register themselves. * 'Abstract' class of the class AIs/AI libraries use to register themselves.
* *

View File

@@ -239,7 +239,7 @@ public:
*/ */
void KeepList(AIList *list); void KeepList(AIList *list);
#ifndef DOXYGEN_AI_DOCS #ifndef DOXYGEN_SKIP
/** /**
* Used for 'foreach()' and [] get from Squirrel. * Used for 'foreach()' and [] get from Squirrel.
*/ */
@@ -280,7 +280,7 @@ public:
* list.Valuate(MyVal, 12); * list.Valuate(MyVal, 12);
*/ */
void Valuate(void *valuator_function, int params, ...); void Valuate(void *valuator_function, int params, ...);
#endif /* DOXYGEN_AI_DOCS */ #endif /* DOXYGEN_SKIP */
}; };
#endif /* AI_LIST_HPP */ #endif /* AI_LIST_HPP */

View File

@@ -37,9 +37,9 @@
AIObject::GetLogPointer() = new LogData(); AIObject::GetLogPointer() = new LogData();
LogData *log = (LogData *)AIObject::GetLogPointer(); LogData *log = (LogData *)AIObject::GetLogPointer();
log->lines = CallocT<char *>(400); log->lines = CallocT<char *>(80);
log->type = CallocT<AILog::AILogType>(400); log->type = CallocT<AILog::AILogType>(80);
log->count = 400; log->count = 80;
log->pos = log->count - 1; log->pos = log->count - 1;
log->used = 0; log->used = 0;
} }

View File

@@ -37,8 +37,6 @@ typedef bool (AIModeProc)();
class AIObject : public SimpleCountedObject { class AIObject : public SimpleCountedObject {
friend void CcAI(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2); friend void CcAI(const CommandCost &result, TileIndex tile, uint32 p1, uint32 p2);
friend class AIInstance; friend class AIInstance;
friend class AIController;
#ifndef DOXYGEN_AI_DOCS
protected: protected:
/** /**
* Executes a raw DoCommand for the AI. * Executes a raw DoCommand for the AI.
@@ -181,45 +179,51 @@ protected:
public: public:
/** /**
* Store the latest result of a DoCommand per company. * Store the latest result of a DoCommand per company.
* @note NEVER use this yourself in your AI!
* @param res The result of the last command. * @param res The result of the last command.
*/ */
static void SetLastCommandRes(bool res); static void SetLastCommandRes(bool res);
/** /**
* Store a new_vehicle_id per company. * Store a new_vehicle_id per company.
* @note NEVER use this yourself in your AI!
* @param vehicle_id The new VehicleID. * @param vehicle_id The new VehicleID.
*/ */
static void SetNewVehicleID(VehicleID vehicle_id); static void SetNewVehicleID(VehicleID vehicle_id);
/** /**
* Store a new_sign_id per company. * Store a new_sign_id per company.
* @note NEVER use this yourself in your AI!
* @param sign_id The new SignID. * @param sign_id The new SignID.
*/ */
static void SetNewSignID(SignID sign_id); static void SetNewSignID(SignID sign_id);
/** /**
* Store a new_tunnel_endtile per company. * Store a new_tunnel_endtile per company.
* @note NEVER use this yourself in your AI!
* @param tile The new TileIndex. * @param tile The new TileIndex.
*/ */
static void SetNewTunnelEndtile(TileIndex tile); static void SetNewTunnelEndtile(TileIndex tile);
/** /**
* Store a new_group_id per company. * Store a new_group_id per company.
* @note NEVER use this yourself in your AI!
* @param group_id The new GroupID. * @param group_id The new GroupID.
*/ */
static void SetNewGroupID(GroupID group_id); static void SetNewGroupID(GroupID group_id);
/** /**
* Store a allow_do_command per company. * Store a allow_do_command per company.
* @note NEVER use this yourself in your AI!
* @param allow The new allow. * @param allow The new allow.
*/ */
static void SetAllowDoCommand(bool allow); static void SetAllowDoCommand(bool allow);
/** /**
* Get the pointer to store log message in. * Get the pointer to store log message in.
* @note NEVER use this yourself in your AI!
*/ */
static void *&GetLogPointer(); static void *&GetLogPointer();
#endif /* DOXYGEN_AI_DOCS */
}; };
#endif /* AI_OBJECT_HPP */ #endif /* AI_OBJECT_HPP */

View File

@@ -75,31 +75,6 @@ static const Order *ResolveOrder(VehicleID vehicle_id, AIOrder::OrderPosition or
return order; return order;
} }
/**
* Convert an AIOrder::OrderPosition (which is the manual order index) to an order index
* as expected by the OpenTTD commands.
* @param order_position The OrderPosition to convert.
* @return An OpenTTD-internal index for the same order.
*/
static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::OrderPosition order_position)
{
const Vehicle *v = ::Vehicle::Get(vehicle_id);
if (order_position == v->GetNumManualOrders()) return v->GetNumOrders();
assert(AIOrder::IsValidVehicleOrder(vehicle_id, order_position));
int res = (int)order_position;
const Order *order = v->orders.list->GetFirstOrder();
for (; order->GetType() == OT_IMPLICIT; order = order->next) res++;
while (order_position > 0) {
order_position = (AIOrder::OrderPosition)(order_position - 1);
order = order->next;
for (; order->GetType() == OT_IMPLICIT; order = order->next) res++;
}
return res;
}
/* static */ bool AIOrder::IsGotoStationOrder(VehicleID vehicle_id, OrderPosition order_position) /* static */ bool AIOrder::IsGotoStationOrder(VehicleID vehicle_id, OrderPosition order_position)
{ {
if (!IsValidVehicleOrder(vehicle_id, order_position)) return false; if (!IsValidVehicleOrder(vehicle_id, order_position)) return false;
@@ -129,7 +104,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
if (order_position == ORDER_CURRENT) return false; if (order_position == ORDER_CURRENT) return false;
if (!IsValidVehicleOrder(vehicle_id, order_position)) return false; if (!IsValidVehicleOrder(vehicle_id, order_position)) return false;
const Order *order = ::Vehicle::Get(vehicle_id)->GetOrder(AIOrderPositionToRealOrderPosition(vehicle_id, order_position)); const Order *order = Vehicle::Get(vehicle_id)->GetOrder(order_position);
return order->GetType() == OT_CONDITIONAL; return order->GetType() == OT_CONDITIONAL;
} }
@@ -138,13 +113,13 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
if (order_position == ORDER_CURRENT) return false; if (order_position == ORDER_CURRENT) return false;
if (!IsValidVehicleOrder(vehicle_id, order_position)) return false; if (!IsValidVehicleOrder(vehicle_id, order_position)) return false;
const Order *order = ::ResolveOrder(vehicle_id, order_position); const Order *order = Vehicle::Get(vehicle_id)->GetOrder(order_position);
return order->GetType() == OT_DUMMY; return order->GetType() == OT_DUMMY;
} }
/* static */ bool AIOrder::IsCurrentOrderPartOfOrderList(VehicleID vehicle_id) /* static */ bool AIOrder::IsCurrentOrderPartOfOrderList(VehicleID vehicle_id)
{ {
if (!AIVehicle::IsValidVehicle(vehicle_id)) return false; if (AIVehicle::IsValidVehicle(vehicle_id)) return false;
if (GetOrderCount(vehicle_id) == 0) return false; if (GetOrderCount(vehicle_id) == 0) return false;
const Order *order = &::Vehicle::Get(vehicle_id)->current_order; const Order *order = &::Vehicle::Get(vehicle_id)->current_order;
@@ -215,7 +190,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
/* static */ int32 AIOrder::GetOrderCount(VehicleID vehicle_id) /* static */ int32 AIOrder::GetOrderCount(VehicleID vehicle_id)
{ {
return AIVehicle::IsValidVehicle(vehicle_id) ? ::Vehicle::Get(vehicle_id)->GetNumManualOrders() : -1; return AIVehicle::IsValidVehicle(vehicle_id) ? ::Vehicle::Get(vehicle_id)->GetNumOrders() : -1;
} }
/* static */ TileIndex AIOrder::GetOrderDestination(VehicleID vehicle_id, OrderPosition order_position) /* static */ TileIndex AIOrder::GetOrderDestination(VehicleID vehicle_id, OrderPosition order_position)
@@ -362,8 +337,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
EnforcePrecondition(false, order_position != ORDER_CURRENT && IsConditionalOrder(vehicle_id, order_position)); EnforcePrecondition(false, order_position != ORDER_CURRENT && IsConditionalOrder(vehicle_id, order_position));
EnforcePrecondition(false, condition >= OC_LOAD_PERCENTAGE && condition <= OC_UNCONDITIONALLY); EnforcePrecondition(false, condition >= OC_LOAD_PERCENTAGE && condition <= OC_UNCONDITIONALLY);
int order_pos = AIOrderPositionToRealOrderPosition(vehicle_id, order_position); return AIObject::DoCommand(0, vehicle_id | (order_position << 20), MOF_COND_VARIABLE | (condition << 4), CMD_MODIFY_ORDER);
return AIObject::DoCommand(0, vehicle_id | (order_pos << 20), MOF_COND_VARIABLE | (condition << 4), CMD_MODIFY_ORDER);
} }
/* static */ bool AIOrder::SetOrderCompareFunction(VehicleID vehicle_id, OrderPosition order_position, CompareFunction compare) /* static */ bool AIOrder::SetOrderCompareFunction(VehicleID vehicle_id, OrderPosition order_position, CompareFunction compare)
@@ -372,8 +346,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
EnforcePrecondition(false, order_position != ORDER_CURRENT && IsConditionalOrder(vehicle_id, order_position)); EnforcePrecondition(false, order_position != ORDER_CURRENT && IsConditionalOrder(vehicle_id, order_position));
EnforcePrecondition(false, compare >= CF_EQUALS && compare <= CF_IS_FALSE); EnforcePrecondition(false, compare >= CF_EQUALS && compare <= CF_IS_FALSE);
int order_pos = AIOrderPositionToRealOrderPosition(vehicle_id, order_position); return AIObject::DoCommand(0, vehicle_id | (order_position << 20), MOF_COND_COMPARATOR | (compare << 4), CMD_MODIFY_ORDER);
return AIObject::DoCommand(0, vehicle_id | (order_pos << 20), MOF_COND_COMPARATOR | (compare << 4), CMD_MODIFY_ORDER);
} }
/* static */ bool AIOrder::SetOrderCompareValue(VehicleID vehicle_id, OrderPosition order_position, int32 value) /* static */ bool AIOrder::SetOrderCompareValue(VehicleID vehicle_id, OrderPosition order_position, int32 value)
@@ -383,8 +356,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
EnforcePrecondition(false, value >= 0 && value < 2048); EnforcePrecondition(false, value >= 0 && value < 2048);
if (GetOrderCondition(vehicle_id, order_position) == OC_MAX_SPEED) value = value * 10 / 16; if (GetOrderCondition(vehicle_id, order_position) == OC_MAX_SPEED) value = value * 10 / 16;
int order_pos = AIOrderPositionToRealOrderPosition(vehicle_id, order_position); return AIObject::DoCommand(0, vehicle_id | (order_position << 20), MOF_COND_VALUE | (value << 4), CMD_MODIFY_ORDER);
return AIObject::DoCommand(0, vehicle_id | (order_pos << 20), MOF_COND_VALUE | (value << 4), CMD_MODIFY_ORDER);
} }
/* static */ bool AIOrder::SetStopLocation(VehicleID vehicle_id, OrderPosition order_position, StopLocation stop_location) /* static */ bool AIOrder::SetStopLocation(VehicleID vehicle_id, OrderPosition order_position, StopLocation stop_location)
@@ -394,10 +366,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
EnforcePrecondition(false, IsGotoStationOrder(vehicle_id, order_position)); EnforcePrecondition(false, IsGotoStationOrder(vehicle_id, order_position));
EnforcePrecondition(false, stop_location >= STOPLOCATION_NEAR && stop_location <= STOPLOCATION_FAR); EnforcePrecondition(false, stop_location >= STOPLOCATION_NEAR && stop_location <= STOPLOCATION_FAR);
order_position = AIOrder::ResolveOrderPosition(vehicle_id, order_position); uint32 p1 = vehicle_id | (order_position << 20);
int order_pos = AIOrderPositionToRealOrderPosition(vehicle_id, order_position);
uint32 p1 = vehicle_id | (order_pos << 20);
uint32 p2 = MOF_STOP_LOCATION | (stop_location << 4); uint32 p2 = MOF_STOP_LOCATION | (stop_location << 4);
return AIObject::DoCommand(0, p1, p2, CMD_MODIFY_ORDER); return AIObject::DoCommand(0, p1, p2, CMD_MODIFY_ORDER);
} }
@@ -407,7 +376,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
EnforcePrecondition(false, AIVehicle::IsValidVehicle(vehicle_id)); EnforcePrecondition(false, AIVehicle::IsValidVehicle(vehicle_id));
EnforcePrecondition(false, AreOrderFlagsValid(destination, order_flags)); EnforcePrecondition(false, AreOrderFlagsValid(destination, order_flags));
return InsertOrder(vehicle_id, (AIOrder::OrderPosition)::Vehicle::Get(vehicle_id)->GetNumManualOrders(), destination, order_flags); return InsertOrder(vehicle_id, (AIOrder::OrderPosition)::Vehicle::Get(vehicle_id)->GetNumOrders(), destination, order_flags);
} }
/* static */ bool AIOrder::AppendConditionalOrder(VehicleID vehicle_id, OrderPosition jump_to) /* static */ bool AIOrder::AppendConditionalOrder(VehicleID vehicle_id, OrderPosition jump_to)
@@ -415,7 +384,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
EnforcePrecondition(false, AIVehicle::IsValidVehicle(vehicle_id)); EnforcePrecondition(false, AIVehicle::IsValidVehicle(vehicle_id));
EnforcePrecondition(false, IsValidVehicleOrder(vehicle_id, jump_to)); EnforcePrecondition(false, IsValidVehicleOrder(vehicle_id, jump_to));
return InsertConditionalOrder(vehicle_id, (AIOrder::OrderPosition)::Vehicle::Get(vehicle_id)->GetNumManualOrders(), jump_to); return InsertConditionalOrder(vehicle_id, (AIOrder::OrderPosition)::Vehicle::Get(vehicle_id)->GetNumOrders(), jump_to);
} }
/* static */ bool AIOrder::InsertOrder(VehicleID vehicle_id, OrderPosition order_position, TileIndex destination, AIOrder::AIOrderFlags order_flags) /* static */ bool AIOrder::InsertOrder(VehicleID vehicle_id, OrderPosition order_position, TileIndex destination, AIOrder::AIOrderFlags order_flags)
@@ -424,7 +393,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
if (order_position == ORDER_CURRENT) order_position = AIOrder::ResolveOrderPosition(vehicle_id, order_position); if (order_position == ORDER_CURRENT) order_position = AIOrder::ResolveOrderPosition(vehicle_id, order_position);
EnforcePrecondition(false, AIVehicle::IsValidVehicle(vehicle_id)); EnforcePrecondition(false, AIVehicle::IsValidVehicle(vehicle_id));
EnforcePrecondition(false, order_position >= 0 && order_position <= ::Vehicle::Get(vehicle_id)->GetNumManualOrders()); EnforcePrecondition(false, order_position >= 0 && order_position <= ::Vehicle::Get(vehicle_id)->GetNumOrders());
EnforcePrecondition(false, AreOrderFlagsValid(destination, order_flags)); EnforcePrecondition(false, AreOrderFlagsValid(destination, order_flags));
Order order; Order order;
@@ -468,8 +437,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
order.SetNonStopType((OrderNonStopFlags)GB(order_flags, 0, 2)); order.SetNonStopType((OrderNonStopFlags)GB(order_flags, 0, 2));
int order_pos = AIOrderPositionToRealOrderPosition(vehicle_id, order_position); return AIObject::DoCommand(0, vehicle_id | (order_position << 20), order.Pack(), CMD_INSERT_ORDER);
return AIObject::DoCommand(0, vehicle_id | (order_pos << 20), order.Pack(), CMD_INSERT_ORDER);
} }
/* static */ bool AIOrder::InsertConditionalOrder(VehicleID vehicle_id, OrderPosition order_position, OrderPosition jump_to) /* static */ bool AIOrder::InsertConditionalOrder(VehicleID vehicle_id, OrderPosition order_position, OrderPosition jump_to)
@@ -478,14 +446,12 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
if (order_position == ORDER_CURRENT) order_position = AIOrder::ResolveOrderPosition(vehicle_id, order_position); if (order_position == ORDER_CURRENT) order_position = AIOrder::ResolveOrderPosition(vehicle_id, order_position);
EnforcePrecondition(false, AIVehicle::IsValidVehicle(vehicle_id)); EnforcePrecondition(false, AIVehicle::IsValidVehicle(vehicle_id));
EnforcePrecondition(false, order_position >= 0 && order_position <= ::Vehicle::Get(vehicle_id)->GetNumManualOrders()); EnforcePrecondition(false, IsValidVehicleOrder(vehicle_id, jump_to));
EnforcePrecondition(false, IsValidVehicleOrder(vehicle_id, jump_to) && jump_to != ORDER_CURRENT);
Order order; Order order;
order.MakeConditional(jump_to); order.MakeConditional(jump_to);
int order_pos = AIOrderPositionToRealOrderPosition(vehicle_id, order_position); return AIObject::DoCommand(0, vehicle_id | (order_position << 20), order.Pack(), CMD_INSERT_ORDER);
return AIObject::DoCommand(0, vehicle_id | (order_pos << 20), order.Pack(), CMD_INSERT_ORDER);
} }
/* static */ bool AIOrder::RemoveOrder(VehicleID vehicle_id, OrderPosition order_position) /* static */ bool AIOrder::RemoveOrder(VehicleID vehicle_id, OrderPosition order_position)
@@ -494,8 +460,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
EnforcePrecondition(false, IsValidVehicleOrder(vehicle_id, order_position)); EnforcePrecondition(false, IsValidVehicleOrder(vehicle_id, order_position));
int order_pos = AIOrderPositionToRealOrderPosition(vehicle_id, order_position); return AIObject::DoCommand(0, vehicle_id, order_position, CMD_DELETE_ORDER);
return AIObject::DoCommand(0, vehicle_id, order_pos, CMD_DELETE_ORDER);
} }
/* static */ bool AIOrder::SkipToOrder(VehicleID vehicle_id, OrderPosition next_order) /* static */ bool AIOrder::SkipToOrder(VehicleID vehicle_id, OrderPosition next_order)
@@ -504,8 +469,7 @@ static int AIOrderPositionToRealOrderPosition(VehicleID vehicle_id, AIOrder::Ord
EnforcePrecondition(false, IsValidVehicleOrder(vehicle_id, next_order)); EnforcePrecondition(false, IsValidVehicleOrder(vehicle_id, next_order));
int order_pos = AIOrderPositionToRealOrderPosition(vehicle_id, next_order); return AIObject::DoCommand(0, vehicle_id, next_order, CMD_SKIP_TO_ORDER);
return AIObject::DoCommand(0, vehicle_id, order_pos, CMD_SKIP_TO_ORDER);
} }
/** /**
@@ -542,14 +506,13 @@ static void _DoCommandReturnSetOrderFlags(class AIInstance *instance)
EnforcePrecondition(false, AreOrderFlagsValid(GetOrderDestination(vehicle_id, order_position), order_flags)); EnforcePrecondition(false, AreOrderFlagsValid(GetOrderDestination(vehicle_id, order_position), order_flags));
const Order *order = ::ResolveOrder(vehicle_id, order_position); const Order *order = ::ResolveOrder(vehicle_id, order_position);
int order_pos = AIOrderPositionToRealOrderPosition(vehicle_id, order_position);
AIOrderFlags current = GetOrderFlags(vehicle_id, order_position); AIOrderFlags current = GetOrderFlags(vehicle_id, order_position);
EnforcePrecondition(false, (order_flags & AIOF_GOTO_NEAREST_DEPOT) == (current & AIOF_GOTO_NEAREST_DEPOT)); EnforcePrecondition(false, (order_flags & AIOF_GOTO_NEAREST_DEPOT) == (current & AIOF_GOTO_NEAREST_DEPOT));
if ((current & AIOF_NON_STOP_FLAGS) != (order_flags & AIOF_NON_STOP_FLAGS)) { if ((current & AIOF_NON_STOP_FLAGS) != (order_flags & AIOF_NON_STOP_FLAGS)) {
return AIObject::DoCommand(0, vehicle_id | (order_pos << 20), (order_flags & AIOF_NON_STOP_FLAGS) << 4 | MOF_NON_STOP, CMD_MODIFY_ORDER, NULL, &::_DoCommandReturnSetOrderFlags); return AIObject::DoCommand(0, vehicle_id | (order_position << 20), (order_flags & AIOF_NON_STOP_FLAGS) << 4 | MOF_NON_STOP, CMD_MODIFY_ORDER, NULL, &_DoCommandReturnSetOrderFlags);
} }
switch (order->GetType()) { switch (order->GetType()) {
@@ -558,16 +521,16 @@ static void _DoCommandReturnSetOrderFlags(class AIInstance *instance)
uint data = DA_ALWAYS_GO; uint data = DA_ALWAYS_GO;
if (order_flags & AIOF_SERVICE_IF_NEEDED) data = DA_SERVICE; if (order_flags & AIOF_SERVICE_IF_NEEDED) data = DA_SERVICE;
if (order_flags & AIOF_STOP_IN_DEPOT) data = DA_STOP; if (order_flags & AIOF_STOP_IN_DEPOT) data = DA_STOP;
return AIObject::DoCommand(0, vehicle_id | (order_pos << 20), (data << 4) | MOF_DEPOT_ACTION, CMD_MODIFY_ORDER, NULL, &::_DoCommandReturnSetOrderFlags); return AIObject::DoCommand(0, vehicle_id | (order_position << 20), (data << 4) | MOF_DEPOT_ACTION, CMD_MODIFY_ORDER, NULL, &_DoCommandReturnSetOrderFlags);
} }
break; break;
case OT_GOTO_STATION: case OT_GOTO_STATION:
if ((current & AIOF_UNLOAD_FLAGS) != (order_flags & AIOF_UNLOAD_FLAGS)) { if ((current & AIOF_UNLOAD_FLAGS) != (order_flags & AIOF_UNLOAD_FLAGS)) {
return AIObject::DoCommand(0, vehicle_id | (order_pos << 20), (order_flags & AIOF_UNLOAD_FLAGS) << 2 | MOF_UNLOAD, CMD_MODIFY_ORDER, NULL, &::_DoCommandReturnSetOrderFlags); return AIObject::DoCommand(0, vehicle_id | (order_position << 20), (order_flags & AIOF_UNLOAD_FLAGS) << 2 | MOF_UNLOAD, CMD_MODIFY_ORDER, NULL, &_DoCommandReturnSetOrderFlags);
} }
if ((current & AIOF_LOAD_FLAGS) != (order_flags & AIOF_LOAD_FLAGS)) { if ((current & AIOF_LOAD_FLAGS) != (order_flags & AIOF_LOAD_FLAGS)) {
return AIObject::DoCommand(0, vehicle_id | (order_pos << 20), (order_flags & AIOF_LOAD_FLAGS) >> 1 | MOF_LOAD, CMD_MODIFY_ORDER, NULL, &::_DoCommandReturnSetOrderFlags); return AIObject::DoCommand(0, vehicle_id | (order_position << 20), (order_flags & AIOF_LOAD_FLAGS) >> 1 | MOF_LOAD, CMD_MODIFY_ORDER, NULL, &_DoCommandReturnSetOrderFlags);
} }
break; break;
@@ -598,9 +561,7 @@ static void _DoCommandReturnSetOrderFlags(class AIInstance *instance)
EnforcePrecondition(false, IsValidVehicleOrder(vehicle_id, order_position_move)); EnforcePrecondition(false, IsValidVehicleOrder(vehicle_id, order_position_move));
EnforcePrecondition(false, IsValidVehicleOrder(vehicle_id, order_position_target)); EnforcePrecondition(false, IsValidVehicleOrder(vehicle_id, order_position_target));
int order_pos_move = AIOrderPositionToRealOrderPosition(vehicle_id, order_position_move); return AIObject::DoCommand(0, vehicle_id, order_position_move | (order_position_target << 16), CMD_MOVE_ORDER);
int order_pos_target = AIOrderPositionToRealOrderPosition(vehicle_id, order_position_target);
return AIObject::DoCommand(0, vehicle_id, order_pos_move | (order_pos_target << 16), CMD_MOVE_ORDER);
} }
/* static */ bool AIOrder::CopyOrders(VehicleID vehicle_id, VehicleID main_vehicle_id) /* static */ bool AIOrder::CopyOrders(VehicleID vehicle_id, VehicleID main_vehicle_id)

View File

@@ -443,12 +443,12 @@ public:
*/ */
static bool RemoveOrder(VehicleID vehicle_id, OrderPosition order_position); static bool RemoveOrder(VehicleID vehicle_id, OrderPosition order_position);
#ifndef DOXYGEN_AI_DOCS #ifndef DOXYGEN_SKIP
/** /**
* Internal function to help SetOrderFlags. * Internal function to help SetOrderFlags.
*/ */
static bool _SetOrderFlags(); static bool _SetOrderFlags();
#endif /* DOXYGEN_AI_DOCS */ #endif /* DOXYGEN_SKIP */
/** /**
* Changes the order flags of the given order. * Changes the order flags of the given order.

View File

@@ -14,7 +14,6 @@
#include "ai_map.hpp" #include "ai_map.hpp"
#include "ai_station.hpp" #include "ai_station.hpp"
#include "ai_industrytype.hpp" #include "ai_industrytype.hpp"
#include "ai_cargo.hpp"
#include "../../debug.h" #include "../../debug.h"
#include "../../station_base.h" #include "../../station_base.h"
#include "../../company_func.h" #include "../../company_func.h"
@@ -171,7 +170,6 @@
EnforcePrecondition(false, platform_length > 0 && platform_length <= 0xFF); EnforcePrecondition(false, platform_length > 0 && platform_length <= 0xFF);
EnforcePrecondition(false, IsRailTypeAvailable(GetCurrentRailType())); EnforcePrecondition(false, IsRailTypeAvailable(GetCurrentRailType()));
EnforcePrecondition(false, station_id == AIStation::STATION_NEW || station_id == AIStation::STATION_JOIN_ADJACENT || AIStation::IsValidStation(station_id)); EnforcePrecondition(false, station_id == AIStation::STATION_NEW || station_id == AIStation::STATION_JOIN_ADJACENT || AIStation::IsValidStation(station_id));
EnforcePrecondition(false, AICargo::IsValidCargo(cargo_id));
EnforcePrecondition(false, source_industry == AIIndustryType::INDUSTRYTYPE_UNKNOWN || source_industry == AIIndustryType::INDUSTRYTYPE_TOWN || AIIndustryType::IsValidIndustryType(source_industry)); EnforcePrecondition(false, source_industry == AIIndustryType::INDUSTRYTYPE_UNKNOWN || source_industry == AIIndustryType::INDUSTRYTYPE_TOWN || AIIndustryType::IsValidIndustryType(source_industry));
EnforcePrecondition(false, goal_industry == AIIndustryType::INDUSTRYTYPE_UNKNOWN || goal_industry == AIIndustryType::INDUSTRYTYPE_TOWN || AIIndustryType::IsValidIndustryType(goal_industry)); EnforcePrecondition(false, goal_industry == AIIndustryType::INDUSTRYTYPE_UNKNOWN || goal_industry == AIIndustryType::INDUSTRYTYPE_TOWN || AIIndustryType::IsValidIndustryType(goal_industry));

View File

@@ -279,7 +279,6 @@ public:
* @pre num_platforms > 0 && num_platforms <= 255. * @pre num_platforms > 0 && num_platforms <= 255.
* @pre platform_length > 0 && platform_length <= 255. * @pre platform_length > 0 && platform_length <= 255.
* @pre station_id == AIStation::STATION_NEW || station_id == AIStation::STATION_JOIN_ADJACENT || AIStation::IsValidStation(station_id). * @pre station_id == AIStation::STATION_NEW || station_id == AIStation::STATION_JOIN_ADJACENT || AIStation::IsValidStation(station_id).
* @pre AICargo::IsValidCargo(cargo_type)
* @pre source_industry == AIIndustryType::INDUSTRYTYPE_UNKNOWN || source_industry == AIIndustryType::INDUSTRYTYPE_TOWN || AIIndustryType::IsValidIndustryType(source_industry). * @pre source_industry == AIIndustryType::INDUSTRYTYPE_UNKNOWN || source_industry == AIIndustryType::INDUSTRYTYPE_TOWN || AIIndustryType::IsValidIndustryType(source_industry).
* @pre goal_industry == AIIndustryType::INDUSTRYTYPE_UNKNOWN || goal_industry == AIIndustryType::INDUSTRYTYPE_TOWN || AIIndustryType::IsValidIndustryType(goal_industry). * @pre goal_industry == AIIndustryType::INDUSTRYTYPE_UNKNOWN || goal_industry == AIIndustryType::INDUSTRYTYPE_TOWN || AIIndustryType::IsValidIndustryType(goal_industry).
* @exception AIError::ERR_OWNED_BY_ANOTHER_COMPANY * @exception AIError::ERR_OWNED_BY_ANOTHER_COMPANY

View File

@@ -117,8 +117,7 @@ public:
/** /**
* Find out if this station is within the rating influence of a town. * Find out if this station is within the rating influence of a town.
* The service quality of stations with signs within this radius * Stations within the radius influence the rating of the town.
* influences the rating of the town.
* @param station_id The station to check. * @param station_id The station to check.
* @param town_id The town to check. * @param town_id The town to check.
* @return True if the tile is within the rating influence of the town. * @return True if the tile is within the rating influence of the town.

View File

@@ -13,7 +13,6 @@
#include "ai_tile.hpp" #include "ai_tile.hpp"
#include "ai_map.hpp" #include "ai_map.hpp"
#include "ai_town.hpp" #include "ai_town.hpp"
#include "ai_cargo.hpp"
#include "../../station_func.h" #include "../../station_func.h"
#include "../../company_func.h" #include "../../company_func.h"
#include "../../water_map.h" #include "../../water_map.h"
@@ -193,7 +192,7 @@
/* static */ int32 AITile::GetCargoAcceptance(TileIndex tile, CargoID cargo_type, int width, int height, int radius) /* static */ int32 AITile::GetCargoAcceptance(TileIndex tile, CargoID cargo_type, int width, int height, int radius)
{ {
if (!::IsValidTile(tile) || width <= 0 || height <= 0 || radius < 0 || !AICargo::IsValidCargo(cargo_type)) return -1; if (!::IsValidTile(tile) || width <= 0 || height <= 0 || radius < 0) return -1;
CargoArray acceptance = ::GetAcceptanceAroundTiles(tile, width, height, _settings_game.station.modified_catchment ? radius : (int)CA_UNMODIFIED); CargoArray acceptance = ::GetAcceptanceAroundTiles(tile, width, height, _settings_game.station.modified_catchment ? radius : (int)CA_UNMODIFIED);
return acceptance[cargo_type]; return acceptance[cargo_type];
@@ -201,7 +200,7 @@
/* static */ int32 AITile::GetCargoProduction(TileIndex tile, CargoID cargo_type, int width, int height, int radius) /* static */ int32 AITile::GetCargoProduction(TileIndex tile, CargoID cargo_type, int width, int height, int radius)
{ {
if (!::IsValidTile(tile) || width <= 0 || height <= 0 || radius < 0 || !AICargo::IsValidCargo(cargo_type)) return -1; if (!::IsValidTile(tile) || width <= 0 || height <= 0 || radius < 0) return -1;
CargoArray produced = ::GetProductionAroundTiles(tile, width, height, _settings_game.station.modified_catchment ? radius : (int)CA_UNMODIFIED); CargoArray produced = ::GetProductionAroundTiles(tile, width, height, _settings_game.station.modified_catchment ? radius : (int)CA_UNMODIFIED);
return produced[cargo_type]; return produced[cargo_type];

View File

@@ -319,7 +319,6 @@ public:
* @param height The height of the station. * @param height The height of the station.
* @param radius The radius of the station. * @param radius The radius of the station.
* @pre AIMap::IsValidTile(tile). * @pre AIMap::IsValidTile(tile).
* @pre AICargo::IsValidCargo(cargo_type)
* @pre width > 0. * @pre width > 0.
* @pre height > 0. * @pre height > 0.
* @pre radius >= 0. * @pre radius >= 0.
@@ -336,7 +335,6 @@ public:
* @param height The height of the station. * @param height The height of the station.
* @param radius The radius of the station. * @param radius The radius of the station.
* @pre AIMap::IsValidTile(tile). * @pre AIMap::IsValidTile(tile).
* @pre AICargo::IsValidCargo(cargo_type)
* @pre width > 0. * @pre width > 0.
* @pre height > 0. * @pre height > 0.
* @pre radius >= 0. * @pre radius >= 0.
@@ -441,8 +439,7 @@ public:
/** /**
* Find out if this tile is within the rating influence of a town. * Find out if this tile is within the rating influence of a town.
* If a station sign would be on this tile, the servicing quality of the station would * Stations on this tile influence the rating of the town.
* influence the rating of the town.
* @param tile The tile to check. * @param tile The tile to check.
* @param town_id The town to check. * @param town_id The town to check.
* @return True if the tile is within the rating influence of the town. * @return True if the tile is within the rating influence of the town.

View File

@@ -209,8 +209,7 @@ public:
/** /**
* Find out if this tile is within the rating influence of a town. * Find out if this tile is within the rating influence of a town.
* If a station sign would be on this tile, the servicing quality of the station would * Stations on this tile influence the rating of the town.
* influence the rating of the town.
* @param town_id The town to check. * @param town_id The town to check.
* @param tile The tile to check. * @param tile The tile to check.
* @pre IsValidTown(town_id). * @pre IsValidTown(town_id).

View File

@@ -65,7 +65,7 @@ public:
*/ */
static TileIndex GetOtherTunnelEnd(TileIndex tile); static TileIndex GetOtherTunnelEnd(TileIndex tile);
#ifndef DOXYGEN_AI_DOCS #ifndef DOXYGEN_SKIP
/** /**
* Internal function to help BuildTunnel in case of road. * Internal function to help BuildTunnel in case of road.
*/ */
@@ -75,7 +75,7 @@ public:
* Internal function to help BuildTunnel in case of road. * Internal function to help BuildTunnel in case of road.
*/ */
static bool _BuildTunnelRoad2(); static bool _BuildTunnelRoad2();
#endif /* DOXYGEN_AI_DOCS */ #endif /* DOXYGEN_SKIP */
/** /**
* Builds a tunnel starting at start. The direction of the tunnel depends * Builds a tunnel starting at start. The direction of the tunnel depends

View File

@@ -65,8 +65,6 @@ public:
/** Vehicle is without power */ /** Vehicle is without power */
ERR_VEHICLE_NO_POWER, // [STR_ERROR_TRAIN_START_NO_CATENARY] ERR_VEHICLE_NO_POWER, // [STR_ERROR_TRAIN_START_NO_CATENARY]
/** Vehicle would get too long during construction. */
ERR_VEHICLE_TOO_LONG, // [STR_ERROR_TRAIN_TOO_LONG]
}; };
/** /**

View File

@@ -47,7 +47,6 @@ void SQAIVehicle_Register(Squirrel *engine)
SQAIVehicle.DefSQConst(engine, AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT, "ERR_VEHICLE_NOT_IN_DEPOT"); SQAIVehicle.DefSQConst(engine, AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT, "ERR_VEHICLE_NOT_IN_DEPOT");
SQAIVehicle.DefSQConst(engine, AIVehicle::ERR_VEHICLE_IN_FLIGHT, "ERR_VEHICLE_IN_FLIGHT"); SQAIVehicle.DefSQConst(engine, AIVehicle::ERR_VEHICLE_IN_FLIGHT, "ERR_VEHICLE_IN_FLIGHT");
SQAIVehicle.DefSQConst(engine, AIVehicle::ERR_VEHICLE_NO_POWER, "ERR_VEHICLE_NO_POWER"); SQAIVehicle.DefSQConst(engine, AIVehicle::ERR_VEHICLE_NO_POWER, "ERR_VEHICLE_NO_POWER");
SQAIVehicle.DefSQConst(engine, AIVehicle::ERR_VEHICLE_TOO_LONG, "ERR_VEHICLE_TOO_LONG");
SQAIVehicle.DefSQConst(engine, AIVehicle::VT_RAIL, "VT_RAIL"); SQAIVehicle.DefSQConst(engine, AIVehicle::VT_RAIL, "VT_RAIL");
SQAIVehicle.DefSQConst(engine, AIVehicle::VT_ROAD, "VT_ROAD"); SQAIVehicle.DefSQConst(engine, AIVehicle::VT_ROAD, "VT_ROAD");
SQAIVehicle.DefSQConst(engine, AIVehicle::VT_WATER, "VT_WATER"); SQAIVehicle.DefSQConst(engine, AIVehicle::VT_WATER, "VT_WATER");
@@ -96,7 +95,6 @@ void SQAIVehicle_Register(Squirrel *engine)
AIError::RegisterErrorMap(STR_ERROR_SHIP_MUST_BE_STOPPED_INSIDE_DEPOT, AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT); AIError::RegisterErrorMap(STR_ERROR_SHIP_MUST_BE_STOPPED_INSIDE_DEPOT, AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT);
AIError::RegisterErrorMap(STR_ERROR_AIRCRAFT_IS_IN_FLIGHT, AIVehicle::ERR_VEHICLE_IN_FLIGHT); AIError::RegisterErrorMap(STR_ERROR_AIRCRAFT_IS_IN_FLIGHT, AIVehicle::ERR_VEHICLE_IN_FLIGHT);
AIError::RegisterErrorMap(STR_ERROR_TRAIN_START_NO_CATENARY, AIVehicle::ERR_VEHICLE_NO_POWER); AIError::RegisterErrorMap(STR_ERROR_TRAIN_START_NO_CATENARY, AIVehicle::ERR_VEHICLE_NO_POWER);
AIError::RegisterErrorMap(STR_ERROR_TRAIN_TOO_LONG, AIVehicle::ERR_VEHICLE_TOO_LONG);
AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_TOO_MANY, "ERR_VEHICLE_TOO_MANY"); AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_TOO_MANY, "ERR_VEHICLE_TOO_MANY");
AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_NOT_AVAILABLE, "ERR_VEHICLE_NOT_AVAILABLE"); AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_NOT_AVAILABLE, "ERR_VEHICLE_NOT_AVAILABLE");
@@ -110,7 +108,6 @@ void SQAIVehicle_Register(Squirrel *engine)
AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT, "ERR_VEHICLE_NOT_IN_DEPOT"); AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_NOT_IN_DEPOT, "ERR_VEHICLE_NOT_IN_DEPOT");
AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_IN_FLIGHT, "ERR_VEHICLE_IN_FLIGHT"); AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_IN_FLIGHT, "ERR_VEHICLE_IN_FLIGHT");
AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_NO_POWER, "ERR_VEHICLE_NO_POWER"); AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_NO_POWER, "ERR_VEHICLE_NO_POWER");
AIError::RegisterErrorMapString(AIVehicle::ERR_VEHICLE_TOO_LONG, "ERR_VEHICLE_TOO_LONG");
SQAIVehicle.DefSQStaticMethod(engine, &AIVehicle::IsValidVehicle, "IsValidVehicle", 2, ".i"); SQAIVehicle.DefSQStaticMethod(engine, &AIVehicle::IsValidVehicle, "IsValidVehicle", 2, ".i");
SQAIVehicle.DefSQStaticMethod(engine, &AIVehicle::GetNumWagons, "GetNumWagons", 2, ".i"); SQAIVehicle.DefSQStaticMethod(engine, &AIVehicle::GetNumWagons, "GetNumWagons", 2, ".i");

View File

@@ -102,9 +102,9 @@ BEGIN {
/^( *)private/ { if (cls_level == 1) public = "false"; next; } /^( *)private/ { if (cls_level == 1) public = "false"; next; }
# Ignore special doxygen blocks # Ignore special doxygen blocks
/^#ifndef DOXYGEN_AI_DOCS/ { doxygen_skip = "next"; next; } /^#ifndef DOXYGEN_SKIP/ { doxygen_skip = "next"; next; }
/^#ifdef DOXYGEN_AI_DOCS/ { doxygen_skip = "true"; next; } /^#ifdef DOXYGEN_SKIP/ { doxygen_skip = "true"; next; }
/^#endif \/\* DOXYGEN_AI_DOCS \*\// { doxygen_skip = "false"; next; } /^#endif \/\* DOXYGEN_SKIP \*\// { doxygen_skip = "false"; next; }
/^#else/ { /^#else/ {
if (doxygen_skip == "next") { if (doxygen_skip == "next") {
doxygen_skip = "true"; doxygen_skip = "true";

View File

@@ -31,7 +31,7 @@ void GetAircraftSpriteSize(EngineID engine, uint &width, uint &height);
void UpdateAirplanesOnNewStation(const Station *st); void UpdateAirplanesOnNewStation(const Station *st);
void UpdateAircraftCache(Aircraft *v); void UpdateAircraftCache(Aircraft *v);
void AircraftLeaveHangar(Aircraft *v, Direction exit_dir); void AircraftLeaveHangar(Aircraft *v);
void AircraftNextAirportPos_and_Order(Aircraft *v); void AircraftNextAirportPos_and_Order(Aircraft *v);
void SetAircraftPosition(Aircraft *v, int x, int y, int z); void SetAircraftPosition(Aircraft *v, int x, int y, int z);
byte GetAircraftFlyingAltitude(const Aircraft *v); byte GetAircraftFlyingAltitude(const Aircraft *v);

View File

@@ -1243,20 +1243,12 @@ void AircraftNextAirportPos_and_Order(Aircraft *v)
v->pos = v->previous_pos = AircraftGetEntryPoint(v, apc, rotation); v->pos = v->previous_pos = AircraftGetEntryPoint(v, apc, rotation);
} }
/** void AircraftLeaveHangar(Aircraft *v)
* Aircraft is about to leave the hangar.
* @param v Aircraft leaving.
* @param exit_dir The direction the vehicle leaves the hangar.
* @note This function is called in AfterLoadGame for old savegames, so don't rely
* on any data to be valid, especially don't rely on the fact that the vehicle
* is actually on the ground inside a depot.
*/
void AircraftLeaveHangar(Aircraft *v, Direction exit_dir)
{ {
v->cur_speed = 0; v->cur_speed = 0;
v->subspeed = 0; v->subspeed = 0;
v->progress = 0; v->progress = 0;
v->direction = exit_dir; v->direction = DIR_SE;
v->vehstatus &= ~VS_HIDDEN; v->vehstatus &= ~VS_HIDDEN;
{ {
Vehicle *u = v->Next(); Vehicle *u = v->Next();
@@ -1341,8 +1333,7 @@ static void AircraftEventHandler_InHangar(Aircraft *v, const AirportFTAClass *ap
/* airplane goto state takeoff, helicopter to helitakeoff */ /* airplane goto state takeoff, helicopter to helitakeoff */
v->state = (v->subtype == AIR_HELICOPTER) ? HELITAKEOFF : TAKEOFF; v->state = (v->subtype == AIR_HELICOPTER) ? HELITAKEOFF : TAKEOFF;
} }
const Station *st = Station::GetByTile(v->tile); AircraftLeaveHangar(v);
AircraftLeaveHangar(v, st->airport.GetHangarExitDirection(v->tile));
AirportMove(v, apc); AirportMove(v, apc);
} }

View File

@@ -26,7 +26,6 @@
#include "widgets/dropdown_type.h" #include "widgets/dropdown_type.h"
#include "core/geometry_func.hpp" #include "core/geometry_func.hpp"
#include "hotkeys.h" #include "hotkeys.h"
#include "vehicle_func.h"
#include "sprite.h" #include "sprite.h"
#include "table/strings.h" #include "table/strings.h"
@@ -196,7 +195,6 @@ Window *ShowBuildAirToolbar()
EventState AirportToolbarGlobalHotkeys(uint16 key, uint16 keycode) EventState AirportToolbarGlobalHotkeys(uint16 key, uint16 keycode)
{ {
if (!CanBuildVehicleInfrastructure(VEH_AIRCRAFT)) return ES_NOT_HANDLED;
int num = CheckHotkeyMatch<BuildAirToolbarWindow>(_airtoolbar_hotkeys, keycode, NULL, true); int num = CheckHotkeyMatch<BuildAirToolbarWindow>(_airtoolbar_hotkeys, keycode, NULL, true);
if (num == -1) return ES_NOT_HANDLED; if (num == -1) return ES_NOT_HANDLED;
Window *w = ShowBuildAirToolbar(); Window *w = ShowBuildAirToolbar();

View File

@@ -213,35 +213,29 @@ static CargoID GetNewCargoTypeForReplace(Vehicle *v, EngineID engine_type, bool
* Get the EngineID of the replacement for a vehicle * Get the EngineID of the replacement for a vehicle
* @param v The vehicle to find a replacement for * @param v The vehicle to find a replacement for
* @param c The vehicle's owner (it's faster to forward the pointer than refinding it) * @param c The vehicle's owner (it's faster to forward the pointer than refinding it)
* @param [out] e the EngineID of the replacement. INVALID_ENGINE if no replacement is found * @return the EngineID of the replacement. INVALID_ENGINE if no buildable replacement is found
* @return Error if the engine to build is not available
*/ */
static CommandCost GetNewEngineType(const Vehicle *v, const Company *c, EngineID &e) static EngineID GetNewEngineType(const Vehicle *v, const Company *c)
{ {
assert(v->type != VEH_TRAIN || !v->IsArticulatedPart()); assert(v->type != VEH_TRAIN || !v->IsArticulatedPart());
e = INVALID_ENGINE;
if (v->type == VEH_TRAIN && Train::From(v)->IsRearDualheaded()) { if (v->type == VEH_TRAIN && Train::From(v)->IsRearDualheaded()) {
/* we build the rear ends of multiheaded trains with the front ones */ /* we build the rear ends of multiheaded trains with the front ones */
return CommandCost(); return INVALID_ENGINE;
} }
e = EngineReplacementForCompany(c, v->engine_type, v->group_id); EngineID e = EngineReplacementForCompany(c, v->engine_type, v->group_id);
/* Autoreplace, if engine is available */
if (e != INVALID_ENGINE && IsEngineBuildable(e, v->type, _current_company)) { if (e != INVALID_ENGINE && IsEngineBuildable(e, v->type, _current_company)) {
return CommandCost(); return e;
} }
/* Autorenew if needed */ if (v->NeedsAutorenewing(c) && // replace if engine is too old
if (v->NeedsAutorenewing(c)) e = v->engine_type; IsEngineBuildable(v->engine_type, v->type, _current_company)) { // engine can still be build
return v->engine_type;
}
/* Nothing to do or all is fine? */ return INVALID_ENGINE;
if (e == INVALID_ENGINE || IsEngineBuildable(e, v->type, _current_company)) return CommandCost();
/* The engine we need is not available. Report error to user */
return CommandCost(STR_ERROR_RAIL_VEHICLE_NOT_AVAILABLE + v->type);
} }
/** /**
@@ -258,9 +252,7 @@ static CommandCost BuildReplacementVehicle(Vehicle *old_veh, Vehicle **new_vehic
/* Shall the vehicle be replaced? */ /* Shall the vehicle be replaced? */
const Company *c = Company::Get(_current_company); const Company *c = Company::Get(_current_company);
EngineID e; EngineID e = GetNewEngineType(old_veh, c);
CommandCost cost = GetNewEngineType(old_veh, c, e);
if (cost.Failed()) return cost;
if (e == INVALID_ENGINE) return CommandCost(); // neither autoreplace is set, nor autorenew is triggered if (e == INVALID_ENGINE) return CommandCost(); // neither autoreplace is set, nor autorenew is triggered
/* Does it need to be refitted */ /* Does it need to be refitted */
@@ -268,7 +260,7 @@ static CommandCost BuildReplacementVehicle(Vehicle *old_veh, Vehicle **new_vehic
if (refit_cargo == CT_INVALID) return CommandCost(); // incompatible cargos if (refit_cargo == CT_INVALID) return CommandCost(); // incompatible cargos
/* Build the new vehicle */ /* Build the new vehicle */
cost = DoCommand(old_veh->tile, e, 0, DC_EXEC | DC_AUTOREPLACE, GetCmdBuildVeh(old_veh)); CommandCost cost = DoCommand(old_veh->tile, e, 0, DC_EXEC | DC_AUTOREPLACE, GetCmdBuildVeh(old_veh));
if (cost.Failed()) return cost; if (cost.Failed()) return cost;
Vehicle *new_veh = Vehicle::Get(_new_vehicle_id); Vehicle *new_veh = Vehicle::Get(_new_vehicle_id);
@@ -670,11 +662,8 @@ CommandCost CmdAutoreplaceVehicle(TileIndex tile, DoCommandFlag flags, uint32 p1
/* Test whether any replacement is set, before issuing a whole lot of commands that would end in nothing changed */ /* Test whether any replacement is set, before issuing a whole lot of commands that would end in nothing changed */
Vehicle *w = v; Vehicle *w = v;
bool any_replacements = false; bool any_replacements = false;
while (w != NULL) { while (w != NULL && !any_replacements) {
EngineID e; any_replacements = (GetNewEngineType(w, c) != INVALID_ENGINE);
CommandCost cost = GetNewEngineType(w, c, e);
if (cost.Failed()) return cost;
any_replacements |= (e != INVALID_ENGINE);
w = (!free_wagon && w->type == VEH_TRAIN ? Train::From(w)->GetNextUnit() : NULL); w = (!free_wagon && w->type == VEH_TRAIN ? Train::From(w)->GetNextUnit() : NULL);
} }
@@ -742,7 +731,7 @@ CommandCost CmdSetAutoReplace(TileIndex tile, DoCommandFlag flags, uint32 p1, ui
GroupID id_g = GB(p1, 16, 16); GroupID id_g = GB(p1, 16, 16);
CommandCost cost; CommandCost cost;
if (Group::IsValidID(id_g) ? Group::Get(id_g)->owner != _current_company : !IsAllGroupID(id_g) && !IsDefaultGroupID(id_g)) return CMD_ERROR; if (!Group::IsValidID(id_g) && !IsAllGroupID(id_g) && !IsDefaultGroupID(id_g)) return CMD_ERROR;
if (!Engine::IsValidID(old_engine_type)) return CMD_ERROR; if (!Engine::IsValidID(old_engine_type)) return CMD_ERROR;
if (new_engine_type != INVALID_ENGINE) { if (new_engine_type != INVALID_ENGINE) {

View File

@@ -130,63 +130,53 @@ static inline bool BmpRead4(BmpBuffer *buffer, BmpInfo *info, BmpData *data)
*/ */
static inline bool BmpRead4Rle(BmpBuffer *buffer, BmpInfo *info, BmpData *data) static inline bool BmpRead4Rle(BmpBuffer *buffer, BmpInfo *info, BmpData *data)
{ {
uint i;
uint x = 0; uint x = 0;
uint y = info->height - 1; uint y = info->height - 1;
byte n, c, b;
byte *pixel = &data->bitmap[y * info->width]; byte *pixel = &data->bitmap[y * info->width];
while (y != 0 || x < info->width) { while (y != 0 || x < info->width) {
if (EndOfBuffer(buffer)) return false; // the file is shorter than expected if (EndOfBuffer(buffer)) return false; // the file is shorter than expected
n = ReadByte(buffer);
byte n = ReadByte(buffer); c = ReadByte(buffer);
byte c = ReadByte(buffer);
if (n == 0) { if (n == 0) {
switch (c) { switch (c) {
case 0: // end of line case 0: // end of line
x = 0; x = 0;
if (y == 0) return false; pixel = &data->bitmap[--y * info->width];
pixel = &data->bitmap[--y * info->width]; break;
break; case 1: // end of bitmap
x = info->width;
case 1: // end of bitmap y = 0;
return true; pixel = NULL;
break;
case 2: { // delta case 2: // delta
if (EndOfBuffer(buffer)) return false; x += ReadByte(buffer);
byte dx = ReadByte(buffer); i = ReadByte(buffer);
byte dy = ReadByte(buffer); if (x >= info->width || (y == 0 && i > 0)) return false;
y -= i;
/* Check for over- and underflow. */ pixel = &data->bitmap[y * info->width + x];
if (x + dx >= info->width || x + dx < x || dy > y) return false; break;
default: // uncompressed
x += dx; i = 0;
y -= dy; while (i++ < c) {
pixel = &data->bitmap[y * info->width + x]; if (EndOfBuffer(buffer) || x >= info->width) return false;
break; b = ReadByte(buffer);
} *pixel++ = GB(b, 4, 4);
x++;
default: { // uncompressed if (x < info->width && i++ < c) {
uint i = 0; *pixel++ = GB(b, 0, 4);
while (i++ < c) {
if (EndOfBuffer(buffer) || x >= info->width) return false;
byte b = ReadByte(buffer);
*pixel++ = GB(b, 4, 4);
x++; x++;
if (i++ < c) {
if (x >= info->width) return false;
*pixel++ = GB(b, 0, 4);
x++;
}
} }
/* Padding for 16 bit align */
SkipBytes(buffer, ((c + 1) / 2) % 2);
break;
} }
/* Padding for 16 bit align */
SkipBytes(buffer, ((c + 1) / 2) % 2);
break;
} }
} else { } else {
/* Apparently it is common to encounter BMPs where the count of i = 0;
* pixels to be written is higher than the remaining line width. while (i++ < n) {
* Ignore the superfluous pixels instead of reporting an error. */ if (EndOfBuffer(buffer) || x >= info->width) return false;
uint i = 0;
while (x < info->width && i++ < n) {
*pixel++ = GB(c, 4, 4); *pixel++ = GB(c, 4, 4);
x++; x++;
if (x < info->width && i++ < n) { if (x < info->width && i++ < n) {
@@ -223,55 +213,43 @@ static inline bool BmpRead8(BmpBuffer *buffer, BmpInfo *info, BmpData *data)
*/ */
static inline bool BmpRead8Rle(BmpBuffer *buffer, BmpInfo *info, BmpData *data) static inline bool BmpRead8Rle(BmpBuffer *buffer, BmpInfo *info, BmpData *data)
{ {
uint i;
uint x = 0; uint x = 0;
uint y = info->height - 1; uint y = info->height - 1;
byte n, c;
byte *pixel = &data->bitmap[y * info->width]; byte *pixel = &data->bitmap[y * info->width];
while (y != 0 || x < info->width) { while (y != 0 || x < info->width) {
if (EndOfBuffer(buffer)) return false; // the file is shorter than expected if (EndOfBuffer(buffer)) return false; // the file is shorter than expected
n = ReadByte(buffer);
byte n = ReadByte(buffer); c = ReadByte(buffer);
byte c = ReadByte(buffer);
if (n == 0) { if (n == 0) {
switch (c) { switch (c) {
case 0: // end of line case 0: // end of line
x = 0; x = 0;
if (y == 0) return false; pixel = &data->bitmap[--y * info->width];
pixel = &data->bitmap[--y * info->width]; break;
break; case 1: // end of bitmap
x = info->width;
case 1: // end of bitmap y = 0;
return true; pixel = NULL;
break;
case 2: { // delta case 2: // delta
if (EndOfBuffer(buffer)) return false; x += ReadByte(buffer);
byte dx = ReadByte(buffer); i = ReadByte(buffer);
byte dy = ReadByte(buffer); if (x >= info->width || (y == 0 && i > 0)) return false;
y -= i;
/* Check for over- and underflow. */ pixel = &data->bitmap[y * info->width + x];
if (x + dx >= info->width || x + dx < x || dy > y) return false; break;
default: // uncompressed
x += dx; if ((x += c) > info->width) return false;
y -= dy; for (i = 0; i < c; i++) *pixel++ = ReadByte(buffer);
pixel = &data->bitmap[y * info->width + x]; /* Padding for 16 bit align */
break; SkipBytes(buffer, c % 2);
} break;
default: { // uncompressed
for (uint i = 0; i < c; i++) {
if (EndOfBuffer(buffer) || x >= info->width) return false;
*pixel++ = ReadByte(buffer);
x++;
}
/* Padding for 16 bit align */
SkipBytes(buffer, c % 2);
break;
}
} }
} else { } else {
/* Apparently it is common to encounter BMPs where the count of for (i = 0; i < n; i++) {
* pixels to be written is higher than the remaining line width. if (x >= info->width) return false;
* Ignore the superfluous pixels instead of reporting an error. */
for (uint i = 0; x < info->width && i < n; i++) {
*pixel++ = c; *pixel++ = c;
x++; x++;
} }

View File

@@ -420,11 +420,7 @@ void ShowBuildBridgeWindow(TileIndex start, TileIndex end, TransportType transpo
Money infra_cost = 0; Money infra_cost = 0;
switch (transport_type) { switch (transport_type) {
case TRANSPORT_ROAD: case TRANSPORT_ROAD: infra_cost = (bridge_len + 2) * _price[PR_BUILD_ROAD] * 2; break;
infra_cost = (bridge_len + 2) * _price[PR_BUILD_ROAD] * 2;
/* In case we add a new road type as well, we must be aware of those costs. */
if (IsBridgeTile(start)) infra_cost *= CountBits(GetRoadTypes(start) | (RoadTypes)road_rail_type);
break;
case TRANSPORT_RAIL: infra_cost = (bridge_len + 2) * RailBuildCost((RailType)road_rail_type); break; case TRANSPORT_RAIL: infra_cost = (bridge_len + 2) * RailBuildCost((RailType)road_rail_type); break;
default: break; default: break;
} }

View File

@@ -633,7 +633,6 @@ CommandCost DoCommandPInternal(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd,
/* Test the command. */ /* Test the command. */
_cleared_object_areas.Clear(); _cleared_object_areas.Clear();
SetTownRatingTestMode(true); SetTownRatingTestMode(true);
ClearStorageChanges(false);
res = proc(tile, flags, p1, p2, text); res = proc(tile, flags, p1, p2, text);
SetTownRatingTestMode(false); SetTownRatingTestMode(false);
@@ -673,7 +672,6 @@ CommandCost DoCommandPInternal(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd,
/* Actually try and execute the command. If no cost-type is given /* Actually try and execute the command. If no cost-type is given
* use the construction one */ * use the construction one */
_cleared_object_areas.Clear(); _cleared_object_areas.Clear();
ClearStorageChanges(false);
CommandCost res2 = proc(tile, flags | DC_EXEC, p1, p2, text); CommandCost res2 = proc(tile, flags | DC_EXEC, p1, p2, text);
if (cmd_id == CMD_COMPANY_CTRL) { if (cmd_id == CMD_COMPANY_CTRL) {

View File

@@ -349,7 +349,7 @@ static void GenerateCompanyName(Company *c)
StringID str; StringID str;
uint32 strp; uint32 strp;
if (t->name == NULL && IsInsideMM(t->townnametype, SPECSTR_TOWNNAME_START, SPECSTR_TOWNNAME_LAST + 1)) { if (t->name == NULL && IsInsideMM(t->townnametype, SPECSTR_TOWNNAME_START, SPECSTR_TOWNNAME_LAST + 1)) {
str = t->townnametype - SPECSTR_TOWNNAME_START + SPECSTR_COMPANY_NAME_START; str = t->townnametype - SPECSTR_TOWNNAME_START + SPECSTR_PLAYERNAME_START;
strp = t->townnameparts; strp = t->townnameparts;
verify_name:; verify_name:;
@@ -773,14 +773,13 @@ void CompanyAdminUpdate(const Company *company)
} }
/** /**
* Called whenever a company is removed in order to notify admins. * Called whenever a company goes bankrupt in order to notify admins.
* @param company_id The company that was removed. * @param company_id The company that went bankrupt.
* @param reason The reason the company was removed.
*/ */
void CompanyAdminRemove(CompanyID company_id, CompanyRemoveReason reason) void CompanyAdminBankrupt(CompanyID company_id)
{ {
#ifdef ENABLE_NETWORK #ifdef ENABLE_NETWORK
if (_network_server) NetworkAdminCompanyRemove(company_id, (AdminCompanyRemoveReason)reason); if (_network_server) NetworkAdminCompanyRemove(company_id, ADMIN_CRR_BANKRUPT);
#endif /* ENABLE_NETWORK */ #endif /* ENABLE_NETWORK */
} }
@@ -847,6 +846,7 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
} }
if (_network_server) { if (_network_server) {
CompanyID old_playas = ci->client_playas;
ci->client_playas = c->index; ci->client_playas = c->index;
NetworkUpdateClientInfo(ci->client_id); NetworkUpdateClientInfo(ci->client_id);
@@ -869,9 +869,11 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
NetworkSendCommand(0, 0, 0, CMD_RENAME_PRESIDENT, NULL, ci->client_name, ci->client_playas); NetworkSendCommand(0, 0, 0, CMD_RENAME_PRESIDENT, NULL, ci->client_name, ci->client_playas);
} }
/* Announce new company on network. */ /* Announce new company on network, if the client was a SPECTATOR before */
NetworkAdminCompanyInfo(c, true); if (old_playas == COMPANY_SPECTATOR) {
NetworkServerSendChat(NETWORK_ACTION_COMPANY_NEW, DESTTYPE_BROADCAST, 0, "", ci->client_id, ci->client_playas + 1); NetworkAdminCompanyInfo(c, true);
NetworkServerSendChat(NETWORK_ACTION_COMPANY_NEW, DESTTYPE_BROADCAST, 0, "", ci->client_id, ci->client_playas + 1);
}
} }
#endif /* ENABLE_NETWORK */ #endif /* ENABLE_NETWORK */
break; break;
@@ -885,9 +887,6 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
break; break;
case 2: { // Delete a company case 2: { // Delete a company
CompanyRemoveReason reason = (CompanyRemoveReason)GB(p2, 0, 2);
if (reason >= CRR_END) return CMD_ERROR;
Company *c = Company::GetIfValid(company_id); Company *c = Company::GetIfValid(company_id);
if (c == NULL) return CMD_ERROR; if (c == NULL) return CMD_ERROR;
@@ -911,7 +910,7 @@ CommandCost CmdCompanyCtrl(TileIndex tile, DoCommandFlag flags, uint32 p1, uint3
CompanyID c_index = c->index; CompanyID c_index = c->index;
delete c; delete c;
AI::BroadcastNewEvent(new AIEventCompanyBankrupt(c_index)); AI::BroadcastNewEvent(new AIEventCompanyBankrupt(c_index));
CompanyAdminRemove(c_index, (CompanyRemoveReason)reason); CompanyAdminBankrupt(c_index);
break; break;
} }

View File

@@ -56,13 +56,4 @@ typedef uint16 CompanyMask;
struct Company; struct Company;
typedef uint32 CompanyManagerFace; ///< Company manager face bits, info see in company_manager_face.h typedef uint32 CompanyManagerFace; ///< Company manager face bits, info see in company_manager_face.h
/** The reason why the company was removed. */
enum CompanyRemoveReason {
CRR_MANUAL, ///< The company is manually removed.
CRR_AUTOCLEAN, ///< The company is removed due to autoclean.
CRR_BANKRUPT, ///< The company went belly-up.
CRR_END ///< Sentinel for end.
};
#endif /* COMPANY_TYPE_H */ #endif /* COMPANY_TYPE_H */

View File

@@ -836,7 +836,7 @@ DEF_CONSOLE_CMD(ConResetCompany)
} }
/* It is safe to remove this company */ /* It is safe to remove this company */
DoCommandP(0, 2 | index << 16, CRR_MANUAL, CMD_COMPANY_CTRL); DoCommandP(0, 2 | index << 16, 0, CMD_COMPANY_CTRL);
IConsolePrint(CC_DEFAULT, "Company deleted."); IConsolePrint(CC_DEFAULT, "Company deleted.");
return true; return true;
@@ -1196,7 +1196,7 @@ DEF_CONSOLE_CMD(ConReloadAI)
} }
/* First kill the company of the AI, then start a new one. This should start the current AI again */ /* First kill the company of the AI, then start a new one. This should start the current AI again */
DoCommandP(0, 2 | company_id << 16, CRR_MANUAL, CMD_COMPANY_CTRL); DoCommandP(0, 2 | company_id << 16, 0, CMD_COMPANY_CTRL);
DoCommandP(0, 1 | company_id << 16, 0, CMD_COMPANY_CTRL); DoCommandP(0, 1 | company_id << 16, 0, CMD_COMPANY_CTRL);
IConsolePrint(CC_DEFAULT, "AI reloaded."); IConsolePrint(CC_DEFAULT, "AI reloaded.");
@@ -1233,7 +1233,7 @@ DEF_CONSOLE_CMD(ConStopAI)
} }
/* Now kill the company of the AI. */ /* Now kill the company of the AI. */
DoCommandP(0, 2 | company_id << 16, CRR_MANUAL, CMD_COMPANY_CTRL); DoCommandP(0, 2 | company_id << 16, 0, CMD_COMPANY_CTRL);
IConsolePrint(CC_DEFAULT, "AI stopped, company deleted."); IConsolePrint(CC_DEFAULT, "AI stopped, company deleted.");
return true; return true;
@@ -1640,7 +1640,7 @@ DEF_CONSOLE_CMD(ConCompanyPassword)
return false; return false;
} }
password = NetworkChangeCompanyPassword(company_id, password); password = NetworkChangeCompanyPassword(company_id, password, false);
if (StrEmpty(password)) { if (StrEmpty(password)) {
IConsolePrintF(CC_WARNING, "Company password cleared"); IConsolePrintF(CC_WARNING, "Company password cleared");

View File

@@ -22,29 +22,6 @@
void NORETURN MallocError(size_t size); void NORETURN MallocError(size_t size);
void NORETURN ReallocError(size_t size); void NORETURN ReallocError(size_t size);
/**
* Checks whether allocating memory would overflow size_t.
*
* @param element_size Size of the structure to allocate.
* @param num_elements Number of elements to allocate.
*/
static inline void CheckAllocationConstraints(size_t element_size, size_t num_elements)
{
if (num_elements > SIZE_MAX / element_size) MallocError(SIZE_MAX);
}
/**
* Checks whether allocating memory would overflow size_t.
*
* @tparam T Structure to allocate.
* @param num_elements Number of elements to allocate.
*/
template <typename T>
static inline void CheckAllocationConstraints(size_t num_elements)
{
CheckAllocationConstraints(sizeof(T), num_elements);
}
/** /**
* Simplified allocation function that allocates the specified number of * Simplified allocation function that allocates the specified number of
* elements of the given type. It also explicitly casts it to the requested * elements of the given type. It also explicitly casts it to the requested
@@ -65,9 +42,6 @@ static FORCEINLINE T *MallocT(size_t num_elements)
*/ */
if (num_elements == 0) return NULL; if (num_elements == 0) return NULL;
/* Ensure the size does not overflow. */
CheckAllocationConstraints<T>(num_elements);
T *t_ptr = (T*)malloc(num_elements * sizeof(T)); T *t_ptr = (T*)malloc(num_elements * sizeof(T));
if (t_ptr == NULL) MallocError(num_elements * sizeof(T)); if (t_ptr == NULL) MallocError(num_elements * sizeof(T));
return t_ptr; return t_ptr;
@@ -122,17 +96,12 @@ static FORCEINLINE T *ReallocT(T *t_ptr, size_t num_elements)
return NULL; return NULL;
} }
/* Ensure the size does not overflow. */
CheckAllocationConstraints<T>(num_elements);
t_ptr = (T*)realloc(t_ptr, num_elements * sizeof(T)); t_ptr = (T*)realloc(t_ptr, num_elements * sizeof(T));
if (t_ptr == NULL) ReallocError(num_elements * sizeof(T)); if (t_ptr == NULL) ReallocError(num_elements * sizeof(T));
return t_ptr; return t_ptr;
} }
/** alloca() has to be called in the parent function, so define AllocaM() as a macro */ /** alloca() has to be called in the parent function, so define AllocaM() as a macro */
#define AllocaM(T, num_elements) \ #define AllocaM(T, num_elements) ((T*)alloca((num_elements) * sizeof(T)))
(CheckAllocationConstraints<T>(num_elements), \
(T*)alloca((num_elements) * sizeof(T)))
#endif /* ALLOC_FUNC_HPP */ #endif /* ALLOC_FUNC_HPP */

View File

@@ -546,7 +546,7 @@ static void CompanyCheckBankrupt(Company *c)
* that changing the current company is okay. In case of single * that changing the current company is okay. In case of single
* player we are sure (the above check) that we are not the local * player we are sure (the above check) that we are not the local
* company and thus we won't be moved. */ * company and thus we won't be moved. */
if (!_networking || _network_server) DoCommandP(0, 2 | (c->index << 16), CRR_BANKRUPT, CMD_COMPANY_CTRL); if (!_networking || _network_server) DoCommandP(0, 2 | (c->index << 16), 0, CMD_COMPANY_CTRL);
break; break;
} }
} }

View File

@@ -91,8 +91,6 @@ Engine::Engine(VehicleType type, EngineID base)
this->info.base_life = 0xFF; this->info.base_life = 0xFF;
/* Set road vehicle tractive effort to the default value */ /* Set road vehicle tractive effort to the default value */
if (type == VEH_ROAD) this->u.road.tractive_effort = 0x4C; if (type == VEH_ROAD) this->u.road.tractive_effort = 0x4C;
/* Aircraft must have CT_INVALID as default, as there is no property */
if (type == VEH_AIRCRAFT) this->info.cargo_type = CT_INVALID;
/* Set visual effect to the default value */ /* Set visual effect to the default value */
switch (type) { switch (type) {
case VEH_TRAIN: this->u.rail.visual_effect = VE_DEFAULT; break; case VEH_TRAIN: this->u.rail.visual_effect = VE_DEFAULT; break;
@@ -650,10 +648,6 @@ void StartupOneEngine(Engine *e, Date aging_date)
} }
} }
/**
* Start/initialise all our engines. Must be called whenever there are changes
* to the NewGRF config.
*/
void StartupEngines() void StartupEngines()
{ {
Engine *e; Engine *e;

View File

@@ -21,7 +21,9 @@
#include <Path.h> #include <Path.h>
#include <storage/FindDirectory.h> #include <storage/FindDirectory.h>
#else #else
#if defined(OPENBSD) || defined(DOS)
#include <unistd.h> #include <unistd.h>
#endif
#include <pwd.h> #include <pwd.h>
#endif #endif
#include <sys/stat.h> #include <sys/stat.h>

View File

@@ -746,25 +746,18 @@ bool SetFallbackFont(FreeTypeSettings *settings, const char *language_isocode, i
static void SetFontGeometry(FT_Face face, FontSize size, int pixels) static void SetFontGeometry(FT_Face face, FontSize size, int pixels)
{ {
FT_Error err = FT_Set_Pixel_Sizes(face, 0, pixels); FT_Set_Pixel_Sizes(face, 0, pixels);
if (err == FT_Err_Invalid_Pixel_Size) {
/* Find nearest size to that requested */ if (FT_IS_SCALABLE(face)) {
FT_Bitmap_Size *bs = face->available_sizes; int asc = face->ascender * pixels / face->units_per_EM;
int i = face->num_fixed_sizes; int dec = face->descender * pixels / face->units_per_EM;
int n = bs->height;
for (; --i; bs++) {
if (abs(pixels - bs->height) < abs(pixels - n)) n = bs->height;
}
FT_Set_Pixel_Sizes(face, 0, n); _ascender[size] = asc;
_font_height[size] = asc - dec;
} else {
_ascender[size] = pixels;
_font_height[size] = pixels;
} }
int asc = face->size->metrics.ascender >> 6;
int dec = face->size->metrics.descender >> 6;
_ascender[size] = asc;
_font_height[size] = asc - dec;
} }
/** /**
@@ -1041,9 +1034,6 @@ const Sprite *GetGlyph(FontSize size, WChar key)
width = max(1, slot->bitmap.width + (size == FS_NORMAL)); width = max(1, slot->bitmap.width + (size == FS_NORMAL));
height = max(1, slot->bitmap.rows + (size == FS_NORMAL)); height = max(1, slot->bitmap.rows + (size == FS_NORMAL));
/* Limit glyph size to prevent overflows later on. */
if (width > 256 || height > 256) usererror("Font glyph is too large");
/* FreeType has rendered the glyph, now we allocate a sprite and copy the image into it */ /* FreeType has rendered the glyph, now we allocate a sprite and copy the image into it */
sprite.AllocateData(width * height); sprite.AllocateData(width * height);
sprite.width = width; sprite.width = width;

View File

@@ -86,6 +86,7 @@ enum GenerateLandscapeWindowWidgets {
GLAND_LANDSCAPE_PULLDOWN, ///< Dropdown 'Land generator' GLAND_LANDSCAPE_PULLDOWN, ///< Dropdown 'Land generator'
GLAND_HEIGHTMAP_NAME_TEXT, ///< Heightmap name GLAND_HEIGHTMAP_NAME_TEXT, ///< Heightmap name
GLAND_HEIGHTMAP_NAME_SPACER, ///< Spacer used for aligning items in the second column nicely
GLAND_HEIGHTMAP_SIZE_TEXT, ///< Size of heightmap GLAND_HEIGHTMAP_SIZE_TEXT, ///< Size of heightmap
GLAND_HEIGHTMAP_ROTATION_PULLDOWN, ///< Dropdown 'Heightmap rotation' GLAND_HEIGHTMAP_ROTATION_PULLDOWN, ///< Dropdown 'Heightmap rotation'
@@ -248,47 +249,45 @@ static const NWidgetPart _nested_heightmap_load_widgets[] = {
NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_HEIGHTMAP_ROTATION, STR_NULL), SetFill(1, 1), NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_HEIGHTMAP_ROTATION, STR_NULL), SetFill(1, 1),
EndContainer(), EndContainer(),
/* Widgets at the right of the labels. */ /* Widgets at the right of the labels. */
NWidget(NWID_VERTICAL), SetPIP(0, 4, 0), NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(0, 4, 0),
NWidget(WWT_EMPTY, COLOUR_ORANGE, GLAND_HEIGHTMAP_NAME_TEXT), SetFill(1, 0), NWidget(WWT_EMPTY, COLOUR_ORANGE, GLAND_HEIGHTMAP_NAME_TEXT), SetFill(1, 0),
NWidget(NWID_HORIZONTAL), SetPIP(0, 5, 0), /* Mapsize X * Y. */
NWidget(NWID_HORIZONTAL), SetPIP(0, 4, 0),
NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_MAPSIZE_X_PULLDOWN), SetDataTip(STR_JUST_INT, STR_NULL), SetFill(1, 0),
NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_BY, STR_NULL), SetPadding(1, 0, 0, 0), SetFill(1, 1),
NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_MAPSIZE_Y_PULLDOWN), SetDataTip(STR_JUST_INT, STR_NULL), SetFill(1, 0),
EndContainer(),
NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_TOWN_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_INDUSTRY_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
NWidget(WWT_EDITBOX, COLOUR_WHITE, GLAND_RANDOM_EDITBOX), SetDataTip(STR_MAPGEN_RANDOM_SEED_OSKTITLE, STR_MAPGEN_RANDOM_SEED_HELP), SetFill(1, 1),
NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_TREE_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_HEIGHTMAP_ROTATION_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
EndContainer(),
NWidget(NWID_VERTICAL), SetPIP(0, 4, 0),
NWidget(NWID_HORIZONTAL), SetPIP(0, 3, 0),
NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(0, 4, 0), NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(0, 4, 0),
/* Mapsize X * Y. */ NWidget(WWT_EMPTY, INVALID_COLOUR, GLAND_HEIGHTMAP_NAME_SPACER), SetFill(1, 0),
NWidget(NWID_HORIZONTAL), SetPIP(0, 4, 0), NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_HEIGHTMAP_SIZE_LABEL, STR_NULL), SetFill(1, 1),
NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_MAPSIZE_X_PULLDOWN), SetDataTip(STR_JUST_INT, STR_NULL), SetFill(1, 0), NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_DATE, STR_NULL), SetFill(1, 1),
NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_BY, STR_NULL), SetPadding(1, 0, 0, 0), SetFill(1, 1), NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_SNOW_LINE_HEIGHT, STR_NULL), SetFill(1, 1),
NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_MAPSIZE_Y_PULLDOWN), SetDataTip(STR_JUST_INT, STR_NULL), SetFill(1, 0),
EndContainer(),
NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_TOWN_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_INDUSTRY_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
NWidget(WWT_EDITBOX, COLOUR_WHITE, GLAND_RANDOM_EDITBOX), SetDataTip(STR_MAPGEN_RANDOM_SEED_OSKTITLE, STR_MAPGEN_RANDOM_SEED_HELP), SetFill(1, 1),
NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_TREE_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
NWidget(WWT_DROPDOWN, COLOUR_ORANGE, GLAND_HEIGHTMAP_ROTATION_PULLDOWN), SetDataTip(STR_JUST_STRING, STR_NULL), SetFill(1, 0),
EndContainer(), EndContainer(),
NWidget(NWID_VERTICAL), SetPIP(0, 4, 0), NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(0, 4, 0),
NWidget(NWID_HORIZONTAL), SetPIP(0, 3, 0), NWidget(WWT_EMPTY, INVALID_COLOUR, GLAND_HEIGHTMAP_NAME_SPACER), SetFill(1, 0),
NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(0, 4, 0), NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_HEIGHTMAP_SIZE_TEXT), SetDataTip(STR_MAPGEN_HEIGHTMAP_SIZE, STR_NULL), SetFill(1, 0),
NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_HEIGHTMAP_SIZE_LABEL, STR_NULL), SetFill(1, 1), NWidget(NWID_HORIZONTAL),
NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_DATE, STR_NULL), SetFill(1, 1), NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_DOWN), SetDataTip(SPR_ARROW_DOWN, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD), SetFill(0, 1),
NWidget(WWT_TEXT, COLOUR_ORANGE), SetDataTip(STR_MAPGEN_SNOW_LINE_HEIGHT, STR_NULL), SetFill(1, 1), NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_START_DATE_TEXT), SetDataTip(STR_BLACK_DATE_LONG, STR_NULL), SetFill(1, 0),
EndContainer(), NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_UP), SetDataTip(SPR_ARROW_UP, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD), SetFill(0, 1),
NWidget(NWID_VERTICAL, NC_EQUALSIZE), SetPIP(0, 4, 0), EndContainer(),
NWidget(WWT_TEXT, COLOUR_ORANGE, GLAND_HEIGHTMAP_SIZE_TEXT), SetDataTip(STR_MAPGEN_HEIGHTMAP_SIZE, STR_NULL), SetFill(1, 0), NWidget(NWID_HORIZONTAL),
NWidget(NWID_HORIZONTAL), NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_DOWN), SetDataTip(SPR_ARROW_DOWN, STR_MAPGEN_SNOW_LINE_DOWN), SetFill(0, 1),
NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_DOWN), SetDataTip(SPR_ARROW_DOWN, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_BACKWARD), SetFill(0, 1), NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_TEXT), SetDataTip(STR_BLACK_INT, STR_NULL), SetFill(1, 0),
NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_START_DATE_TEXT), SetDataTip(STR_BLACK_DATE_LONG, STR_NULL), SetFill(1, 0), NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_UP), SetDataTip(SPR_ARROW_UP, STR_MAPGEN_SNOW_LINE_UP), SetFill(0, 1),
NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_START_DATE_UP), SetDataTip(SPR_ARROW_UP, STR_SCENEDIT_TOOLBAR_TOOLTIP_MOVE_THE_STARTING_DATE_FORWARD), SetFill(0, 1),
EndContainer(),
NWidget(NWID_HORIZONTAL),
NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_DOWN), SetDataTip(SPR_ARROW_DOWN, STR_MAPGEN_SNOW_LINE_DOWN), SetFill(0, 1),
NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_TEXT), SetDataTip(STR_BLACK_INT, STR_NULL), SetFill(1, 0),
NWidget(WWT_IMGBTN, COLOUR_ORANGE, GLAND_SNOW_LEVEL_UP), SetDataTip(SPR_ARROW_UP, STR_MAPGEN_SNOW_LINE_UP), SetFill(0, 1),
EndContainer(),
EndContainer(),
EndContainer(), EndContainer(),
NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_RANDOM_BUTTON), SetDataTip(STR_MAPGEN_RANDOM, STR_MAPGEN_RANDOM_HELP), SetFill(1, 0),
NWidget(WWT_TEXTBTN, COLOUR_GREEN, GLAND_GENERATE_BUTTON), SetDataTip(STR_MAPGEN_GENERATE, STR_NULL), SetFill(1, 1),
EndContainer(), EndContainer(),
EndContainer(), EndContainer(),
NWidget(WWT_TEXTBTN, COLOUR_ORANGE, GLAND_RANDOM_BUTTON), SetDataTip(STR_MAPGEN_RANDOM, STR_MAPGEN_RANDOM_HELP), SetFill(1, 0),
NWidget(WWT_TEXTBTN, COLOUR_GREEN, GLAND_GENERATE_BUTTON), SetDataTip(STR_MAPGEN_GENERATE, STR_NULL), SetFill(1, 1),
EndContainer(), EndContainer(),
EndContainer(), EndContainer(),
NWidget(NWID_SPACER), SetMinimalSize(0, 9), SetFill(1, 1), NWidget(NWID_SPACER), SetMinimalSize(0, 9), SetFill(1, 1),
@@ -532,6 +531,7 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
*size = maxdim(GetStringBoundingBox(STR_MAPGEN_BORDER_RANDOM), maxdim(GetStringBoundingBox(STR_MAPGEN_BORDER_WATER), GetStringBoundingBox(STR_MAPGEN_BORDER_FREEFORM))); *size = maxdim(GetStringBoundingBox(STR_MAPGEN_BORDER_RANDOM), maxdim(GetStringBoundingBox(STR_MAPGEN_BORDER_WATER), GetStringBoundingBox(STR_MAPGEN_BORDER_FREEFORM)));
break; break;
case GLAND_HEIGHTMAP_NAME_SPACER:
case GLAND_HEIGHTMAP_NAME_TEXT: case GLAND_HEIGHTMAP_NAME_TEXT:
size->width = 0; size->width = 0;
break; break;
@@ -552,7 +552,12 @@ struct GenerateLandscapeWindow : public QueryStringBaseWindow {
{ {
switch (widget) { switch (widget) {
case GLAND_HEIGHTMAP_NAME_TEXT: { case GLAND_HEIGHTMAP_NAME_TEXT: {
DrawString(r.left, r.right, r.top, this->name, TC_ORANGE); /* Little bit of a hack going on here; just to get the widgets
* spaced without doing much magic. The space we can draw on is
* covered by both the spacer and text widgets, so take their
* outer most boundaries (left and right) as draw locations. */
const NWidgetBase *nwi_spacer = this->GetWidget<NWidgetBase>(GLAND_HEIGHTMAP_NAME_SPACER);
DrawString(min(r.left, nwi_spacer->pos_x), max<int>(r.right, nwi_spacer->pos_x + nwi_spacer->current_x), r.top, this->name, TC_ORANGE);
break; break;
} }
} }

View File

@@ -142,24 +142,13 @@ static bool ReadHeightmapPNG(char *filename, uint *x, uint *y, byte **map)
return false; return false;
} }
uint width = png_get_image_width(png_ptr, info_ptr);
uint height = png_get_image_height(png_ptr, info_ptr);
/* Check if image dimensions don't overflow a size_t to avoid memory corruption. */
if ((uint64)width * height >= (size_t)-1) {
ShowErrorMessage(STR_ERROR_PNGMAP, STR_ERROR_HEIGHTMAP_TOO_LARGE, WL_ERROR);
fclose(fp);
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
return false;
}
if (map != NULL) { if (map != NULL) {
*map = MallocT<byte>(width * height); *map = MallocT<byte>(png_get_image_width(png_ptr, info_ptr) * png_get_image_height(png_ptr, info_ptr));
ReadHeightmapPNGImageData(*map, png_ptr, info_ptr); ReadHeightmapPNGImageData(*map, png_ptr, info_ptr);
} }
*x = width; *x = png_get_image_width(png_ptr, info_ptr);
*y = height; *y = png_get_image_height(png_ptr, info_ptr);
fclose(fp); fclose(fp);
png_destroy_read_struct(&png_ptr, &info_ptr, NULL); png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
@@ -254,14 +243,6 @@ static bool ReadHeightmapBMP(char *filename, uint *x, uint *y, byte **map)
return false; return false;
} }
/* Check if image dimensions don't overflow a size_t to avoid memory corruption. */
if ((uint64)info.width * info.height >= (size_t)-1 / (info.bpp == 24 ? 3 : 1)) {
ShowErrorMessage(STR_ERROR_BMPMAP, STR_ERROR_HEIGHTMAP_TOO_LARGE, WL_ERROR);
fclose(f);
BmpDestroyData(&data);
return false;
}
if (map != NULL) { if (map != NULL) {
if (!BmpReadBitmap(&buffer, &info, &data)) { if (!BmpReadBitmap(&buffer, &info, &data)) {
ShowErrorMessage(STR_ERROR_BMPMAP, STR_ERROR_BMPMAP_IMAGE_TYPE, WL_ERROR); ShowErrorMessage(STR_ERROR_BMPMAP, STR_ERROR_BMPMAP_IMAGE_TYPE, WL_ERROR);

View File

@@ -140,8 +140,6 @@ void PlantRandomFarmField(const Industry *i);
void ReleaseDisastersTargetingIndustry(IndustryID); void ReleaseDisastersTargetingIndustry(IndustryID);
bool IsTileForestIndustry(TileIndex tile);
#define FOR_ALL_INDUSTRIES_FROM(var, start) FOR_ALL_ITEMS_FROM(Industry, industry_index, var, start) #define FOR_ALL_INDUSTRIES_FROM(var, start) FOR_ALL_ITEMS_FROM(Industry, industry_index, var, start)
#define FOR_ALL_INDUSTRIES(var) FOR_ALL_INDUSTRIES_FROM(var, 0) #define FOR_ALL_INDUSTRIES(var) FOR_ALL_INDUSTRIES_FROM(var, 0)

View File

@@ -908,30 +908,6 @@ static void ChangeTileOwner_Industry(TileIndex tile, Owner old_owner, Owner new_
if (i->founder == old_owner) i->founder = (new_owner == INVALID_OWNER) ? OWNER_NONE : new_owner; if (i->founder == old_owner) i->founder = (new_owner == INVALID_OWNER) ? OWNER_NONE : new_owner;
} }
/**
* Check whether the tile is a forest.
* @param tile the tile to investigate.
* @return true if and only if the tile is a forest
*/
bool IsTileForestIndustry(TileIndex tile)
{
/* Check for industry tile */
if (!IsTileType(tile, MP_INDUSTRY)) return false;
const Industry *ind = Industry::GetByTile(tile);
/* Check for organic industry (i.e. not processing or extractive) */
if ((GetIndustrySpec(ind->type)->life_type & INDUSTRYLIFE_ORGANIC) == 0) return false;
/* Check for wood production */
for (uint i = 0; i < lengthof(ind->produced_cargo); i++) {
/* The industry produces wood. */
if (ind->produced_cargo[i] != CT_INVALID && CargoSpec::Get(ind->produced_cargo[i])->label == 'WOOD') return true;
}
return false;
}
static const byte _plantfarmfield_type[] = {1, 1, 1, 1, 1, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6}; static const byte _plantfarmfield_type[] = {1, 1, 1, 1, 1, 3, 3, 4, 4, 4, 5, 5, 5, 6, 6, 6};
static bool IsBadFarmFieldTile(TileIndex tile) static bool IsBadFarmFieldTile(TileIndex tile)

View File

@@ -792,7 +792,7 @@ public:
/* Use all the available space left from where we stand up to the /* Use all the available space left from where we stand up to the
* end of the window. We ALSO enlarge the window if needed, so we * end of the window. We ALSO enlarge the window if needed, so we
* can 'go' wild with the bottom of the window. */ * can 'go' wild with the bottom of the window. */
y = DrawStringMultiLine(left + WD_FRAMERECT_LEFT, right - WD_FRAMERECT_RIGHT, y, UINT16_MAX, message, TC_BLACK); y = DrawStringMultiLine(left + WD_FRAMERECT_LEFT, right - WD_FRAMERECT_RIGHT, y, UINT16_MAX, message);
StopTextRefStackUsage(); StopTextRefStackUsage();
} }
} }

View File

@@ -99,7 +99,7 @@ STR_QUANTITY_PASSENGERS :{COMMA}راكب
STR_QUANTITY_COAL :{WEIGHT} من الفحم STR_QUANTITY_COAL :{WEIGHT} من الفحم
STR_QUANTITY_MAIL :{COMMA} صندوق من البريد STR_QUANTITY_MAIL :{COMMA} صندوق من البريد
STR_QUANTITY_OIL :{VOLUME} من النفط STR_QUANTITY_OIL :{VOLUME} من النفط
STR_QUANTITY_LIVESTOCK :{COMMA}راس من الماشية STR_QUANTITY_LIVESTOCK :{COMMA}رأس من الماشية
STR_QUANTITY_GOODS :{COMMA} قفص من البضائع STR_QUANTITY_GOODS :{COMMA} قفص من البضائع
STR_QUANTITY_GRAIN :{WEIGHT} من الحبوب STR_QUANTITY_GRAIN :{WEIGHT} من الحبوب
STR_QUANTITY_WOOD :{WEIGHT} من الخشب STR_QUANTITY_WOOD :{WEIGHT} من الخشب
@@ -117,7 +117,7 @@ STR_QUANTITY_WATER :{VOLUME} من
STR_QUANTITY_WHEAT :{WEIGHT} من القمح STR_QUANTITY_WHEAT :{WEIGHT} من القمح
STR_QUANTITY_RUBBER :{VOLUME} من المطاط STR_QUANTITY_RUBBER :{VOLUME} من المطاط
STR_QUANTITY_SUGAR :{WEIGHT} من السكر STR_QUANTITY_SUGAR :{WEIGHT} من السكر
STR_QUANTITY_TOYS :{COMMA}الالعاب STR_QUANTITY_TOYS :{COMMA}الألعاب
STR_QUANTITY_SWEETS :{COMMA} كيس من الحلويات STR_QUANTITY_SWEETS :{COMMA} كيس من الحلويات
STR_QUANTITY_COLA :{VOLUME} من الكولا STR_QUANTITY_COLA :{VOLUME} من الكولا
STR_QUANTITY_CANDYFLOSS :{WEIGHT} من الحلاوة القطنية STR_QUANTITY_CANDYFLOSS :{WEIGHT} من الحلاوة القطنية
@@ -447,7 +447,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT :صورة للش
STR_ABOUT_MENU_GIANT_SCREENSHOT :صورة كبيرة لكامل الخريطة -Ctrl-G - STR_ABOUT_MENU_GIANT_SCREENSHOT :صورة كبيرة لكامل الخريطة -Ctrl-G -
STR_ABOUT_MENU_ABOUT_OPENTTD :حول 'OpenTTD' STR_ABOUT_MENU_ABOUT_OPENTTD :حول 'OpenTTD'
STR_ABOUT_MENU_SPRITE_ALIGNER :موائم العفريتات STR_ABOUT_MENU_SPRITE_ALIGNER :موائم العفريتات
STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :اضهار /اخفاء مربح الحوارات/الخيارات
############ range ends here ############ range ends here
############ range for days starts (also used for the place in the highscore window) ############ range for days starts (also used for the place in the highscore window)
@@ -1057,7 +1056,6 @@ STR_SEA_LEVEL_HIGH :عالي
STR_SEA_LEVEL_CUSTOM :مخصص STR_SEA_LEVEL_CUSTOM :مخصص
STR_SEA_LEVEL_CUSTOM_PERCENTAGE :مخصص ({NUM}%) STR_SEA_LEVEL_CUSTOM_PERCENTAGE :مخصص ({NUM}%)
STR_DISASTER_NONE :بدون STR_DISASTER_NONE :بدون
STR_DISASTER_REDUCED :قليل STR_DISASTER_REDUCED :قليل
STR_DISASTER_NORMAL :طبيعي STR_DISASTER_NORMAL :طبيعي
@@ -1225,7 +1223,6 @@ STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_LONG :طويل - 31
STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT :قصير - 31 - 12 - 2008 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_SHORT :قصير - 31 - 12 - 2008
STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO :ايزو 31-12-2008 STR_CONFIG_SETTING_DATE_FORMAT_IN_SAVE_NAMES_ISO :ايزو 31-12-2008
STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME :{LTBLUE}إيقاف اللعبة تلقائيا عند بدأ لعبة جديدة: {ORANGE}{STRING} STR_CONFIG_SETTING_PAUSE_ON_NEW_GAME :{LTBLUE}إيقاف اللعبة تلقائيا عند بدأ لعبة جديدة: {ORANGE}{STRING}
STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL :{LTBLUE}عندمل توقف أسمح: {ORANGE}{STRING} STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL :{LTBLUE}عندمل توقف أسمح: {ORANGE}{STRING}
STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS :لا تصرف STR_CONFIG_SETTING_COMMAND_PAUSE_LEVEL_NO_ACTIONS :لا تصرف
@@ -1408,7 +1405,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK} ابح
STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK} عرض اعدادات الذكاء الصناعي STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK} عرض اعدادات الذكاء الصناعي
STR_INTRO_TOOLTIP_QUIT :{BLACK}اغلاق'OpenTTD' STR_INTRO_TOOLTIP_QUIT :{BLACK}اغلاق'OpenTTD'
# Quit window # Quit window
STR_QUIT_CAPTION :{WHITE}انهاء STR_QUIT_CAPTION :{WHITE}انهاء
STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}هل تود اغلاق النسخة المفتوحة و العودة لـ {STRING}? STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}هل تود اغلاق النسخة المفتوحة و العودة لـ {STRING}?
@@ -1420,11 +1416,11 @@ STR_OSNAME_WINDOWS :ويندوز
STR_OSNAME_DOS :دوس STR_OSNAME_DOS :دوس
STR_OSNAME_UNIX :يونكس STR_OSNAME_UNIX :يونكس
STR_OSNAME_OSX :OS{NBSP}X STR_OSNAME_OSX :OS{NBSP}X
STR_OSNAME_BEOS :بي او اس STR_OSNAME_BEOS :بي أو أس
STR_OSNAME_HAIKU :هايكو STR_OSNAME_HAIKU :هايكو
STR_OSNAME_MORPHOS :مورف او اس STR_OSNAME_MORPHOS :مورف أو أس
STR_OSNAME_AMIGAOS :اميقا STR_OSNAME_AMIGAOS :أميقا
STR_OSNAME_OS2 :او اس/2 STR_OSNAME_OS2 :أو أس/2
STR_OSNAME_SUNOS :صن STR_OSNAME_SUNOS :صن
# Abandon game # Abandon game
@@ -2284,7 +2280,7 @@ STR_LAI_OBJECT_DESCRIPTION_COMPANY_OWNED_LAND :ارض مملو
# About OpenTTD window # About OpenTTD window
STR_ABOUT_OPENTTD :{WHITE}حول النسخة المفتوحة STR_ABOUT_OPENTTD :{WHITE}حول النسخة المفتوحة
STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}الحقوق الاصلية {COPYRIGHT} كريس سوير 1995 , جميع الحقوق محفوظة STR_ABOUT_ORIGINAL_COPYRIGHT :{BLACK}الحقوق الأصلية {COPYRIGHT} كريس سوير 1995 , جميع الحقوق محفوظة
STR_ABOUT_VERSION :{BLACK}النسخة المفتوحة رقم {REV} STR_ABOUT_VERSION :{BLACK}النسخة المفتوحة رقم {REV}
STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}النسخة المفتوحة {COPYRIGHT}2002-2011 فريق النسخة المفتوحة STR_ABOUT_COPYRIGHT_OPENTTD :{BLACK}النسخة المفتوحة {COPYRIGHT}2002-2011 فريق النسخة المفتوحة
@@ -2487,8 +2483,6 @@ STR_NEWGRF_ERROR_CORRUPT_SPRITE :{YELLOW}{STRING
STR_NEWGRF_ERROR_MULTIPLE_ACTION_8 :يحتوي على اوامر متعددة - 8 مدخلات STR_NEWGRF_ERROR_MULTIPLE_ACTION_8 :يحتوي على اوامر متعددة - 8 مدخلات
STR_NEWGRF_ERROR_READ_BOUNDS :خطأ في قرائة البرمجة STR_NEWGRF_ERROR_READ_BOUNDS :خطأ في قرائة البرمجة
STR_NEWGRF_ERROR_MISSING_SPRITES :{WHITE}ملف الرسوم المستخدم حاليا يفتقد لبعض الرسوم الاساسية.{}الرجاء حدث ملف الرسوم. STR_NEWGRF_ERROR_MISSING_SPRITES :{WHITE}ملف الرسوم المستخدم حاليا يفتقد لبعض الرسوم الاساسية.{}الرجاء حدث ملف الرسوم.
STR_NEWGRF_ERROR_GRM_FAILED :معلومات الاضافة غير متاحة
STR_NEWGRF_ERROR_FORCEFULLY_DISABLED :{2:STRING}تم تعطيلة بواسطة{4:STRING}
# NewGRF related 'general' warnings # NewGRF related 'general' warnings
STR_NEWGRF_POPUP_CAUTION_CAPTION :{WHITE}تحذير! STR_NEWGRF_POPUP_CAUTION_CAPTION :{WHITE}تحذير!
@@ -2525,8 +2519,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY :{COMMA} لـ<ح
STR_NEWGRF_INVALID_ENGINE :<موديل العربة غير صالح> STR_NEWGRF_INVALID_ENGINE :<موديل العربة غير صالح>
STR_NEWGRF_INVALID_INDUSTRYTYPE :<المصنع غير صالح> STR_NEWGRF_INVALID_INDUSTRYTYPE :<المصنع غير صالح>
# NewGRF scanning window
# Sign list window # Sign list window
STR_SIGN_LIST_CAPTION :{WHITE}قائمة العلامات - {COMMA} علامة STR_SIGN_LIST_CAPTION :{WHITE}قائمة العلامات - {COMMA} علامة
STR_SIGN_LIST_MATCH_CASE :{BLACK}طابق الحالة STR_SIGN_LIST_MATCH_CASE :{BLACK}طابق الحالة
@@ -3135,7 +3127,7 @@ STR_REFIT_NEW_CAPACITY_COST_OF_REFIT :{BLACK}السع
STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT :{BLACK}السعة الجديدة: {GOLD}{CARGO}, {GOLD}{CARGO}{}{BLACK}تكلفة اعادة التهيئة: {GOLD}{CURRENCY} STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT :{BLACK}السعة الجديدة: {GOLD}{CARGO}, {GOLD}{CARGO}{}{BLACK}تكلفة اعادة التهيئة: {GOLD}{CURRENCY}
STR_REFIT_SELECT_VEHICLES_TOOLTIP :{BLACK}اختر العربة لاعادة تهيئتها. اسحب بالفارة لاختيار عدة عربات. اضغط على مساحة خالية لاختيار كل العربات. اضغط + كنترول لاختيار العربة الحالية وما بعدها. STR_REFIT_SELECT_VEHICLES_TOOLTIP :{BLACK}اختر العربة لاعادة تهيئتها. اسحب بالفارة لاختيار عدة عربات. اضغط على مساحة خالية لاختيار كل العربات. اضغط + كنترول لاختيار العربة الحالية وما بعدها.
STR_REFIT_TRAIN_LIST_TOOLTIP :{BLACK}اختر نوع البضاعة لينقلها القطار STR_REFIT_TRAIN_LIST_TOOLTIP :{BLACK}أختر نوع البضاعة لينقلها القطار
STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK} اختر نوع حمولة العربة STR_REFIT_ROAD_VEHICLE_LIST_TOOLTIP :{BLACK} اختر نوع حمولة العربة
STR_REFIT_SHIP_LIST_TOOLTIP :{BLACK}اختر نوع الحمولة للسفينة STR_REFIT_SHIP_LIST_TOOLTIP :{BLACK}اختر نوع الحمولة للسفينة
STR_REFIT_AIRCRAFT_LIST_TOOLTIP :{BLACK}اختر نوع الحمولة للطائرة STR_REFIT_AIRCRAFT_LIST_TOOLTIP :{BLACK}اختر نوع الحمولة للطائرة
@@ -3194,8 +3186,6 @@ STR_ORDER_DROP_HALT_DEPOT :توقف
STR_ORDER_SERVICE_TOOLTIP :{BLACK}تجاوز هذا الامر الا اذا لم تكن الصيانة مطلوبة STR_ORDER_SERVICE_TOOLTIP :{BLACK}تجاوز هذا الامر الا اذا لم تكن الصيانة مطلوبة
STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}بيانات العربة لتعريف التجاوز الى STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}بيانات العربة لتعريف التجاوز الى
# Conditional order variables, must follow order of OrderConditionVariable enum
STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :نسبة التحميل STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :نسبة التحميل
STR_ORDER_CONDITIONAL_RELIABILITY :الصلاحية STR_ORDER_CONDITIONAL_RELIABILITY :الصلاحية
STR_ORDER_CONDITIONAL_MAX_SPEED :السرعة القصوى STR_ORDER_CONDITIONAL_MAX_SPEED :السرعة القصوى
@@ -3447,8 +3437,6 @@ STR_ERROR_PNGMAP_MISC :{WHITE}حدث
STR_ERROR_BMPMAP :{WHITE}لا يمكن تحميل الخريطة من BMP ... STR_ERROR_BMPMAP :{WHITE}لا يمكن تحميل الخريطة من BMP ...
STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}لايمكن تحويل نوع الصورة... STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}لايمكن تحويل نوع الصورة...
STR_ERROR_HEIGHTMAP_TOO_LARGE :{WHITE}الصورة ضخمة جدا ...
STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}تحذير STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}تحذير
STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}اعادة تحجيم الخريطة المصدر كثيرا غير مستحسن. هل تريد اكمال توليد الخريطة؟ STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}اعادة تحجيم الخريطة المصدر كثيرا غير مستحسن. هل تريد اكمال توليد الخريطة؟
@@ -4254,7 +4242,6 @@ STR_TINY_BLACK_COMA :{TINYFONT}{BLAC
STR_TINY_COMMA :{TINYFONT}{COMMA} STR_TINY_COMMA :{TINYFONT}{COMMA}
STR_BLUE_COMMA :{BLUE}{COMMA} STR_BLUE_COMMA :{BLUE}{COMMA}
STR_RED_COMMA :{RED}{COMMA} STR_RED_COMMA :{RED}{COMMA}
STR_TINY_BLACK_DECIMAL :{TINYFONT}{BLACK}{DECIMAL}
STR_COMPANY_MONEY :{WHITE}{CURRENCY} STR_COMPANY_MONEY :{WHITE}{CURRENCY}
STR_BLACK_DATE_LONG :{BLACK}{DATE_LONG} STR_BLACK_DATE_LONG :{BLACK}{DATE_LONG}
STR_BLACK_CROSS :{BLACK}{CROSS} STR_BLACK_CROSS :{BLACK}{CROSS}

View File

@@ -545,11 +545,11 @@ STR_TOOLTIP_WINDOW_TITLE_DRAG_THIS :{BLACK}Зага
STR_TOOLTIP_SHADE :{BLACK}Згарнуць вакно, пакінуўшы загаловак STR_TOOLTIP_SHADE :{BLACK}Згарнуць вакно, пакінуўшы загаловак
STR_TOOLTIP_DEBUG :{BLACK}Паказаць наладачную iнфармацыю NewGRF STR_TOOLTIP_DEBUG :{BLACK}Паказаць наладачную iнфармацыю NewGRF
STR_TOOLTIP_STICKY :{BLACK}Ігнараваць націск клявішы «Закрыць усе вокны» STR_TOOLTIP_STICKY :{BLACK}Ігнараваць націск клявішы «Закрыць усе вокны»
STR_TOOLTIP_RESIZE :{BLACK}Націсьніце ды цягнiце для зьмяненьня памеру вакна STR_TOOLTIP_RESIZE :{BLACK}Націсьніце ды цягнiце для змяненьня памеру вакна
STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Вялікае/маленькае вакно STR_TOOLTIP_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Вялікае/маленькае вакно
STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST :{BLACK}Пракрутка ўверх/уніз STR_TOOLTIP_VSCROLL_BAR_SCROLLS_LIST :{BLACK}Пракрутка ўверх/уніз
STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST :{BLACK}Пракрутка налева/направа STR_TOOLTIP_HSCROLL_BAR_SCROLLS_LIST :{BLACK}Пракрутка налева/направа
STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC :{BLACK}Поўная ачыстка прамавугольнага ўчастку зямлі. Ctrl - выбар вобласьці па дыяганалі. Пры націснутым Shift - ацэнка кошту ачысткі. STR_TOOLTIP_DEMOLISH_BUILDINGS_ETC :{BLACK}Поўная ачыстка прамавугольнага ўчастку зямлі. Ctrl - выбар вобласці па дыяганалі. Пры націснутым Shift - ацэнка кошту ачысткі.
# Query window # Query window
STR_BUTTON_DEFAULT :{BLACK}Па змоўчаньнi STR_BUTTON_DEFAULT :{BLACK}Па змоўчаньнi
@@ -564,7 +564,7 @@ STR_OSK_KEYBOARD_LAYOUT_CAPS :~!@#$%^&*()_+|Q
STR_MEASURE_LENGTH :{BLACK}Даўжыня: {NUM} STR_MEASURE_LENGTH :{BLACK}Даўжыня: {NUM}
STR_MEASURE_AREA :{BLACK}Плошча: {NUM} x {NUM} STR_MEASURE_AREA :{BLACK}Плошча: {NUM} x {NUM}
STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Даўжыня: {NUM}{}Розніца вышыняў: {HEIGHT} STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Даўжыня: {NUM}{}Розніца вышыняў: {HEIGHT}
STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Плошча: {NUM} x {NUM}{}Розьнiца вышыняў: {HEIGHT} STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Плошча: {NUM} x {NUM}{}Рознiца вышыняў: {HEIGHT}
# These are used in buttons # These are used in buttons
@@ -581,13 +581,13 @@ STR_SORT_BY_NUMBER :Нумар
STR_SORT_BY_PROFIT_LAST_YEAR :Прыбытак летась STR_SORT_BY_PROFIT_LAST_YEAR :Прыбытак летась
STR_SORT_BY_PROFIT_THIS_YEAR :Прыбытак у бягучым годзе STR_SORT_BY_PROFIT_THIS_YEAR :Прыбытак у бягучым годзе
STR_SORT_BY_AGE :Узрост STR_SORT_BY_AGE :Узрост
STR_SORT_BY_RELIABILITY :Надзейнасьць STR_SORT_BY_RELIABILITY :Надзейнасць
STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE :Умяшчальнасьць грузу STR_SORT_BY_TOTAL_CAPACITY_PER_CARGOTYPE :Умяшчальнасьць грузу
STR_SORT_BY_MAX_SPEED :Максымальная хуткасьць STR_SORT_BY_MAX_SPEED :Максымальная хуткасць
STR_SORT_BY_MODEL :Мадэль STR_SORT_BY_MODEL :Мадэль
STR_SORT_BY_VALUE :Кошт STR_SORT_BY_VALUE :Кошт
STR_SORT_BY_LENGTH :Даўжыня STR_SORT_BY_LENGTH :Даўжыня
STR_SORT_BY_LIFE_TIME :Рэшткавы тэрмін службы STR_SORT_BY_LIFE_TIME :Астатні тэрмін службы
STR_SORT_BY_TIMETABLE_DELAY :Адставаньне ад графіку STR_SORT_BY_TIMETABLE_DELAY :Адставаньне ад графіку
STR_SORT_BY_FACILITY :Тып станцыі STR_SORT_BY_FACILITY :Тып станцыі
STR_SORT_BY_WAITING :Коль-ць грузу на станцыі STR_SORT_BY_WAITING :Коль-ць грузу на станцыі
@@ -599,7 +599,7 @@ STR_SORT_BY_POWER :Магутна
STR_SORT_BY_TRACTIVE_EFFORT :Цягавае намаганьне STR_SORT_BY_TRACTIVE_EFFORT :Цягавае намаганьне
STR_SORT_BY_INTRO_DATE :Пачатак вытворчасьцi STR_SORT_BY_INTRO_DATE :Пачатак вытворчасьцi
STR_SORT_BY_RUNNING_COST :Кошт абслугоўваньня STR_SORT_BY_RUNNING_COST :Кошт абслугоўваньня
STR_SORT_BY_POWER_VS_RUNNING_COST :Магутнасьць/кошт абслуг. STR_SORT_BY_POWER_VS_RUNNING_COST :Магутнасць/кошт абслуг.
STR_SORT_BY_CARGO_CAPACITY :Ёмiстасьць STR_SORT_BY_CARGO_CAPACITY :Ёмiстасьць
# Tooltips for the main toolbar # Tooltips for the main toolbar
@@ -626,7 +626,7 @@ STR_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TRACK :{BLACK}Буда
STR_TOOLBAR_TOOLTIP_BUILD_ROADS :{BLACK}Будаўніцтва аўтамабільных дарог STR_TOOLBAR_TOOLTIP_BUILD_ROADS :{BLACK}Будаўніцтва аўтамабільных дарог
STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS :{BLACK}Будаўніцтва водных камунікацыяў STR_TOOLBAR_TOOLTIP_BUILD_SHIP_DOCKS :{BLACK}Будаўніцтва водных камунікацыяў
STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Будаўніцтва аэрапортаў STR_TOOLBAR_TOOLTIP_BUILD_AIRPORTS :{BLACK}Будаўніцтва аэрапортаў
STR_TOOLBAR_TOOLTIP_LANDSCAPING :{BLACK}Адкрыць панэль ляндшафту для зьмяненьня рэльефу, пасадкi дрэваў i г.д. STR_TOOLBAR_TOOLTIP_LANDSCAPING :{BLACK}Адкрыць панэль ляндшафту для змяненьня рэльефу, пасадкi дрэваў i г.д.
STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW :{BLACK}Наладка гуку й музыкі STR_TOOLBAR_TOOLTIP_SHOW_SOUND_MUSIC_WINDOW :{BLACK}Наладка гуку й музыкі
STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS :{BLACK}Паказаць апошнiя паведамленьнi/навiны, паказаць наладкi паведамленьняў STR_TOOLBAR_TOOLTIP_SHOW_LAST_MESSAGE_NEWS :{BLACK}Паказаць апошнiя паведамленьнi/навiны, паказаць наладкi паведамленьняў
STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Iнфармацыя аб зямлi; кансоль; наладка штучнага інтэлекту (AI/ШI); здымкi экрана; аб гульні STR_TOOLBAR_TOOLTIP_LAND_BLOCK_INFORMATION :{BLACK}Iнфармацыя аб зямлi; кансоль; наладка штучнага інтэлекту (AI/ШI); здымкi экрана; аб гульні
@@ -659,7 +659,7 @@ STR_SCENEDIT_FILE_MENU_QUIT :Выхад
############ range for settings menu starts ############ range for settings menu starts
STR_SETTINGS_MENU_GAME_OPTIONS :Наладкі гульні STR_SETTINGS_MENU_GAME_OPTIONS :Наладкі гульні
STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Наладкі складанасьцi STR_SETTINGS_MENU_DIFFICULTY_SETTINGS :Наладкі складанасцi
STR_SETTINGS_MENU_CONFIG_SETTINGS :Пашыраныя наладкі STR_SETTINGS_MENU_CONFIG_SETTINGS :Пашыраныя наладкі
STR_SETTINGS_MENU_AI_SETTINGS :Наладки ШI (AI) STR_SETTINGS_MENU_AI_SETTINGS :Наладки ШI (AI)
STR_SETTINGS_MENU_NEWGRF_SETTINGS :Наладкі NewGRF STR_SETTINGS_MENU_NEWGRF_SETTINGS :Наладкі NewGRF
@@ -760,7 +760,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT :Здымак э
STR_ABOUT_MENU_GIANT_SCREENSHOT :Здымак усёй мапы (Ctrl+G) STR_ABOUT_MENU_GIANT_SCREENSHOT :Здымак усёй мапы (Ctrl+G)
STR_ABOUT_MENU_ABOUT_OPENTTD :Аб гульні OpenTTD STR_ABOUT_MENU_ABOUT_OPENTTD :Аб гульні OpenTTD
STR_ABOUT_MENU_SPRITE_ALIGNER :Выраўноўваньне спрайтаў STR_ABOUT_MENU_SPRITE_ALIGNER :Выраўноўваньне спрайтаў
STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Пераключыць абмежавальныя рамкі
############ range ends here ############ range ends here
############ range for days starts (also used for the place in the highscore window) ############ range for days starts (also used for the place in the highscore window)
@@ -1309,7 +1308,7 @@ STR_CURRENCY_CUSTOM_CURRENCY_PREVIEW_TOOLTIP :{BLACK}10000 б
STR_CURRENCY_CHANGE_PARAMETER :{BLACK}Зьмяніць парамэтр уласнай валюты STR_CURRENCY_CHANGE_PARAMETER :{BLACK}Зьмяніць парамэтр уласнай валюты
# Difficulty level window # Difficulty level window
STR_DIFFICULTY_LEVEL_CAPTION :{WHITE}Узровень складанасьцi STR_DIFFICULTY_LEVEL_CAPTION :{WHITE}Узровень складанасцi
############ range for difficulty levels starts ############ range for difficulty levels starts
STR_DIFFICULTY_LEVEL_EASY :{BLACK}Лёгкі STR_DIFFICULTY_LEVEL_EASY :{BLACK}Лёгкі
@@ -1351,7 +1350,7 @@ STR_NUM_VERY_LOW :Вельмі м
STR_NUM_LOW :Мала STR_NUM_LOW :Мала
STR_NUM_NORMAL :Звычайна STR_NUM_NORMAL :Звычайна
STR_NUM_HIGH :Шмат STR_NUM_HIGH :Шмат
STR_NUM_CUSTOM :Уласны STR_NUM_CUSTOM :Уласная
STR_NUM_CUSTOM_NUMBER :Зададзены ({NUM}) STR_NUM_CUSTOM_NUMBER :Зададзены ({NUM})
STR_VARIETY_NONE :Няма STR_VARIETY_NONE :Няма
@@ -1374,7 +1373,6 @@ STR_SEA_LEVEL_HIGH :Вялiкая
STR_SEA_LEVEL_CUSTOM :Зададзены STR_SEA_LEVEL_CUSTOM :Зададзены
STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Зададзены ({NUM}%) STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Зададзены ({NUM}%)
STR_DISASTER_NONE :Выключаны STR_DISASTER_NONE :Выключаны
STR_DISASTER_REDUCED :Зьніжаныя STR_DISASTER_REDUCED :Зьніжаныя
STR_DISASTER_NORMAL :Звычайныя STR_DISASTER_NORMAL :Звычайныя
@@ -1419,7 +1417,7 @@ STR_CONFIG_SETTING_AUTOSLOPE :{LTBLUE}Даз
STR_CONFIG_SETTING_CATCHMENT :{LTBLUE}Зона пакрыцьця залежыць ад тыпу станцыі: {ORANGE}{STRING} STR_CONFIG_SETTING_CATCHMENT :{LTBLUE}Зона пакрыцьця залежыць ад тыпу станцыі: {ORANGE}{STRING}
STR_CONFIG_SETTING_EXTRADYNAMITE :{LTBLUE}Дазволіць знос амаль усіх гарадзкіх аб'ектаў: {ORANGE}{STRING} STR_CONFIG_SETTING_EXTRADYNAMITE :{LTBLUE}Дазволіць знос амаль усіх гарадзкіх аб'ектаў: {ORANGE}{STRING}
STR_CONFIG_SETTING_TRAIN_LENGTH :{LTBLUE}Макс. даўжыня цягнiкоў: {ORANGE}{STRING} клет{P 0:1 ка кi ак} STR_CONFIG_SETTING_TRAIN_LENGTH :{LTBLUE}Макс. даўжыня цягнiкоў: {ORANGE}{STRING} клет{P 0:1 ка кi ак}
STR_CONFIG_SETTING_SMOKE_AMOUNT :{LTBLUE}Колькасьць дыму/іскраў у лакаматываў: {ORANGE}{STRING} STR_CONFIG_SETTING_SMOKE_AMOUNT :{LTBLUE}Колькасць дыму/іскраў у лакаматываў: {ORANGE}{STRING}
STR_CONFIG_SETTING_SMOKE_AMOUNT_NONE :няма STR_CONFIG_SETTING_SMOKE_AMOUNT_NONE :няма
STR_CONFIG_SETTING_SMOKE_AMOUNT_ORIGINAL :арыгальная STR_CONFIG_SETTING_SMOKE_AMOUNT_ORIGINAL :арыгальная
STR_CONFIG_SETTING_SMOKE_AMOUNT_REALISTIC :рэалістычная STR_CONFIG_SETTING_SMOKE_AMOUNT_REALISTIC :рэалістычная
@@ -1442,8 +1440,8 @@ STR_CONFIG_SETTING_MAX_TUNNEL_LENGTH :{LTBLUE}Мак
STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD :{LTBLUE}Мэтад стварэньня сыравінных прадпрыемстваў: {ORANGE}{STRING} STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD :{LTBLUE}Мэтад стварэньня сыравінных прадпрыемстваў: {ORANGE}{STRING}
STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :не ствараць STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :не ствараць
STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :як i iншыя STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_NORMAL :як i iншыя
STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :геалягiчная разьведка STR_CONFIG_SETTING_RAW_INDUSTRY_CONSTRUCTION_METHOD_PROSPECTING :геолагаразьведка
STR_CONFIG_SETTING_INDUSTRY_PLATFORM :{LTBLUE}Пляскаты рэльеф вакол прадпрыемстваў: {ORANGE}{STRING} клет{P 0:1 ка кi ак} STR_CONFIG_SETTING_INDUSTRY_PLATFORM :{LTBLUE}Плоскi рэльеф вакол прадпрыемстваў: {ORANGE}{STRING} клет{P 0:1 ка кi ак}
STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Дазволіць некалькі прадпрыемстваў аднаго тыпу на горад: {ORANGE}{STRING} STR_CONFIG_SETTING_MULTIPINDTOWN :{LTBLUE}Дазволіць некалькі прадпрыемстваў аднаго тыпу на горад: {ORANGE}{STRING}
STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Паказваць сыгналы на баку руху: {ORANGE}{STRING} STR_CONFIG_SETTING_SIGNALSIDE :{LTBLUE}Паказваць сыгналы на баку руху: {ORANGE}{STRING}
STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Паказваць фінансавую статыстыку напрыканцы года: {ORANGE}{STRING} STR_CONFIG_SETTING_SHOWFINANCES :{LTBLUE}Паказваць фінансавую статыстыку напрыканцы года: {ORANGE}{STRING}
@@ -1468,7 +1466,7 @@ STR_CONFIG_SETTING_STOP_ON_TOWN_ROAD :{LTBLUE}Даз
STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD :{LTBLUE}Дазволіць будаўніцтва прыпынкаў Ro-Ro на дарогах канкурэнтаў: {ORANGE}{STRING} STR_CONFIG_SETTING_STOP_ON_COMPETITOR_ROAD :{LTBLUE}Дазволіць будаўніцтва прыпынкаў Ro-Ro на дарогах канкурэнтаў: {ORANGE}{STRING}
STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Дазволіць будаўніцтва сумежных станцыяў: {ORANGE}{STRING} STR_CONFIG_SETTING_ADJACENT_STATIONS :{LTBLUE}Дазволіць будаўніцтва сумежных станцыяў: {ORANGE}{STRING}
STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Уключыць падтрымку некалькіх транспартных набораў NewGRF: {ORANGE}{STRING} STR_CONFIG_SETTING_DYNAMIC_ENGINES :{LTBLUE}Уключыць падтрымку некалькіх транспартных набораў NewGRF: {ORANGE}{STRING}
STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Зьмена гэтага парамэтру немагчыма, калі ў гульні ёсьць транспартныя сродкі. STR_CONFIG_SETTING_DYNAMIC_ENGINES_EXISTING_VEHICLES :{WHITE}Зьмена гэтага парамэтру немагчыма, калі ў гульні ёсць транспартныя сродкі.
STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS :{LTBLUE}Малыя аэрапорты ніколі не састарэюць: {ORANGE}{STRING} STR_CONFIG_SETTING_NEVER_EXPIRE_AIRPORTS :{LTBLUE}Малыя аэрапорты ніколі не састарэюць: {ORANGE}{STRING}
@@ -1635,7 +1633,7 @@ STR_CONFIG_SETTING_TOOLBAR_POS :{LTBLUE}Раз
STR_CONFIG_SETTING_TOOLBAR_POS_LEFT :леваруч STR_CONFIG_SETTING_TOOLBAR_POS_LEFT :леваруч
STR_CONFIG_SETTING_TOOLBAR_POS_CENTER :ў цэнтры STR_CONFIG_SETTING_TOOLBAR_POS_CENTER :ў цэнтры
STR_CONFIG_SETTING_TOOLBAR_POS_RIGHT :праваруч STR_CONFIG_SETTING_TOOLBAR_POS_RIGHT :праваруч
STR_CONFIG_SETTING_STATUSBAR_POS :{LTBLUE}Разьмяшчэньне радка стану: {ORANGE}{STRING} STR_CONFIG_SETTING_STATUSBAR_POS :{LTBLUE}Размяшчэньне радка стану: {ORANGE}{STRING}
STR_CONFIG_SETTING_STATUSBAR_POS_LEFT :Зьлева STR_CONFIG_SETTING_STATUSBAR_POS_LEFT :Зьлева
STR_CONFIG_SETTING_STATUSBAR_POS_CENTER :Пасярэдзiне STR_CONFIG_SETTING_STATUSBAR_POS_CENTER :Пасярэдзiне
STR_CONFIG_SETTING_STATUSBAR_POS_RIGHT :Зправа STR_CONFIG_SETTING_STATUSBAR_POS_RIGHT :Зправа
@@ -1670,7 +1668,7 @@ STR_CONFIG_SETTING_VEHICLES_SERVICING :{ORANGE}Абс
STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Маршруты STR_CONFIG_SETTING_VEHICLES_ROUTING :{ORANGE}Маршруты
STR_CONFIG_SETTING_VEHICLES_TRAINS :{ORANGE}Цягнікі STR_CONFIG_SETTING_VEHICLES_TRAINS :{ORANGE}Цягнікі
STR_CONFIG_SETTING_ECONOMY_TOWNS :{ORANGE}Населеныя пункты STR_CONFIG_SETTING_ECONOMY_TOWNS :{ORANGE}Населеныя пункты
STR_CONFIG_SETTING_ECONOMY_INDUSTRIES :{ORANGE}Прамысловасьць STR_CONFIG_SETTING_ECONOMY_INDUSTRIES :{ORANGE}Прамысловасць
STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :{LTBLUE}Альгарытм пошуку шляху для цягнікоў: {ORANGE}{STRING} STR_CONFIG_SETTING_PATHFINDER_FOR_TRAINS :{LTBLUE}Альгарытм пошуку шляху для цягнікоў: {ORANGE}{STRING}
@@ -1725,7 +1723,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Прав
STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Паказаць наладкi ШI/АІ STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Паказаць наладкi ШI/АІ
STR_INTRO_TOOLTIP_QUIT :{BLACK}Выйсьці з OpenTTD STR_INTRO_TOOLTIP_QUIT :{BLACK}Выйсьці з OpenTTD
# Quit window # Quit window
STR_QUIT_CAPTION :{WHITE}Выхад STR_QUIT_CAPTION :{WHITE}Выхад
STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Вы ўпэўнены, што жадаеце перапыніць гульню й вярнуцца ў {STRING}? STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Вы ўпэўнены, што жадаеце перапыніць гульню й вярнуцца ў {STRING}?
@@ -1764,7 +1761,7 @@ STR_CHEAT_SWITCH_CLIMATE_SUB_ARCTIC_LANDSCAPE :субаркт
STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE :субтрапічны ляндшафт STR_CHEAT_SWITCH_CLIMATE_SUB_TROPICAL_LANDSCAPE :субтрапічны ляндшафт
STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE :цацачны ляндшафт STR_CHEAT_SWITCH_CLIMATE_TOYLAND_LANDSCAPE :цацачны ляндшафт
STR_CHEAT_CHANGE_DATE :{LTBLUE}Зьмяненьне даты: {ORANGE}{DATE_SHORT} STR_CHEAT_CHANGE_DATE :{LTBLUE}Зьмяненьне даты: {ORANGE}{DATE_SHORT}
STR_CHEAT_CHANGE_DATE_QUERY_CAPT :{WHITE}Зьмянiць бягучы год STR_CHEAT_CHANGE_DATE_QUERY_CAPT :{WHITE}Змянiць бягучы год
STR_CHEAT_SETUP_PROD :{LTBLUE}Дазволіць зьмяненьне прадукцыйнасьці: {ORANGE}{STRING} STR_CHEAT_SETUP_PROD :{LTBLUE}Дазволіць зьмяненьне прадукцыйнасьці: {ORANGE}{STRING}
# Livery window # Livery window
@@ -1925,7 +1922,7 @@ STR_NETWORK_START_SERVER_SET_PASSWORD :{BLACK}Уста
STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Абараніце вашу гульню паролем, калі ня хочаце рабіць яе публічна даступнай STR_NETWORK_START_SERVER_PASSWORD_TOOLTIP :{BLACK}Абараніце вашу гульню паролем, калі ня хочаце рабіць яе публічна даступнай
STR_NETWORK_START_SERVER_LAN_INTERNET :Лакальная сетка / Інтэрнэт STR_NETWORK_START_SERVER_LAN_INTERNET :Лакальная сетка / Інтэрнэт
STR_NETWORK_START_SERVER_INTERNET_ADVERTISE :Інтэрнэт (зьмясьціць у агульны сьпіс) STR_NETWORK_START_SERVER_INTERNET_ADVERTISE :Інтэрнэт (зьмясціць у агульны сьпіс)
STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} клiент{P "" ы аў} STR_NETWORK_START_SERVER_CLIENTS_SELECT :{BLACK}{NUM} клiент{P "" ы аў}
STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS :{BLACK}Макс. клiентаў: STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS :{BLACK}Макс. клiентаў:
STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP :{BLACK}Выбар максымальнай колькасьці кліентаў. Ня ўсе месцы павінны быць занятыя STR_NETWORK_START_SERVER_NUMBER_OF_CLIENTS_TOOLTIP :{BLACK}Выбар максымальнай колькасьці кліентаў. Ня ўсе месцы павінны быць занятыя
@@ -1955,7 +1952,7 @@ STR_NETWORK_LANG_DUTCH :Нідэрля
STR_NETWORK_LANG_ESPERANTO :Эспэранта STR_NETWORK_LANG_ESPERANTO :Эспэранта
STR_NETWORK_LANG_FINNISH :Фінская STR_NETWORK_LANG_FINNISH :Фінская
STR_NETWORK_LANG_HUNGARIAN :Вугорская STR_NETWORK_LANG_HUNGARIAN :Вугорская
STR_NETWORK_LANG_ICELANDIC :Ісьляндзкая STR_NETWORK_LANG_ICELANDIC :Ісляндзкая
STR_NETWORK_LANG_ITALIAN :Італьянская STR_NETWORK_LANG_ITALIAN :Італьянская
STR_NETWORK_LANG_JAPANESE :Японская STR_NETWORK_LANG_JAPANESE :Японская
STR_NETWORK_LANG_KOREAN :Карэйская STR_NETWORK_LANG_KOREAN :Карэйская
@@ -2263,7 +2260,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL :{BLACK}Буда
STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Пераключэньне паміж будаўніцтвам і выдаленьнем чыгуначных рэйкаў, сыгналаў, станцыяў. Пры націснутым Ctrl станцыі ліквідуюцца разам з рэйкамі. STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Пераключэньне паміж будаўніцтвам і выдаленьнем чыгуначных рэйкаў, сыгналаў, станцыяў. Пры націснутым Ctrl станцыі ліквідуюцца разам з рэйкамі.
STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL :{BLACK}Канвэртаваць/мадэрнізаваць тып каляінаў. Пры націснутым Shift - ацэнка кошту будаўніцтва. STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL :{BLACK}Канвэртаваць/мадэрнізаваць тып каляінаў. Пры націснутым Shift - ацэнка кошту будаўніцтва.
# Rail depot construction window # Rail depot construction window
STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION :{WHITE}Кірунак дэпо STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION :{WHITE}Кірунак дэпо
STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP :{BLACK}Выберыце кірунак дэпо STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP :{BLACK}Выберыце кірунак дэпо
@@ -2295,14 +2291,14 @@ STR_BUILD_SIGNAL_SEMAPHORE_NORM_TOOLTIP :{BLACK}Звыч
STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP :{BLACK}Уваходны сэмафор (прэсыгнал).{}Адкрыты, калі хаця б адзін з выхадных сыгналаў на наступнай сэкцыі каляіны адкрыты. У астатніх выпадках закрыты. STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TOOLTIP :{BLACK}Уваходны сэмафор (прэсыгнал).{}Адкрыты, калі хаця б адзін з выхадных сыгналаў на наступнай сэкцыі каляіны адкрыты. У астатніх выпадках закрыты.
STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP :{BLACK}Выхадны сэмафор (прэсыгнал).{}Працуе як звычайны сэмафор, але яго стан улічваецца ў працы ўваходных і камбінаваных сыгналаў. STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TOOLTIP :{BLACK}Выхадны сэмафор (прэсыгнал).{}Працуе як звычайны сэмафор, але яго стан улічваецца ў працы ўваходных і камбінаваных сыгналаў.
STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP :{BLACK}Камбінаваны сэмафор (прэсыгнал).{}Працуе адначасова як уваходны і выхадны сэмафор. Гэта дазваляе будаваць вялікія «дрэвы» каляінаў з прэсыгналамі. STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TOOLTIP :{BLACK}Камбінаваны сэмафор (прэсыгнал).{}Працуе адначасова як уваходны і выхадны сэмафор. Гэта дазваляе будаваць вялікія «дрэвы» каляінаў з прэсыгналамі.
STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP :{BLACK}Маршрутны сэмафор (PMS).{}Дазваляе некалькім цягнікам знаходзіцца ў адным сыгнальным блёку, калі кожны зь іх можа зарэзэрваваць сабе бясьпечны шлях. Дазваляе праходжаньне цягнікоў у абодва бакі. STR_BUILD_SIGNAL_SEMAPHORE_PBS_TOOLTIP :{BLACK}Маршрутны сэмафор (PMS).{}Дазваляе некалькім цягнікам знаходзіцца ў адным сыгнальным блёку, калі кожны з іх можа зарэзэрваваць сабе бясьпечны шлях. Дазваляе праходжаньне цягнікоў у абодва бакі.
STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP :{BLACK}Аднабаковы маршрутны сэмафор (PMS).{}Дазваляе некалькім цягнікам знаходзіцца ў адным сыгнальным блёку, калі кожны зь іх можа зарэзэрваваць сабе бясьпечны шлях. Не дазваляе цягнікам праходзіць з адваротнага боку. STR_BUILD_SIGNAL_SEMAPHORE_PBS_OWAY_TOOLTIP :{BLACK}Аднабаковы маршрутны сэмафор (PMS).{}Дазваляе некалькім цягнікам знаходзіцца ў адным сыгнальным блёку, калі кожны з іх можа зарэзэрваваць сабе бясьпечны шлях. Не дазваляе цягнікам праходзіць з адваротнага боку.
STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP :{BLACK}Звычайны сьветлафор.{}Не дазваляе некалькім цягнікам адначасова знаходзіцца на адным блёк-участку. STR_BUILD_SIGNAL_ELECTRIC_NORM_TOOLTIP :{BLACK}Звычайны сьветлафор.{}Не дазваляе некалькім цягнікам адначасова знаходзіцца на адным блёк-участку.
STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP :{BLACK}Уваходны сьветлафор (прэсыгнал).{}Адкрыты, калі хаця б адзін з выхадных сыгналаў на наступнай сэкцыі каляіны адкрыты. У астатніх выпадках закрыты. STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TOOLTIP :{BLACK}Уваходны сьветлафор (прэсыгнал).{}Адкрыты, калі хаця б адзін з выхадных сыгналаў на наступнай сэкцыі каляіны адкрыты. У астатніх выпадках закрыты.
STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP :{BLACK}Выхадны сьветлафор (прэсыгнал).{}Працуе як звычайны сьветлафор, але яго стан улічваецца ў працы ўваходных і камбінаваных сыгналаў. STR_BUILD_SIGNAL_ELECTRIC_EXIT_TOOLTIP :{BLACK}Выхадны сьветлафор (прэсыгнал).{}Працуе як звычайны сьветлафор, але яго стан улічваецца ў працы ўваходных і камбінаваных сыгналаў.
STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP :{BLACK}Камбінаваны сьветлафор (прэсыгнал).{}Працуе адначасова як уваходны і выхадны сьветлафор. Гэта дазваляе будаваць вялікія «дрэвы» каляінаў з прэсыгналамі. STR_BUILD_SIGNAL_ELECTRIC_COMBO_TOOLTIP :{BLACK}Камбінаваны сьветлафор (прэсыгнал).{}Працуе адначасова як уваходны і выхадны сьветлафор. Гэта дазваляе будаваць вялікія «дрэвы» каляінаў з прэсыгналамі.
STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP :{BLACK}Маршрутны сьветлафор (PMS).{}Дазваляе некалькім цягнікам знаходзіцца ў адным сыгнальным блёку, калі кожны зь іх можа зарэзэрваваць сабе бясьпечны шлях. Дазваляе праходжаньне цягнікоў у абодва бакі. STR_BUILD_SIGNAL_ELECTRIC_PBS_TOOLTIP :{BLACK}Маршрутны сьветлафор (PMS).{}Дазваляе некалькім цягнікам знаходзіцца ў адным сыгнальным блёку, калі кожны з іх можа зарэзэрваваць сабе бясьпечны шлях. Дазваляе праходжаньне цягнікоў у абодва бакі.
STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP :{BLACK}Аднабаковы маршрутны сьветлафор (PMS).{}Дазваляе некалькім цягнікам знаходзіцца ў адным сыгнальным блёку, калі кожны зь іх можа зарэзэрваваць сабе бясьпечны шлях. Не дазваляе цягнікам праходзіць з адваротнага боку. STR_BUILD_SIGNAL_ELECTRIC_PBS_OWAY_TOOLTIP :{BLACK}Аднабаковы маршрутны сьветлафор (PMS).{}Дазваляе некалькім цягнікам знаходзіцца ў адным сыгнальным блёку, калі кожны з іх можа зарэзэрваваць сабе бясьпечны шлях. Не дазваляе цягнікам праходзіць з адваротнага боку.
STR_BUILD_SIGNAL_CONVERT_TOOLTIP :{BLACK}Зьмяненьне тыпаў сыгналаў.{}Калі кнопка націснута, пстрыкніце для пераўтварэньня існуючага сыгнала ў сыгнал выбранага тыпу й віду, або пстрыкніце з націснутым Ctrl для перабіраньня існуючых варыянтаў. Shift+пстрычка - ацэнка кошту пераўтварэньня. STR_BUILD_SIGNAL_CONVERT_TOOLTIP :{BLACK}Зьмяненьне тыпаў сыгналаў.{}Калі кнопка націснута, пстрыкніце для пераўтварэньня існуючага сыгнала ў сыгнал выбранага тыпу й віду, або пстрыкніце з націснутым Ctrl для перабіраньня існуючых варыянтаў. Shift+пстрычка - ацэнка кошту пераўтварэньня.
STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP :{BLACK}Шчыльнасьць аўтаматычнай расстаноўкі сыгналаў пры цягненьні STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_TOOLTIP :{BLACK}Шчыльнасьць аўтаматычнай расстаноўкі сыгналаў пры цягненьні
STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP :{BLACK}Паменшыць шчыльнасьць расстаноўкі сыгналаў STR_BUILD_SIGNAL_DRAG_SIGNALS_DENSITY_DECREASE_TOOLTIP :{BLACK}Паменшыць шчыльнасьць расстаноўкі сыгналаў
@@ -2371,7 +2367,7 @@ STR_WATERWAYS_TOOLBAR_BUILD_DOCK_TOOLTIP :{BLACK}Буда
STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP :{BLACK}Разьмясьціць буй, які можа быць выкарыстаны як пункт шляху. Пры націснутым Shift - ацэнка кошту будаўніцтва. STR_WATERWAYS_TOOLBAR_BUOY_TOOLTIP :{BLACK}Разьмясьціць буй, які можа быць выкарыстаны як пункт шляху. Пры націснутым Shift - ацэнка кошту будаўніцтва.
STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP :{BLACK}Будаўніцтва аквэдукаў Пры націснутым Shift - ацэнка кошту будаўніцтва. STR_WATERWAYS_TOOLBAR_BUILD_AQUEDUCT_TOOLTIP :{BLACK}Будаўніцтва аквэдукаў Пры націснутым Shift - ацэнка кошту будаўніцтва.
STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP :{BLACK}Пазначыць, дзе будзе вада.{}Пабудаваць канал, а пры націснутым Ctrl клетка на ўзроўні мора запаўняецца вадой. STR_WATERWAYS_TOOLBAR_CREATE_LAKE_TOOLTIP :{BLACK}Пазначыць, дзе будзе вада.{}Пабудаваць канал, а пры націснутым Ctrl клетка на ўзроўні мора запаўняецца вадой.
STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP :{BLACK}Разьмясьціць рэкі STR_WATERWAYS_TOOLBAR_CREATE_RIVER_TOOLTIP :{BLACK}Разьмясціць рэкі
# Ship depot construction window # Ship depot construction window
STR_DEPOT_BUILD_SHIP_CAPTION :{WHITE}Кірунак дока STR_DEPOT_BUILD_SHIP_CAPTION :{WHITE}Кірунак дока
@@ -2413,7 +2409,7 @@ STR_STATION_BUILD_NOISE :{BLACK}Узро
# Landscaping toolbar # Landscaping toolbar
STR_LANDSCAPING_TOOLBAR :{WHITE}Земляныя работы STR_LANDSCAPING_TOOLBAR :{WHITE}Земляныя работы
STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND :{BLACK}Апусьціць кут зямлі. Перацягваньне апускае першы абраны кут і выраўноўвае выбраную вобласьць да новай вышыні кута. Ctrl выбірае вобласьць па дыяганалі. Пры націснутым Shift - ацэнка кошту будаўніцтва. STR_LANDSCAPING_TOOLTIP_LOWER_A_CORNER_OF_LAND :{BLACK}Апусціць кут зямлі. Перацягваньне апускае першы абраны кут і выраўноўвае выбраную вобласьць да новай вышыні кута. Ctrl выбірае вобласьць па дыяганалі. Пры націснутым Shift - ацэнка кошту будаўніцтва.
STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND :{BLACK}Падняць кут зямлі. Перацягваньне падымае першы абраны кут і выраўноўвае выбраную вобласьць да новай вышыні кута. Ctrl выбірае вобласьць па дыяганалі. Пры націснутым Shift - ацэнка кошту будаўніцтва. STR_LANDSCAPING_TOOLTIP_RAISE_A_CORNER_OF_LAND :{BLACK}Падняць кут зямлі. Перацягваньне падымае першы абраны кут і выраўноўвае выбраную вобласьць да новай вышыні кута. Ctrl выбірае вобласьць па дыяганалі. Пры націснутым Shift - ацэнка кошту будаўніцтва.
STR_LANDSCAPING_LEVEL_LAND_TOOLTIP :{BLACK}Выраўнаваць зямлю да вышыні першага абранага кута. Ctrl выбірае вобласьць па дыяганалі. Пры націснутым Shift - ацэнка кошту выраўноўваньня. STR_LANDSCAPING_LEVEL_LAND_TOOLTIP :{BLACK}Выраўнаваць зямлю да вышыні першага абранага кута. Ctrl выбірае вобласьць па дыяганалі. Пры націснутым Shift - ацэнка кошту выраўноўваньня.
STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Набыцьцё зямлі. Пры націснутым Shift - ацэнка кошту набыцьця. STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Набыцьцё зямлі. Пры націснутым Shift - ацэнка кошту набыцьця.
@@ -2421,7 +2417,7 @@ STR_LANDSCAPING_TOOLTIP_PURCHASE_LAND :{BLACK}Набы
# Object construction window # Object construction window
STR_OBJECT_BUILD_CAPTION :{WHITE}Выбар аб'екта STR_OBJECT_BUILD_CAPTION :{WHITE}Выбар аб'екта
STR_OBJECT_BUILD_TOOLTIP :{BLACK}Абярыце ствараны аб'ект. Пры націснутым Shift - ацэнка кошту пабудовы. STR_OBJECT_BUILD_TOOLTIP :{BLACK}Абярыце ствараны аб'ект. Пры націснутым Shift - ацэнка кошту пабудовы.
STR_OBJECT_BUILD_CLASS_TOOLTIP :{BLACK}Абярыце клясу аб'екта для будаўніцтва STR_OBJECT_BUILD_CLASS_TOOLTIP :{BLACK}Абярыце клас аб'екта для будаўніцтва
STR_OBJECT_BUILD_PREVIEW_TOOLTIP :{BLACK}Прагляд аб'екта STR_OBJECT_BUILD_PREVIEW_TOOLTIP :{BLACK}Прагляд аб'екта
STR_OBJECT_BUILD_SIZE :{BLACK}Памер: {GOLD}{NUM} x {NUM} клетак STR_OBJECT_BUILD_SIZE :{BLACK}Памер: {GOLD}{NUM} x {NUM} клетак
@@ -2438,10 +2434,10 @@ STR_TREES_RANDOM_TREES_TOOLTIP :{BLACK}Паса
# Land generation window (SE) # Land generation window (SE)
STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Стварэньне ляндшафту STR_TERRAFORM_TOOLBAR_LAND_GENERATION_CAPTION :{WHITE}Стварэньне ляндшафту
STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE :{BLACK}Разьмясьціць камяні па мапе STR_TERRAFORM_TOOLTIP_PLACE_ROCKY_AREAS_ON_LANDSCAPE :{BLACK}Разьмясціць камяні па мапе
STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA :{BLACK}Разьмясьціць пустэльню.{}Націсьніце Ctrl, каб выдаліць яе. STR_TERRAFORM_TOOLTIP_DEFINE_DESERT_AREA :{BLACK}Разьмясціць пустэльню.{}Націсьніце Ctrl, каб выдаліць яе.
STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Павялічыць плошчу зьмяненьня рэльефу STR_TERRAFORM_TOOLTIP_INCREASE_SIZE_OF_LAND_AREA :{BLACK}Павялічыць плошчу змяненьня рэльефу
STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Паменшыць плошчу зьмяненьня рэльефу STR_TERRAFORM_TOOLTIP_DECREASE_SIZE_OF_LAND_AREA :{BLACK}Паменшыць плошчу змяненьня рэльефу
STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Стварыць выпадковую мапу STR_TERRAFORM_TOOLTIP_GENERATE_RANDOM_LAND :{BLACK}Стварыць выпадковую мапу
STR_TERRAFORM_SE_NEW_WORLD :{BLACK}Стварыць новы сцэнар STR_TERRAFORM_SE_NEW_WORLD :{BLACK}Стварыць новы сцэнар
STR_TERRAFORM_RESET_LANDSCAPE :{BLACK}Ачысьціць ляндшафт STR_TERRAFORM_RESET_LANDSCAPE :{BLACK}Ачысьціць ляндшафт
@@ -2699,7 +2695,7 @@ STR_SE_MAPGEN_FLAT_WORLD_TOOLTIP :{BLACK}Ства
STR_SE_MAPGEN_RANDOM_LAND :{WHITE}Выпадковы рэльеф STR_SE_MAPGEN_RANDOM_LAND :{WHITE}Выпадковы рэльеф
STR_SE_MAPGEN_FLAT_WORLD_HEIGHT :{BLACK}Вышыня над узроўнем мора: STR_SE_MAPGEN_FLAT_WORLD_HEIGHT :{BLACK}Вышыня над узроўнем мора:
STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN :{BLACK}Падняць ўзровень роўнай зямлі на 1 STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_DOWN :{BLACK}Падняць ўзровень роўнай зямлі на 1
STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP :{BLACK}Апусьціць ўзровень роўнай зямлі на 1 STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_UP :{BLACK}Апусціць ўзровень роўнай зямлі на 1
STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT :{WHITE}Зьмяніць вышыню роўнай зямлі STR_SE_MAPGEN_FLAT_WORLD_HEIGHT_QUERY_CAPT :{WHITE}Зьмяніць вышыню роўнай зямлі
@@ -2742,6 +2738,7 @@ STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP :{BLACK}Пера
STR_NEWGRF_SETTINGS_MOVEDOWN :{BLACK}Унiз STR_NEWGRF_SETTINGS_MOVEDOWN :{BLACK}Унiз
STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP :{BLACK}Перамясьціць выбраны файл NewGRF ніжэй STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP :{BLACK}Перамясьціць выбраны файл NewGRF ніжэй
STR_NEWGRF_SETTINGS_FILE_TOOLTIP :{BLACK}Сьпіс устаноўленых файлаў NewGRF. Выберыце файл для зьмяненьня парамэтраў STR_NEWGRF_SETTINGS_FILE_TOOLTIP :{BLACK}Сьпіс устаноўленых файлаў NewGRF. Выберыце файл для зьмяненьня парамэтраў
STR_NEWGRF_SETTINGS_SET_PARAMETERS :{BLACK}Усталяваць парамэтры STR_NEWGRF_SETTINGS_SET_PARAMETERS :{BLACK}Усталяваць парамэтры
STR_NEWGRF_SETTINGS_TOGGLE_PALETTE :{BLACK}Пераключыць палітру STR_NEWGRF_SETTINGS_TOGGLE_PALETTE :{BLACK}Пераключыць палітру
STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP :{BLACK}Пераключыць палітру для выбраных NewGRF файлаў.{}Выкарыстоўвайце пераключэньне, калі графіка ў гульні малюецца ружовым колерам. STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP :{BLACK}Пераключыць палітру для выбраных NewGRF файлаў.{}Выкарыстоўвайце пераключэньне, калі графіка ў гульні малюецца ружовым колерам.
@@ -2761,7 +2758,7 @@ STR_NEWGRF_SETTINGS_PARAMETER :{BLACK}Пара
STR_NEWGRF_SETTINGS_NO_INFO :{BLACK}Няма даступнай інфармацыі STR_NEWGRF_SETTINGS_NO_INFO :{BLACK}Няма даступнай інфармацыі
STR_NEWGRF_SETTINGS_NOT_FOUND :{RED}Файл ня знойдзены STR_NEWGRF_SETTINGS_NOT_FOUND :{RED}Файл ня знойдзены
STR_NEWGRF_SETTINGS_DISABLED :{RED}Адключана STR_NEWGRF_SETTINGS_DISABLED :{RED}Адключана
STR_NEWGRF_SETTINGS_INCOMPATIBLE :{RED}Несумяшчальна з дадзенай вэрсіяй OpenTTD STR_NEWGRF_SETTINGS_INCOMPATIBLE :{RED}Несумяшчальна з дадзенай версіяй OpenTTD
STR_NEWGRF_SETTINGS_PARAMETER_QUERY :{BLACK}Увядзіце парамэтры файла NewGRF STR_NEWGRF_SETTINGS_PARAMETER_QUERY :{BLACK}Увядзіце парамэтры файла NewGRF
@@ -2772,14 +2769,12 @@ STR_NEWGRF_PARAMETERS_RESET :{BLACK}Ськi
STR_NEWGRF_PARAMETERS_RESET_TOOLTIP :{BLACK}Ськінуць значэньнi ўсіх парамэтраў STR_NEWGRF_PARAMETERS_RESET_TOOLTIP :{BLACK}Ськінуць значэньнi ўсіх парамэтраў
STR_NEWGRF_PARAMETERS_DEFAULT_NAME :Парамэтр {NUM} STR_NEWGRF_PARAMETERS_DEFAULT_NAME :Парамэтр {NUM}
STR_NEWGRF_PARAMETERS_SETTING :{STRING}: {ORANGE}{STRING} STR_NEWGRF_PARAMETERS_SETTING :{STRING}: {ORANGE}{STRING}
STR_NEWGRF_PARAMETERS_NUM_PARAM :{LTBLUE}Колькасьць парамэтраў: {ORANGE}{NUM} STR_NEWGRF_PARAMETERS_NUM_PARAM :{LTBLUE}Колькасць параметраў: {ORANGE}{NUM}
# NewGRF readme window
# NewGRF inspect window # NewGRF inspect window
STR_NEWGRF_INSPECT_CAPTION :{WHITE}Прагляд - {STRING} STR_NEWGRF_INSPECT_CAPTION :{WHITE}Прагляд - {STRING}
STR_NEWGRF_INSPECT_PARENT_BUTTON :{BLACK}Бацька (parent) STR_NEWGRF_INSPECT_PARENT_BUTTON :{BLACK}Бацька (parent)
STR_NEWGRF_INSPECT_PARENT_TOOLTIP :{BLACK}Прагляд аб'екта ў кантэксьце бацькі STR_NEWGRF_INSPECT_PARENT_TOOLTIP :{BLACK}Прагляд аб'екта ў кантэксце бацькі
STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT :{STRING} у {HEX} STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT :{STRING} у {HEX}
STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_OBJECT :Аб'ект STR_NEWGRF_INSPECT_CAPTION_OBJECT_AT_OBJECT :Аб'ект
@@ -2790,7 +2785,7 @@ STR_NEWGRF_INSPECT_QUERY_CAPTION :{WHITE}Пара
# Sprite aligner window # Sprite aligner window
STR_SPRITE_ALIGNER_CAPTION :{WHITE}Выраўноўваньне спрайта {COMMA} ({STRING}) STR_SPRITE_ALIGNER_CAPTION :{WHITE}Выраўноўваньне спрайта {COMMA} ({STRING})
STR_SPRITE_ALIGNER_NEXT_BUTTON :{BLACK}Наступны спрайт STR_SPRITE_ALIGNER_NEXT_BUTTON :{BLACK}Наступны спрайт
STR_SPRITE_ALIGNER_NEXT_TOOLTIP :{BLACK}Перайсьці да наступнага нармальнага спрайта, прапускаючы псэўдаспрайты, а таксама зьмяненьнi колеру/шрыфтавыя. STR_SPRITE_ALIGNER_NEXT_TOOLTIP :{BLACK}Перайсьці да наступнага нармальнага спрайта, прапускаючы псэўдаспрайты, а таксама змяненьнi колеру/шрыфтавыя.
STR_SPRITE_ALIGNER_GOTO_BUTTON :{BLACK}Перайсьці да спрайта STR_SPRITE_ALIGNER_GOTO_BUTTON :{BLACK}Перайсьці да спрайта
STR_SPRITE_ALIGNER_GOTO_TOOLTIP :{BLACK}Перайсьці да зададзеных спрайту. Калі спрайт не нармальны, пераход адбудзецца да наступнага нармальнага. STR_SPRITE_ALIGNER_GOTO_TOOLTIP :{BLACK}Перайсьці да зададзеных спрайту. Калі спрайт не нармальны, пераход адбудзецца да наступнага нармальнага.
STR_SPRITE_ALIGNER_PREVIOUS_BUTTON :{BLACK}Папярэдні спрайт STR_SPRITE_ALIGNER_PREVIOUS_BUTTON :{BLACK}Папярэдні спрайт
@@ -2823,7 +2818,7 @@ STR_NEWGRF_ERROR_UNEXPECTED_SPRITE :Нечакан
STR_NEWGRF_ERROR_UNKNOWN_PROPERTY :Невядомая ўласьцівасьць для Action 0. STR_NEWGRF_ERROR_UNKNOWN_PROPERTY :Невядомая ўласьцівасьць для Action 0.
STR_NEWGRF_ERROR_INVALID_ID :Выкарыстоўваецца няправільны ID. STR_NEWGRF_ERROR_INVALID_ID :Выкарыстоўваецца няправільны ID.
STR_NEWGRF_ERROR_CORRUPT_SPRITE :{YELLOW}{STRING} утрымлiвае пашкоджаны спрайт. Усе пашкоджаныя спрайты будуць паказаны чырвоным знакам пытаньня (?). STR_NEWGRF_ERROR_CORRUPT_SPRITE :{YELLOW}{STRING} утрымлiвае пашкоджаны спрайт. Усе пашкоджаныя спрайты будуць паказаны чырвоным знакам пытаньня (?).
STR_NEWGRF_ERROR_MULTIPLE_ACTION_8 :Зьмяшчае некалькі Action 8 дзеяньняў. STR_NEWGRF_ERROR_MULTIPLE_ACTION_8 :Змяшчае некалькі Action 8 дзеяньняў.
STR_NEWGRF_ERROR_READ_BOUNDS :Дадзеныя раптоўна скончыліся. STR_NEWGRF_ERROR_READ_BOUNDS :Дадзеныя раптоўна скончыліся.
STR_NEWGRF_ERROR_MISSING_SPRITES :{WHITE}У бягучым наборы базавай графікі адсутнічаюць выявы некаторых аб'ектаў.{}Калі ласка, абнавіце модуль базавай графікі. STR_NEWGRF_ERROR_MISSING_SPRITES :{WHITE}У бягучым наборы базавай графікі адсутнічаюць выявы некаторых аб'ектаў.{}Калі ласка, абнавіце модуль базавай графікі.
STR_NEWGRF_ERROR_GRM_FAILED :Запрошаныя рэсурсы GRF недаступныя STR_NEWGRF_ERROR_GRM_FAILED :Запрошаныя рэсурсы GRF недаступныя
@@ -2854,7 +2849,7 @@ STR_NEWGRF_BROKEN_VEHICLE_LENGTH :{WHITE}Мяня
STR_BROKEN_VEHICLE_LENGTH :{WHITE}Цягнік «{VEHICLE}», які належыць «{COMPANY}», мае няправільную даўжыню. Верагодна, гэта выклікана праблемамі ў файле новай графікі. Гульня можа рассынхранізавацца або «выляцець». STR_BROKEN_VEHICLE_LENGTH :{WHITE}Цягнік «{VEHICLE}», які належыць «{COMPANY}», мае няправільную даўжыню. Верагодна, гэта выклікана праблемамі ў файле новай графікі. Гульня можа рассынхранізавацца або «выляцець».
STR_NEWGRF_BUGGY :{WHITE}NewGRF «{0:STRING}» падае няправільную інфармацыю. STR_NEWGRF_BUGGY :{WHITE}NewGRF «{0:STRING}» падае няправільную інфармацыю.
STR_NEWGRF_BUGGY_ARTICULATED_CARGO :{WHITE}Інфармацыя аб умяшчальнасьці/пераабсталяваньнi для лякаматыва «{1:ENGINE}» пасьля пабудовы адрозніваецца ад зьвестак у сьпісе пакупкі, што можа перашкодзіць функцыі аўтаабнаўленьня/аўтазамены карэктна зрабіць пераабсталяваньне. STR_NEWGRF_BUGGY_ARTICULATED_CARGO :{WHITE}Інфармацыя аб умяшчальнасьці/пераабсталяваньнi для лякаматыва «{1:ENGINE}» пасля пабудовы адрозніваецца ад зьвестак у сьпісе пакупкі, што можа перашкодзіць функцыі аўтаабнаўленьня/аўтазамены карэктна зрабіць пераабсталяваньне.
STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK :{WHITE}«{1:STRING}» выклікаў бясконцы цыкл. STR_NEWGRF_BUGGY_ENDLESS_PRODUCTION_CALLBACK :{WHITE}«{1:STRING}» выклікаў бясконцы цыкл.
# 'User removed essential NewGRFs'-placeholders for stuff without specs # 'User removed essential NewGRFs'-placeholders for stuff without specs
@@ -2864,14 +2859,12 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY :{COMMA} <нев
STR_NEWGRF_INVALID_ENGINE :<няправільная мадэль> STR_NEWGRF_INVALID_ENGINE :<няправільная мадэль>
STR_NEWGRF_INVALID_INDUSTRYTYPE :<невядомае прадпрыемства> STR_NEWGRF_INVALID_INDUSTRYTYPE :<невядомае прадпрыемства>
# NewGRF scanning window
# Sign list window # Sign list window
STR_SIGN_LIST_CAPTION :{WHITE}Сьпіс таблічак - {COMMA} табліч{P ка кi ак} STR_SIGN_LIST_CAPTION :{WHITE}Сьпіс таблічак - {COMMA} табліч{P ка кi ак}
STR_SIGN_LIST_MATCH_CASE :{BLACK}Рэгiстр STR_SIGN_LIST_MATCH_CASE :{BLACK}Рэгiстр
STR_SIGN_LIST_CLEAR :{BLACK}Ачысьціць фільтр STR_SIGN_LIST_CLEAR :{BLACK}Ачысціць фільтр
STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Пераключыць праверку рэгістра пры параўнанні назваў таблiчак з фільтрам STR_SIGN_LIST_MATCH_CASE_TOOLTIP :{BLACK}Пераключыць праверку рэгістра пры параўнанні назваў таблiчак з фільтрам
STR_SIGN_LIST_CLEAR_TOOLTIP :{BLACK}Ачысьціць фільтр STR_SIGN_LIST_CLEAR_TOOLTIP :{BLACK}Ачысціць фільтр
# Sign window # Sign window
STR_EDIT_SIGN_CAPTION :{WHITE}Зьмяніць надпіс на таблічцы STR_EDIT_SIGN_CAPTION :{WHITE}Зьмяніць надпіс на таблічцы
@@ -2986,10 +2979,10 @@ STR_CARGO_RATING_OUTSTANDING :Цудоўны
STR_STATION_VIEW_CENTER_TOOLTIP :{BLACK}Паказаць станцыю ў асноўным вакне. Ctrl+клік - паказаць у дадатковым вакне. STR_STATION_VIEW_CENTER_TOOLTIP :{BLACK}Паказаць станцыю ў асноўным вакне. Ctrl+клік - паказаць у дадатковым вакне.
STR_STATION_VIEW_RENAME_TOOLTIP :{BLACK}Перайменаваць станцыю STR_STATION_VIEW_RENAME_TOOLTIP :{BLACK}Перайменаваць станцыю
STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP :{BLACK}Паказаць усе цягнiкi, у раскладзе якіх ёсьць гэтая станцыя STR_STATION_VIEW_SCHEDULED_TRAINS_TOOLTIP :{BLACK}Паказаць усе цягнiкi, у раскладзе якіх ёсць гэтая станцыя
STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP :{BLACK}Паказаць усе аўтамабiлi, у раскладзе якіх ёсьць гэты тэрмiнал/прыпынак STR_STATION_VIEW_SCHEDULED_ROAD_VEHICLES_TOOLTIP :{BLACK}Паказаць усе аўтамабiлi, у раскладзе якіх ёсць гэты тэрмiнал/прыпынак
STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP :{BLACK}Паказаць увесь авiятранспарт, у раскладзе якога ёсьць гэты аэрапорт STR_STATION_VIEW_SCHEDULED_AIRCRAFT_TOOLTIP :{BLACK}Паказаць увесь авiятранспарт, у раскладзе якога ёсць гэты аэрапорт
STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP :{BLACK}Паказаць усе караблі, у раскладзе якіх ёсьць гэтая прыстань STR_STATION_VIEW_SCHEDULED_SHIPS_TOOLTIP :{BLACK}Паказаць усе караблі, у раскладзе якіх ёсць гэтая прыстань
STR_STATION_VIEW_RENAME_STATION_CAPTION :Перайменаваць станцыю STR_STATION_VIEW_RENAME_STATION_CAPTION :Перайменаваць станцыю
@@ -3029,7 +3022,7 @@ STR_FINANCES_TOTAL_CURRENCY :{BLACK}{CURRENC
STR_FINANCES_BORROW_BUTTON :{BLACK}Пазычыць {CURRENCY} STR_FINANCES_BORROW_BUTTON :{BLACK}Пазычыць {CURRENCY}
STR_FINANCES_BORROW_TOOLTIP :{BLACK}Павелічыць памер пазыкі. Ctrl+клiк - пазычыць да максымальнай сумы. STR_FINANCES_BORROW_TOOLTIP :{BLACK}Павелічыць памер пазыкі. Ctrl+клiк - пазычыць да максымальнай сумы.
STR_FINANCES_REPAY_BUTTON :{BLACK}Аддаць {CURRENCY} STR_FINANCES_REPAY_BUTTON :{BLACK}Аддаць {CURRENCY}
STR_FINANCES_REPAY_TOOLTIP :{BLACK}Вярнуць частку пазыкі. Ctrl+клiк - вярнуць усё, па магчымасьці. STR_FINANCES_REPAY_TOOLTIP :{BLACK}Вярнуць частку пазыкі. Ctrl+клiк - вярнуць усё, па магчымасці.
# Company view # Company view
STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM} STR_COMPANY_VIEW_CAPTION :{WHITE}{COMPANY} {BLACK}{COMPANYNUM}
@@ -3053,8 +3046,8 @@ STR_COMPANY_VIEW_VIEW_HQ_TOOLTIP :{BLACK}Агле
STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Перамясьціць STR_COMPANY_VIEW_RELOCATE_HQ :{BLACK}Перамясьціць
STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Перамясьціць штаб-кватэру кампаніі ў іншае месца за 1% ацэнкавага кошту капіталу кампаніі. Shift+пстрычка - ацэнка кошту пераносу. STR_COMPANY_VIEW_RELOCATE_COMPANY_HEADQUARTERS :{BLACK}Перамясьціць штаб-кватэру кампаніі ў іншае месца за 1% ацэнкавага кошту капіталу кампаніі. Shift+пстрычка - ацэнка кошту пераносу.
STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Зьнешнасьць STR_COMPANY_VIEW_NEW_FACE_BUTTON :{BLACK}Знешнасьць
STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Зьмяніць зьнешнасьць дырэктара STR_COMPANY_VIEW_NEW_FACE_TOOLTIP :{BLACK}Зьмяніць знешнасьць дырэктара
STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Колер STR_COMPANY_VIEW_COLOUR_SCHEME_BUTTON :{BLACK}Колер
STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP :{BLACK}Зьмяніць колер транспартных сродкаў кампаніі STR_COMPANY_VIEW_COLOUR_SCHEME_TOOLTIP :{BLACK}Зьмяніць колер транспартных сродкаў кампаніі
STR_COMPANY_VIEW_COMPANY_NAME_BUTTON :{BLACK}Назва кампаніі STR_COMPANY_VIEW_COMPANY_NAME_BUTTON :{BLACK}Назва кампаніі
@@ -3491,7 +3484,7 @@ STR_VEHICLE_DETAILS_TRAIN_ARTICULATED_RV_CAPACITY :{BLACK}Ёміс
STR_REFIT_CAPTION :{WHITE}{VEHICLE} (Пераабсталяваньне) STR_REFIT_CAPTION :{WHITE}{VEHICLE} (Пераабсталяваньне)
STR_REFIT_TITLE :{GOLD}Выберыце тып грузу для перавозкі: STR_REFIT_TITLE :{GOLD}Выберыце тып грузу для перавозкі:
STR_REFIT_NEW_CAPACITY_COST_OF_REFIT :{BLACK}Новая ёмістасьць: {GOLD}{CARGO}{}{BLACK}Кошт пераабсталяваньня: {GOLD}{CURRENCY} STR_REFIT_NEW_CAPACITY_COST_OF_REFIT :{BLACK}Новая ёмістасьць: {GOLD}{CARGO}{}{BLACK}Кошт пераабсталяваньня: {GOLD}{CURRENCY}
STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT :{BLACK}Новая ёмістасьць: {GOLD}{CARGO}, {GOLD}{CARGO}{}{BLACK}Кошт пераабсталяваньня: {GOLD}{CURRENCY} STR_REFIT_NEW_CAPACITY_COST_OF_AIRCRAFT_REFIT :{BLACK}Новая ёмістасць: {GOLD}{CARGO}, {GOLD}{CARGO}{}{BLACK}Кошт пераабсталяваньня: {GOLD}{CURRENCY}
STR_REFIT_SELECT_VEHICLES_TOOLTIP :{BLACK}Абярыце вагоны для пераабсталяваньня. Можна абвесьці мышшу некалькі вагонаў. Пстрычка па-за межамі састава абярэ ўвесь састаў. Ctrl+пстрычка абярэ вагоны да канца састава. STR_REFIT_SELECT_VEHICLES_TOOLTIP :{BLACK}Абярыце вагоны для пераабсталяваньня. Можна абвесьці мышшу некалькі вагонаў. Пстрычка па-за межамі састава абярэ ўвесь састаў. Ctrl+пстрычка абярэ вагоны да канца састава.
STR_REFIT_TRAIN_LIST_TOOLTIP :{BLACK}Выберыце тып грузу для перавозкі STR_REFIT_TRAIN_LIST_TOOLTIP :{BLACK}Выберыце тып грузу для перавозкі
@@ -3550,11 +3543,9 @@ STR_ORDER_SERVICE :{BLACK}Абсл
STR_ORDER_DROP_GO_ALWAYS_DEPOT :Ісьці заўсёды STR_ORDER_DROP_GO_ALWAYS_DEPOT :Ісьці заўсёды
STR_ORDER_DROP_SERVICE_DEPOT :Абслужыць, калі неабходна STR_ORDER_DROP_SERVICE_DEPOT :Абслужыць, калі неабходна
STR_ORDER_DROP_HALT_DEPOT :Стоп STR_ORDER_DROP_HALT_DEPOT :Стоп
STR_ORDER_SERVICE_TOOLTIP :{BLACK}Прапусьціць гэтае заданьне, калі абслугоўваньне не патрабуецца STR_ORDER_SERVICE_TOOLTIP :{BLACK}Прапусціць гэтае заданьне, калі абслугоўваньне не патрабуецца
STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Парамэтр транспарту для параўнаньня STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Парамэтр транспарту для параўнаньня
# Conditional order variables, must follow order of OrderConditionVariable enum
STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Працэнт пагрузкі STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Працэнт пагрузкі
STR_ORDER_CONDITIONAL_RELIABILITY :Надзейнасьць STR_ORDER_CONDITIONAL_RELIABILITY :Надзейнасьць
STR_ORDER_CONDITIONAL_MAX_SPEED :Макс. хуткасьць STR_ORDER_CONDITIONAL_MAX_SPEED :Макс. хуткасьць
@@ -3633,8 +3624,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD :(Не разг
STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY :(Не разгружацца й чакаць поўнай загрузкі любым грузам) STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY :(Не разгружацца й чакаць поўнай загрузкі любым грузам)
STR_ORDER_NO_UNLOAD_NO_LOAD :(Не разгружацца й не грузiцца) STR_ORDER_NO_UNLOAD_NO_LOAD :(Не разгружацца й не грузiцца)
STR_ORDER_STOP_LOCATION_NEAR_END :[пачатак станцыi] STR_ORDER_STOP_LOCATION_NEAR_END :[пачатак станцыi]
STR_ORDER_STOP_LOCATION_MIDDLE :[сярэдзiна станцыi] STR_ORDER_STOP_LOCATION_MIDDLE :[сярэдзiна станцыi]
STR_ORDER_STOP_LOCATION_FAR_END :[канец станцыі] STR_ORDER_STOP_LOCATION_FAR_END :[канец станцыі]
@@ -3797,7 +3786,7 @@ STR_GAME_SAVELOAD_NOT_AVAILABLE :<недасту
STR_WARNING_LOADGAME_REMOVED_TRAMS :{WHITE}Гульня была захавана ў вэрсіі без падтрымкі трамваяў. Усе трамваі былі адключаны. STR_WARNING_LOADGAME_REMOVED_TRAMS :{WHITE}Гульня была захавана ў вэрсіі без падтрымкі трамваяў. Усе трамваі былі адключаны.
# Map generation messages # Map generation messages
STR_ERROR_COULD_NOT_CREATE_TOWN :{WHITE}Генэрацыя мапы спынена...{}... няма прыдатных месцаў для разьмяшчэньня гарадоў STR_ERROR_COULD_NOT_CREATE_TOWN :{WHITE}Генэрацыя карты спынена...{}... няма прыдатных месцаў для разьмяшчэньня гарадоў
STR_ERROR_NO_TOWN_IN_SCENARIO :{WHITE}... у гэтым сцэнары няма гарадоў STR_ERROR_NO_TOWN_IN_SCENARIO :{WHITE}... у гэтым сцэнары няма гарадоў
STR_ERROR_PNGMAP :{WHITE}Не атрымалася загрузіць ляндшафт з PNG... STR_ERROR_PNGMAP :{WHITE}Не атрымалася загрузіць ляндшафт з PNG...
@@ -3808,10 +3797,8 @@ STR_ERROR_PNGMAP_MISC :{WHITE}... не
STR_ERROR_BMPMAP :{WHITE}Не атрымалася загрузіць ляндшафт з BMP... STR_ERROR_BMPMAP :{WHITE}Не атрымалася загрузіць ляндшафт з BMP...
STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... немагчыма пераўтварыць тып вiдарысу. STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... немагчыма пераўтварыць тып вiдарысу.
STR_ERROR_HEIGHTMAP_TOO_LARGE :{WHITE}... выява занадта вялiкая
STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Выхад за межы даступных значэньняў STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Выхад за межы даступных значэньняў
STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}Зьмяненьне памераў зыходнай мапы да такіх значэньняў не рэкамэндуецца. Працягваць? STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}Змяненьне памераў зыходнай карты да такіх значэньняў не рэкамендуецца. Працягваць?
# Soundset messages # Soundset messages
STR_WARNING_FALLBACK_SOUNDSET :{WHITE}Бягучая гукавая схэма абрана сістэмай аўтаматычна. Дадатковыя наборы гукаў можна загрузіць праз сістэму анлайн-кантэнту. STR_WARNING_FALLBACK_SOUNDSET :{WHITE}Бягучая гукавая схэма абрана сістэмай аўтаматычна. Дадатковыя наборы гукаў можна загрузіць праз сістэму анлайн-кантэнту.
@@ -3838,7 +3825,7 @@ STR_ERROR_ALREADY_BUILT :{WHITE}... уж
STR_ERROR_OWNED_BY :{WHITE}... належыць {STRING} STR_ERROR_OWNED_BY :{WHITE}... належыць {STRING}
STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... участак належыць іншай кампаніі STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... участак належыць іншай кампаніі
STR_ERROR_TERRAFORM_LIMIT_REACHED :{WHITE}... дасягнуты лiмiт ляндшафтных зьменаў STR_ERROR_TERRAFORM_LIMIT_REACHED :{WHITE}... дасягнуты лiмiт ляндшафтных зьменаў
STR_ERROR_CLEARING_LIMIT_REACHED :{WHITE}... дасягнута абмежаваньне па колькасьці ачышчаных клетак STR_ERROR_CLEARING_LIMIT_REACHED :{WHITE}... дасягнута абмежаваньне па колькасці ачышчаных клетак
STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Імя павінна быць унікальным STR_ERROR_NAME_MUST_BE_UNIQUE :{WHITE}Імя павінна быць унікальным
STR_ERROR_GENERIC_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} на шляху STR_ERROR_GENERIC_OBJECT_IN_THE_WAY :{WHITE}{1:STRING} на шляху
STR_ERROR_NOT_ALLOWED_WHILE_PAUSED :{WHITE}Забаронена падчас паўзы STR_ERROR_NOT_ALLOWED_WHILE_PAUSED :{WHITE}Забаронена падчас паўзы
@@ -3848,7 +3835,7 @@ STR_ERROR_LOCAL_AUTHORITY_REFUSES_TO_ALLOW_THIS :{WHITE}... ад
STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT :{WHITE}Адміністрацыя г. {NBSP}{TOWN} забараняе пабудову яшчэ аднаго аэрапорта ў горадзе STR_ERROR_LOCAL_AUTHORITY_REFUSES_AIRPORT :{WHITE}Адміністрацыя г. {NBSP}{TOWN} забараняе пабудову яшчэ аднаго аэрапорта ў горадзе
STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE :{WHITE}Адміністрацыя г. {NBSP}{TOWN} не дазваляе будаўніцтва аэрапорта з-за высокага ўзроўню шуму. STR_ERROR_LOCAL_AUTHORITY_REFUSES_NOISE :{WHITE}Адміністрацыя г. {NBSP}{TOWN} не дазваляе будаўніцтва аэрапорта з-за высокага ўзроўню шуму.
STR_ERROR_BRIBE_FAILED :{WHITE}Ваша спроба даць хабар была STR_ERROR_BRIBE_FAILED :{WHITE}Ваша спроба даць хабар была
STR_ERROR_BRIBE_FAILED_2 :{WHITE}выяўлена рэгіянальным сьледчым STR_ERROR_BRIBE_FAILED_2 :{WHITE}выяўлена рэгіянальным следчым
# Levelling errors # Levelling errors
STR_ERROR_CAN_T_RAISE_LAND_HERE :{WHITE}Тут немагчыма падвысіць узровень зямлі... STR_ERROR_CAN_T_RAISE_LAND_HERE :{WHITE}Тут немагчыма падвысіць узровень зямлі...
@@ -3880,7 +3867,7 @@ STR_ERROR_CAN_T_GENERATE_TOWN :{WHITE}Нема
STR_ERROR_CAN_T_RENAME_TOWN :{WHITE}Немагчыма перайменаваць горад... STR_ERROR_CAN_T_RENAME_TOWN :{WHITE}Немагчыма перайменаваць горад...
STR_ERROR_CAN_T_FOUND_TOWN_HERE :{WHITE}Тут немагчыма пабудаваць горад... STR_ERROR_CAN_T_FOUND_TOWN_HERE :{WHITE}Тут немагчыма пабудаваць горад...
STR_ERROR_CAN_T_EXPAND_TOWN :{WHITE}Немагчыма пашырыць горад... STR_ERROR_CAN_T_EXPAND_TOWN :{WHITE}Немагчыма пашырыць горад...
STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB :{WHITE}... занадта блізка да краю мапы STR_ERROR_TOO_CLOSE_TO_EDGE_OF_MAP_SUB :{WHITE}... занадта блізка да краю карты
STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN :{WHITE}... занадта блізка да іншага горада STR_ERROR_TOO_CLOSE_TO_ANOTHER_TOWN :{WHITE}... занадта блізка да іншага горада
STR_ERROR_TOO_MANY_TOWNS :{WHITE}... занадта шмат гарадоў STR_ERROR_TOO_MANY_TOWNS :{WHITE}... занадта шмат гарадоў
STR_ERROR_NO_SPACE_FOR_TOWN :{WHITE}... няма месца на мапе STR_ERROR_NO_SPACE_FOR_TOWN :{WHITE}... няма месца на мапе

View File

@@ -448,7 +448,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT :Ampliado em cap
STR_ABOUT_MENU_GIANT_SCREENSHOT :Captura de tela do mapa inteiro STR_ABOUT_MENU_GIANT_SCREENSHOT :Captura de tela do mapa inteiro
STR_ABOUT_MENU_ABOUT_OPENTTD :Sobre 'OpenTTD' STR_ABOUT_MENU_ABOUT_OPENTTD :Sobre 'OpenTTD'
STR_ABOUT_MENU_SPRITE_ALIGNER :Alinhador de "sprites" STR_ABOUT_MENU_SPRITE_ALIGNER :Alinhador de "sprites"
STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Alternar caixas limítrofes
############ range ends here ############ range ends here
############ range for days starts (also used for the place in the highscore window) ############ range for days starts (also used for the place in the highscore window)
@@ -541,7 +540,7 @@ STR_GRAPH_PERFORMANCE_DETAIL_TOOLTIP :{BLACK}Exibir a
# Graph key window # Graph key window
STR_GRAPH_KEY_CAPTION :{WHITE}Chave para gráficos da empresa STR_GRAPH_KEY_CAPTION :{WHITE}Chave para gráficos da empresa
STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Clique aqui para alternar a entrada da empresa no gráfico STR_GRAPH_KEY_COMPANY_SELECTION_TOOLTIP :{BLACK}Clique aqui para alternar a entrada da empresa no gráfico em ligado/desligado
# Company league window # Company league window
STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Tabela da Liga das Empresas STR_COMPANY_LEAGUE_TABLE_CAPTION :{WHITE}Tabela da Liga das Empresas
@@ -841,9 +840,9 @@ STR_NEWS_OFFER_OF_SUBSIDY_EXPIRED :{BIGFONT}{BLACK
STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIGFONT}{BLACK}Subsídio removido:{}{} Serviço de {STRING} de {STRING} para {STRING} não é mais subsidiado STR_NEWS_SUBSIDY_WITHDRAWN_SERVICE :{BIGFONT}{BLACK}Subsídio removido:{}{} Serviço de {STRING} de {STRING} para {STRING} não é mais subsidiado
STR_NEWS_SERVICE_SUBSIDY_OFFERED :{BIGFONT}{BLACK}Subsídio de serviço oferecido:{}{} Primeiro serviço de {STRING} de {STRING} para {STRING} atrairá subsídio de um ano da autoridade local! STR_NEWS_SERVICE_SUBSIDY_OFFERED :{BIGFONT}{BLACK}Subsídio de serviço oferecido:{}{} Primeiro serviço de {STRING} de {STRING} para {STRING} atrairá subsídio de um ano da autoridade local!
STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF :{BIGFONT}{BLACK}Subsídio de serviço concedido á {STRING}!{}{}{STRING} serviço de {STRING} para {STRING} pagará 50% extra durante o próximo ano ano! STR_NEWS_SERVICE_SUBSIDY_AWARDED_HALF :{BIGFONT}{BLACK}Subsídio de serviço concedido á {STRING}!{}{}{STRING} serviço de {STRING} para {STRING} pagará 50% extra durante o próximo ano ano!
STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE :{BIGFONT}{BLACK}Subsídio de serviço concedido á {STRING}!{}{}{STRING} serviço de {STRING} para {STRING} pagará o dobro de tarifas durante o próximo ano! STR_NEWS_SERVICE_SUBSIDY_AWARDED_DOUBLE :{BIGFONT}{BLACK}Subsídio de serviço concedido á {STRING}!{}{}{STRING} serviço de {STRING} para {STRING} pagará o dobro de impostos durante o próximo ano!
STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE :{BIGFONT}{BLACK}Subsídio de serviço concedido á {STRING}!{}{}{STRING} serviço de {STRING} para {STRING} pagará o triplo de tarifas durante o próximo ano! STR_NEWS_SERVICE_SUBSIDY_AWARDED_TRIPLE :{BIGFONT}{BLACK}Subsídio de serviço concedido á {STRING}!{}{}{STRING} serviço de {STRING} para {STRING} pagará o triplo de impostos durante o próximo ano!
STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE :{BIGFONT}{BLACK}Subsídio de serviço concedido á {STRING}!{}{}{STRING} serviço de {STRING} para {STRING} pagará o quadruplo de tarifas durante o próximo ano! STR_NEWS_SERVICE_SUBSIDY_AWARDED_QUADRUPLE :{BIGFONT}{BLACK}Subsídio de serviço concedido á {STRING}!{}{}{STRING} serviço de {STRING} para {STRING} pagará o quadruplo de impostos durante o próximo ano!
STR_NEWS_ROAD_REBUILDING :{BIGFONT}{BLACK}Tráfego caótico em {TOWN}!{}{} Programa de reconstrução rodoviária financiado por {STRING} provoca 6 meses de miséria aos condutores! STR_NEWS_ROAD_REBUILDING :{BIGFONT}{BLACK}Tráfego caótico em {TOWN}!{}{} Programa de reconstrução rodoviária financiado por {STRING} provoca 6 meses de miséria aos condutores!
@@ -1058,7 +1057,6 @@ STR_SEA_LEVEL_HIGH :Alto
STR_SEA_LEVEL_CUSTOM :Personalizado STR_SEA_LEVEL_CUSTOM :Personalizado
STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Personalizado ({NUM}%) STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Personalizado ({NUM}%)
STR_DISASTER_NONE :Nenhum STR_DISASTER_NONE :Nenhum
STR_DISASTER_REDUCED :Reduzido STR_DISASTER_REDUCED :Reduzido
STR_DISASTER_NORMAL :Normal STR_DISASTER_NORMAL :Normal
@@ -1409,7 +1407,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Checar p
STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Exibir configs. da IA STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Exibir configs. da IA
STR_INTRO_TOOLTIP_QUIT :{BLACK}Sair de 'OpenTTD' STR_INTRO_TOOLTIP_QUIT :{BLACK}Sair de 'OpenTTD'
# Quit window # Quit window
STR_QUIT_CAPTION :{WHITE}Sair STR_QUIT_CAPTION :{WHITE}Sair
STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Tem a certeza que deseja abandonar este jogo e voltar ao {STRING}? STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Tem a certeza que deseja abandonar este jogo e voltar ao {STRING}?
@@ -1925,7 +1922,7 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_AUTORAIL :{BLACK}Construi
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING :{BLACK}Construir depósito (para compra e manutenção de trens). Shift altera construção/estimação de custo STR_RAIL_TOOLBAR_TOOLTIP_BUILD_TRAIN_DEPOT_FOR_BUILDING :{BLACK}Construir depósito (para compra e manutenção de trens). Shift altera construção/estimação de custo
STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT :{BLACK}Converter linha em ponto de controle. Ctrl permite a união de pontos de controle. Shift altera construção/estimação de custo STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL_TO_WAYPOINT :{BLACK}Converter linha em ponto de controle. Ctrl permite a união de pontos de controle. Shift altera construção/estimação de custo
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION :{BLACK}Construir estação ferroviária. Ctrl permite a união de estações. Shift altera construção/estimação de custo STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_STATION :{BLACK}Construir estação ferroviária. Ctrl permite a união de estações. Shift altera construção/estimação de custo
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS :{BLACK}Construir sinais ferroviários. Ctrl alterna a construção de semáforos/sinais{}Clicar e arrastar constroi sinais até a próxima junção{}Ctrl+Clique alterna a janela de seleção de sinais. Shift altera construção/estimação de custo STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_SIGNALS :{BLACK}Construir sinais ferroviários. Ctrl liga/desliga a constução de semáforos/sinais{}Clicar e arrastar constroi sinais até a próxima junção{}Ctrl+Clique liga/desliga a janela de seleção de sinais. Shift altera construção/estimação de custo
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE :{BLACK}Construir ponte ferroviária. Shift altera construção/estimação de custo STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_BRIDGE :{BLACK}Construir ponte ferroviária. Shift altera construção/estimação de custo
STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL :{BLACK}Construir túnel ferroviário. Shift altera construção/estimação de custo STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL :{BLACK}Construir túnel ferroviário. Shift altera construção/estimação de custo
STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Alternar construir/remover ferrovias, sinais, pontos de controle e estações. Segure ctrl para remover os trilhos de estações e pontos de controle. STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Alternar construir/remover ferrovias, sinais, pontos de controle e estações. Segure ctrl para remover os trilhos de estações e pontos de controle.
@@ -2407,8 +2404,8 @@ STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP :{BLACK}Move o N
STR_NEWGRF_SETTINGS_FILE_TOOLTIP :{BLACK}Lista dos NewGRF instalados. Clique em um deles para mudar seus parâmetros STR_NEWGRF_SETTINGS_FILE_TOOLTIP :{BLACK}Lista dos NewGRF instalados. Clique em um deles para mudar seus parâmetros
STR_NEWGRF_SETTINGS_SET_PARAMETERS :{BLACK}Definir parâmetros STR_NEWGRF_SETTINGS_SET_PARAMETERS :{BLACK}Definir parâmetros
STR_NEWGRF_SETTINGS_TOGGLE_PALETTE :{BLACK}Alterna paleta STR_NEWGRF_SETTINGS_TOGGLE_PALETTE :{BLACK}Liga/Desliga paleta
STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP :{BLACK}Alterna a paleta do NewGRF selecionado.{}Faça isso quando os gráficos deste ficarem rosa durante o jogo STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP :{BLACK}Liga/desliga a paleta do NewGRF selecionado.{}Faça isso quando os gráficos deste ficarem rosa durante o jogo
STR_NEWGRF_SETTINGS_APPLY_CHANGES :{BLACK}Aplicar alterações STR_NEWGRF_SETTINGS_APPLY_CHANGES :{BLACK}Aplicar alterações
STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON :{BLACK}Procurar o conteúdo on-line STR_NEWGRF_SETTINGS_FIND_MISSING_CONTENT_BUTTON :{BLACK}Procurar o conteúdo on-line
@@ -2526,8 +2523,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY :{COMMA} de <car
STR_NEWGRF_INVALID_ENGINE :<modelo de veíc. inválido> STR_NEWGRF_INVALID_ENGINE :<modelo de veíc. inválido>
STR_NEWGRF_INVALID_INDUSTRYTYPE :<indústria inválida> STR_NEWGRF_INVALID_INDUSTRYTYPE :<indústria inválida>
# NewGRF scanning window
# Sign list window # Sign list window
STR_SIGN_LIST_CAPTION :{WHITE}Lista de Placas - {COMMA} Placa{P "" s} STR_SIGN_LIST_CAPTION :{WHITE}Lista de Placas - {COMMA} Placa{P "" s}
STR_SIGN_LIST_MATCH_CASE :{BLACK}Diferenciar caixa alta STR_SIGN_LIST_MATCH_CASE :{BLACK}Diferenciar caixa alta
@@ -3195,8 +3190,6 @@ STR_ORDER_DROP_HALT_DEPOT :Parar
STR_ORDER_SERVICE_TOOLTIP :{BLACK}Pular esta ordem a menos que necessite de manutenção STR_ORDER_SERVICE_TOOLTIP :{BLACK}Pular esta ordem a menos que necessite de manutenção
STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Dados do veículo no qual se basear para pular ordem STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Dados do veículo no qual se basear para pular ordem
# Conditional order variables, must follow order of OrderConditionVariable enum
STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Percentual carregado STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Percentual carregado
STR_ORDER_CONDITIONAL_RELIABILITY :Confiabilidade STR_ORDER_CONDITIONAL_RELIABILITY :Confiabilidade
STR_ORDER_CONDITIONAL_MAX_SPEED :Velocidade máxima STR_ORDER_CONDITIONAL_MAX_SPEED :Velocidade máxima
@@ -3448,7 +3441,6 @@ STR_ERROR_PNGMAP_MISC :{WHITE}... algu
STR_ERROR_BMPMAP :{WHITE}Impossível carregar terreno a partir de BMP... STR_ERROR_BMPMAP :{WHITE}Impossível carregar terreno a partir de BMP...
STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... não foi possível converter o tipo de imagem STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... não foi possível converter o tipo de imagem
STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Aviso de Escala STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Aviso de Escala
STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}Alterar muito o tamanho do mapa original não é recomendado. Continuar com a geração? STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}Alterar muito o tamanho do mapa original não é recomendado. Continuar com a geração?

View File

@@ -448,7 +448,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT :Ampliació en l
STR_ABOUT_MENU_GIANT_SCREENSHOT :Captura de pantalla de tot el mapa STR_ABOUT_MENU_GIANT_SCREENSHOT :Captura de pantalla de tot el mapa
STR_ABOUT_MENU_ABOUT_OPENTTD :Quant a 'OpenTTD' STR_ABOUT_MENU_ABOUT_OPENTTD :Quant a 'OpenTTD'
STR_ABOUT_MENU_SPRITE_ALIGNER :Alineador d'sprite STR_ABOUT_MENU_SPRITE_ALIGNER :Alineador d'sprite
STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Commuta les caixes delimitadores
############ range ends here ############ range ends here
############ range for days starts (also used for the place in the highscore window) ############ range for days starts (also used for the place in the highscore window)
@@ -860,19 +859,19 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Unitats
STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Selecció d'unitats de moneda STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Selecció d'unitats de moneda
############ start of currency region ############ start of currency region
STR_GAME_OPTIONS_CURRENCY_GBP :Lliura Esterlina (GBP) STR_GAME_OPTIONS_CURRENCY_GBP :Lliures (£)
STR_GAME_OPTIONS_CURRENCY_USD :Dòlar Americà (USD) STR_GAME_OPTIONS_CURRENCY_USD :Dòlars ($)
STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) STR_GAME_OPTIONS_CURRENCY_EUR :Euro ()
STR_GAME_OPTIONS_CURRENCY_YEN :Ien Japonès (JPY) STR_GAME_OPTIONS_CURRENCY_YEN :Iens (¥)
STR_GAME_OPTIONS_CURRENCY_ATS :Shillings Austríacs (ATS) STR_GAME_OPTIONS_CURRENCY_ATS :Shillings Austríacs (ATS)
STR_GAME_OPTIONS_CURRENCY_BEF :Francs Belgues (BEF) STR_GAME_OPTIONS_CURRENCY_BEF :Francs Belgues (BEF)
STR_GAME_OPTIONS_CURRENCY_CHF :Francs Suïssos (CHF) STR_GAME_OPTIONS_CURRENCY_CHF :Francs Suïssos (CHF)
STR_GAME_OPTIONS_CURRENCY_CZK :Corones Txeques (CZK) STR_GAME_OPTIONS_CURRENCY_CZK :Corones Txeques (CZK)
STR_GAME_OPTIONS_CURRENCY_DEM :Marcs Alemanys (DEM) STR_GAME_OPTIONS_CURRENCY_DEM :Marcs Alemanys (DEM)
STR_GAME_OPTIONS_CURRENCY_DKK :Corones Daneses (DKK) STR_GAME_OPTIONS_CURRENCY_DKK :Corones Daneses (DKK)
STR_GAME_OPTIONS_CURRENCY_ESP :Pesseta Espanyola (ESP) STR_GAME_OPTIONS_CURRENCY_ESP :Pesseta (ESP)
STR_GAME_OPTIONS_CURRENCY_FIM :Marcs Finesos (FIM) STR_GAME_OPTIONS_CURRENCY_FIM :Marcs Finesos (FIM)
STR_GAME_OPTIONS_CURRENCY_FRF :Franc Francès (FRF) STR_GAME_OPTIONS_CURRENCY_FRF :Franc (FRF)
STR_GAME_OPTIONS_CURRENCY_GRD :Dracmes Gregues (GRD) STR_GAME_OPTIONS_CURRENCY_GRD :Dracmes Gregues (GRD)
STR_GAME_OPTIONS_CURRENCY_HUF :Florí Hongarès (HUF) STR_GAME_OPTIONS_CURRENCY_HUF :Florí Hongarès (HUF)
STR_GAME_OPTIONS_CURRENCY_ISK :Corones Islandeses (ISK) STR_GAME_OPTIONS_CURRENCY_ISK :Corones Islandeses (ISK)
@@ -1058,7 +1057,6 @@ STR_SEA_LEVEL_HIGH :Alt
STR_SEA_LEVEL_CUSTOM :Personalitzat STR_SEA_LEVEL_CUSTOM :Personalitzat
STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Personalitzat ({NUM}%) STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Personalitzat ({NUM}%)
STR_DISASTER_NONE :Cap STR_DISASTER_NONE :Cap
STR_DISASTER_REDUCED :Reduït STR_DISASTER_REDUCED :Reduït
STR_DISASTER_NORMAL :Normal STR_DISASTER_NORMAL :Normal
@@ -1113,8 +1111,8 @@ STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC :Realístic
STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL :{LTBLUE}Model d'acceleració per als vehicles: {ORANGE}{STRING} STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL :{LTBLUE}Model d'acceleració per als vehicles: {ORANGE}{STRING}
STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_ORIGINAL :Original STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_ORIGINAL :Original
STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_REALISTIC :Realístic STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_REALISTIC :Realístic
STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS :{LTBLUE}Inclinació de les pujades per als trens: {ORANGE}{STRING}% STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS :{LTBLUE}Inclinació de les pujades per als trens {ORANGE}{STRING}%
STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS :{LTBLUE}Inclinació de les pujades per als vehicles: {ORANGE}{STRING}% STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS :{LTBLUE}Inclinació de les pujades per als vehicles {ORANGE}{STRING}%
STR_CONFIG_SETTING_FORBID_90_DEG :{LTBLUE}Prohibeix fer girs de 90 graus als trens i vaixells: {ORANGE}{STRING} STR_CONFIG_SETTING_FORBID_90_DEG :{LTBLUE}Prohibeix fer girs de 90 graus als trens i vaixells: {ORANGE}{STRING}
STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS :{LTBLUE}Permet ajuntar estacions no annexes: {ORANGE}{STRING} STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS :{LTBLUE}Permet ajuntar estacions no annexes: {ORANGE}{STRING}
STR_CONFIG_SETTING_IMPROVEDLOAD :{LTBLUE}Utilitza algorisme millorat de càrrega: {ORANGE}{STRING} STR_CONFIG_SETTING_IMPROVEDLOAD :{LTBLUE}Utilitza algorisme millorat de càrrega: {ORANGE}{STRING}
@@ -1409,7 +1407,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Comprova
STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Mostra els paràmetres IA STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Mostra els paràmetres IA
STR_INTRO_TOOLTIP_QUIT :{BLACK}Surt d'OpenTTD STR_INTRO_TOOLTIP_QUIT :{BLACK}Surt d'OpenTTD
# Quit window # Quit window
STR_QUIT_CAPTION :{WHITE}Surt STR_QUIT_CAPTION :{WHITE}Surt
STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Estàs segur que vols abandonar aquest joc i tornar a {STRING}? STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Estàs segur que vols abandonar aquest joc i tornar a {STRING}?
@@ -2526,8 +2523,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY :{COMMA} de <cà
STR_NEWGRF_INVALID_ENGINE :<model de vehicle invàlid> STR_NEWGRF_INVALID_ENGINE :<model de vehicle invàlid>
STR_NEWGRF_INVALID_INDUSTRYTYPE :<indústria invàlida> STR_NEWGRF_INVALID_INDUSTRYTYPE :<indústria invàlida>
# NewGRF scanning window
# Sign list window # Sign list window
STR_SIGN_LIST_CAPTION :{WHITE}Llista de senyals - {COMMA} Senyal{P "" s} STR_SIGN_LIST_CAPTION :{WHITE}Llista de senyals - {COMMA} Senyal{P "" s}
STR_SIGN_LIST_MATCH_CASE :{BLACK}Coincideix Majúscules/Minúscules STR_SIGN_LIST_MATCH_CASE :{BLACK}Coincideix Majúscules/Minúscules
@@ -3195,12 +3190,10 @@ STR_ORDER_DROP_HALT_DEPOT :Para
STR_ORDER_SERVICE_TOOLTIP :{BLACK}Salta aquesta ordre si no és que es necessita una revisió STR_ORDER_SERVICE_TOOLTIP :{BLACK}Salta aquesta ordre si no és que es necessita una revisió
STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Dades del vehicle on basar el salt a STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Dades del vehicle on basar el salt a
# Conditional order variables, must follow order of OrderConditionVariable enum
STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Percentatge de càrrega STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Percentatge de càrrega
STR_ORDER_CONDITIONAL_RELIABILITY :Fiabilitat STR_ORDER_CONDITIONAL_RELIABILITY :Fiabilitat
STR_ORDER_CONDITIONAL_MAX_SPEED :Velocitat màxima STR_ORDER_CONDITIONAL_MAX_SPEED :Velocitat màxima
STR_ORDER_CONDITIONAL_AGE :Antiguitat (anys) STR_ORDER_CONDITIONAL_AGE :Antiguitat del vehicle (anys)
STR_ORDER_CONDITIONAL_REQUIRES_SERVICE :Necessita revisió STR_ORDER_CONDITIONAL_REQUIRES_SERVICE :Necessita revisió
STR_ORDER_CONDITIONAL_UNCONDITIONALLY :Sempre STR_ORDER_CONDITIONAL_UNCONDITIONALLY :Sempre
@@ -3448,8 +3441,6 @@ STR_ERROR_PNGMAP_MISC :{WHITE}... algu
STR_ERROR_BMPMAP :{WHITE}Impossible carregar el terreny des del BMP... STR_ERROR_BMPMAP :{WHITE}Impossible carregar el terreny des del BMP...
STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... no s'ha pogut convertir el tipus d'imatge STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... no s'ha pogut convertir el tipus d'imatge
STR_ERROR_HEIGHTMAP_TOO_LARGE :{WHITE}... l'imatge és massa gran
STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Alerta d'escala STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Alerta d'escala
STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}No es recomana redimensionar massa el mapa d'origen. Vols continuar amb la generació? STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}No es recomana redimensionar massa el mapa d'origen. Vols continuar amb la generació?

View File

@@ -956,25 +956,25 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Izbor no
############ start of currency region ############ start of currency region
STR_GAME_OPTIONS_CURRENCY_GBP :Funte (£) STR_GAME_OPTIONS_CURRENCY_GBP :Funte (£)
STR_GAME_OPTIONS_CURRENCY_USD :Američki Dolar (USD) STR_GAME_OPTIONS_CURRENCY_USD :Dolari ($)
STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) STR_GAME_OPTIONS_CURRENCY_EUR :Euri ()
STR_GAME_OPTIONS_CURRENCY_YEN :Japanski Jen (JPY) STR_GAME_OPTIONS_CURRENCY_YEN :Jeni (¥)
STR_GAME_OPTIONS_CURRENCY_ATS :Austrijski šiling (ATS) STR_GAME_OPTIONS_CURRENCY_ATS :Austrijski šiling (ATS)
STR_GAME_OPTIONS_CURRENCY_BEF :Belgijski franak (BEF) STR_GAME_OPTIONS_CURRENCY_BEF :Belgijski franak (BEF)
STR_GAME_OPTIONS_CURRENCY_CHF :Švicarski franak (CHF) STR_GAME_OPTIONS_CURRENCY_CHF :Švicarski franak (CHF)
STR_GAME_OPTIONS_CURRENCY_CZK :Češka kruna (CZK) STR_GAME_OPTIONS_CURRENCY_CZK :Češka kruna (CZK)
STR_GAME_OPTIONS_CURRENCY_DEM :Njemačka marka (DEM) STR_GAME_OPTIONS_CURRENCY_DEM :Njemačka marka (DEM)
STR_GAME_OPTIONS_CURRENCY_DKK :Danska kruna (DKK) STR_GAME_OPTIONS_CURRENCY_DKK :Danska kruna (DKK)
STR_GAME_OPTIONS_CURRENCY_ESP :Španjolska Pezeta (ESP) STR_GAME_OPTIONS_CURRENCY_ESP :Pezeta (ESP)
STR_GAME_OPTIONS_CURRENCY_FIM :Finska marka (FIM) STR_GAME_OPTIONS_CURRENCY_FIM :Finska marka (FIM)
STR_GAME_OPTIONS_CURRENCY_FRF :Francuski Franak (FRF) STR_GAME_OPTIONS_CURRENCY_FRF :Franak (FRF)
STR_GAME_OPTIONS_CURRENCY_GRD :Grčka drahma (GRD) STR_GAME_OPTIONS_CURRENCY_GRD :Grčka drahma (GRD)
STR_GAME_OPTIONS_CURRENCY_HUF :Mađarski forint (HUF) STR_GAME_OPTIONS_CURRENCY_HUF :Mađarski forint (HUF)
STR_GAME_OPTIONS_CURRENCY_ISK :Islandska kruna (ISK) STR_GAME_OPTIONS_CURRENCY_ISK :Islandska kruna (ISK)
STR_GAME_OPTIONS_CURRENCY_ITL :Talijanska lira (ITL) STR_GAME_OPTIONS_CURRENCY_ITL :Talijanska lira (ITL)
STR_GAME_OPTIONS_CURRENCY_NLG :Nizozemski gulden (NLG) STR_GAME_OPTIONS_CURRENCY_NLG :Nizozemski gulden (NLG)
STR_GAME_OPTIONS_CURRENCY_NOK :Norveška kruna (NOK) STR_GAME_OPTIONS_CURRENCY_NOK :Norveška kruna (NOK)
STR_GAME_OPTIONS_CURRENCY_PLN :Poljski Zloti (PLN) STR_GAME_OPTIONS_CURRENCY_PLN :Poljski zloti (PLN)
STR_GAME_OPTIONS_CURRENCY_RON :Rumunjski lev (RON) STR_GAME_OPTIONS_CURRENCY_RON :Rumunjski lev (RON)
STR_GAME_OPTIONS_CURRENCY_RUR :Ruske rublje (RUR) STR_GAME_OPTIONS_CURRENCY_RUR :Ruske rublje (RUR)
STR_GAME_OPTIONS_CURRENCY_SIT :Slovenski tolar (SIT) STR_GAME_OPTIONS_CURRENCY_SIT :Slovenski tolar (SIT)
@@ -1153,7 +1153,6 @@ STR_SEA_LEVEL_HIGH :Visoko
STR_SEA_LEVEL_CUSTOM :Proizvoljno STR_SEA_LEVEL_CUSTOM :Proizvoljno
STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Proizvoljno ({NUM}%) STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Proizvoljno ({NUM}%)
STR_DISASTER_NONE :Ništa STR_DISASTER_NONE :Ništa
STR_DISASTER_REDUCED :Smanjeno STR_DISASTER_REDUCED :Smanjeno
STR_DISASTER_NORMAL :Normalno STR_DISASTER_NORMAL :Normalno
@@ -1208,7 +1207,7 @@ STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC :Realistični
STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL :{LTBLUE}Model ubrzavanja za cestovna vozila: {ORANGE}{STRING} STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL :{LTBLUE}Model ubrzavanja za cestovna vozila: {ORANGE}{STRING}
STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_ORIGINAL :{G=middle}Originalno STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_ORIGINAL :{G=middle}Originalno
STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_REALISTIC :{G=middle}Stvarno STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_REALISTIC :{G=middle}Stvarno
STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS :{LTBLUE}Nagib padine za vlakove: {ORANGE}{STRING}% STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS :{LTBLUE}Strmost kosina za vlakove {ORANGE}{STRING}%
STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS :{LTBLUE}Nagib padine za cestovna vozila {ORANGE}{STRING}% STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS :{LTBLUE}Nagib padine za cestovna vozila {ORANGE}{STRING}%
STR_CONFIG_SETTING_FORBID_90_DEG :{LTBLUE}Zabrani vlakovima i brodovima skretanja pod 90 stupnjeva: {ORANGE}{STRING} STR_CONFIG_SETTING_FORBID_90_DEG :{LTBLUE}Zabrani vlakovima i brodovima skretanja pod 90 stupnjeva: {ORANGE}{STRING}
STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS :{LTBLUE}Dopusti spajanje postaja koje nisu izravno jedna do druge {ORANGE}{STRING} STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS :{LTBLUE}Dopusti spajanje postaja koje nisu izravno jedna do druge {ORANGE}{STRING}
@@ -1504,7 +1503,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Provjeri
STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Prikaži postavke umjetne inteligencije STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Prikaži postavke umjetne inteligencije
STR_INTRO_TOOLTIP_QUIT :{BLACK}Završi 'OpenTTD' STR_INTRO_TOOLTIP_QUIT :{BLACK}Završi 'OpenTTD'
# Quit window # Quit window
STR_QUIT_CAPTION :{WHITE}Prekid STR_QUIT_CAPTION :{WHITE}Prekid
STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Jesi li siguran da želiš napustiti OpenTTD i vratiti se u {STRING}e? STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Jesi li siguran da želiš napustiti OpenTTD i vratiti se u {STRING}e?
@@ -2026,7 +2024,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL :{BLACK}Izgradi
STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Aktiviraj izgradnju/uklanjanje željezničke pruge, signala, čvorišta i postaja. Držanjem tipke Ctrl također se uklanjaju tračnice na čvorištima i postajama. STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Aktiviraj izgradnju/uklanjanje željezničke pruge, signala, čvorišta i postaja. Držanjem tipke Ctrl također se uklanjaju tračnice na čvorištima i postajama.
STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL :{BLACK}Pretvori/nadogradi vrstu pruge. Shift mijenja prikaz građenje/procjena troškova. STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL :{BLACK}Pretvori/nadogradi vrstu pruge. Shift mijenja prikaz građenje/procjena troškova.
# Rail depot construction window # Rail depot construction window
STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION :{WHITE}Smjer spremišta vlakova STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION :{WHITE}Smjer spremišta vlakova
STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP :{BLACK}Odaberi smjer željezničkog spremišta STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP :{BLACK}Odaberi smjer željezničkog spremišta
@@ -2501,6 +2498,7 @@ STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP :{BLACK}Pomakni
STR_NEWGRF_SETTINGS_MOVEDOWN :{BLACK} Pomakni dolje STR_NEWGRF_SETTINGS_MOVEDOWN :{BLACK} Pomakni dolje
STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP :{BLACK}Pomakni odabranu NewGRF datoteku dolje na listi STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP :{BLACK}Pomakni odabranu NewGRF datoteku dolje na listi
STR_NEWGRF_SETTINGS_FILE_TOOLTIP :{BLACK}Popis instaliranih NewGRF datoteka. Kliknite na datoteku da bi promijenili njene parametre STR_NEWGRF_SETTINGS_FILE_TOOLTIP :{BLACK}Popis instaliranih NewGRF datoteka. Kliknite na datoteku da bi promijenili njene parametre
STR_NEWGRF_SETTINGS_SET_PARAMETERS :{BLACK}Postavi parametre STR_NEWGRF_SETTINGS_SET_PARAMETERS :{BLACK}Postavi parametre
STR_NEWGRF_SETTINGS_TOGGLE_PALETTE :{BLACK}Aktiviraj paletu STR_NEWGRF_SETTINGS_TOGGLE_PALETTE :{BLACK}Aktiviraj paletu
STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP :{BLACK}Prilagodi paletu izabranog NewGRF-a.{}Učini ovo kada grafike iz ovog NewGRF-a izgledaju ljubičasto tijekom igre. STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP :{BLACK}Prilagodi paletu izabranog NewGRF-a.{}Učini ovo kada grafike iz ovog NewGRF-a izgledaju ljubičasto tijekom igre.
@@ -2533,8 +2531,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME :Parametar {NUM}
STR_NEWGRF_PARAMETERS_SETTING :{STRING}: {ORANGE}{STRING} STR_NEWGRF_PARAMETERS_SETTING :{STRING}: {ORANGE}{STRING}
STR_NEWGRF_PARAMETERS_NUM_PARAM :{LTBLUE}Broj parametara: {ORANGE}{NUM} STR_NEWGRF_PARAMETERS_NUM_PARAM :{LTBLUE}Broj parametara: {ORANGE}{NUM}
# NewGRF readme window
# NewGRF inspect window # NewGRF inspect window
STR_NEWGRF_INSPECT_CAPTION :{WHITE}Pregledaj - {STRING} STR_NEWGRF_INSPECT_CAPTION :{WHITE}Pregledaj - {STRING}
STR_NEWGRF_INSPECT_PARENT_BUTTON :{BLACK}Matični STR_NEWGRF_INSPECT_PARENT_BUTTON :{BLACK}Matični
@@ -2623,8 +2619,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY :{COMMA} od <pog
STR_NEWGRF_INVALID_ENGINE :<pogrešan model vozila> STR_NEWGRF_INVALID_ENGINE :<pogrešan model vozila>
STR_NEWGRF_INVALID_INDUSTRYTYPE :<pogrešna industrija> STR_NEWGRF_INVALID_INDUSTRYTYPE :<pogrešna industrija>
# NewGRF scanning window
# Sign list window # Sign list window
STR_SIGN_LIST_CAPTION :{WHITE}Popis znakova - {COMMA} znak{P "" a ova} STR_SIGN_LIST_CAPTION :{WHITE}Popis znakova - {COMMA} znak{P "" a ova}
STR_SIGN_LIST_MATCH_CASE :{BLACK}Velika i mala slova STR_SIGN_LIST_MATCH_CASE :{BLACK}Velika i mala slova
@@ -3292,8 +3286,6 @@ STR_ORDER_DROP_HALT_DEPOT :Stani
STR_ORDER_SERVICE_TOOLTIP :{BLACK}Preskoči ovu narudžbu osim ako servis nije potreban STR_ORDER_SERVICE_TOOLTIP :{BLACK}Preskoči ovu narudžbu osim ako servis nije potreban
STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Podaci vozila prema kojima se zasniva skok STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Podaci vozila prema kojima se zasniva skok
# Conditional order variables, must follow order of OrderConditionVariable enum
STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Postotak ukrcaja STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Postotak ukrcaja
STR_ORDER_CONDITIONAL_RELIABILITY :Pouzdanost STR_ORDER_CONDITIONAL_RELIABILITY :Pouzdanost
STR_ORDER_CONDITIONAL_MAX_SPEED :Maksimalna brzina STR_ORDER_CONDITIONAL_MAX_SPEED :Maksimalna brzina
@@ -3372,8 +3364,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD :(Čekaj puni uk
STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY :(Čekaj bilo koji puni ukrcaj bez iskrcavanja) STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY :(Čekaj bilo koji puni ukrcaj bez iskrcavanja)
STR_ORDER_NO_UNLOAD_NO_LOAD :(Bez iskrcaja i bez ukrcaja) STR_ORDER_NO_UNLOAD_NO_LOAD :(Bez iskrcaja i bez ukrcaja)
STR_ORDER_STOP_LOCATION_NEAR_END :[početak] STR_ORDER_STOP_LOCATION_NEAR_END :[početak]
STR_ORDER_STOP_LOCATION_MIDDLE :[sredina] STR_ORDER_STOP_LOCATION_MIDDLE :[sredina]
STR_ORDER_STOP_LOCATION_FAR_END :[kraj] STR_ORDER_STOP_LOCATION_FAR_END :[kraj]
@@ -3547,8 +3537,6 @@ STR_ERROR_PNGMAP_MISC :{WHITE}... neš
STR_ERROR_BMPMAP :{WHITE}Nije moguće učitati krajolik iz BMP-a... STR_ERROR_BMPMAP :{WHITE}Nije moguće učitati krajolik iz BMP-a...
STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... ne mogu pretvoriti vrstu slike. STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... ne mogu pretvoriti vrstu slike.
STR_ERROR_HEIGHTMAP_TOO_LARGE :{WHITE}... slika je prevelika
STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Upozorenje o veličini STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Upozorenje o veličini
STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}Prekomjerna promjena veličine karte nije preporučena. Nastaviti sa kreiranjem? STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}Prekomjerna promjena veličine karte nije preporučena. Nastaviti sa kreiranjem?

View File

@@ -344,7 +344,7 @@ STR_SORT_BY_MAX_SPEED :max. rychlosti
STR_SORT_BY_MODEL :modelu STR_SORT_BY_MODEL :modelu
STR_SORT_BY_VALUE :hodnoty STR_SORT_BY_VALUE :hodnoty
STR_SORT_BY_LENGTH :délky STR_SORT_BY_LENGTH :délky
STR_SORT_BY_LIFE_TIME :Zbývající životnost STR_SORT_BY_LIFE_TIME :zbývající životnosti
STR_SORT_BY_TIMETABLE_DELAY :zpoždění STR_SORT_BY_TIMETABLE_DELAY :zpoždění
STR_SORT_BY_FACILITY :druhu stanice STR_SORT_BY_FACILITY :druhu stanice
STR_SORT_BY_WAITING :množství čekajícího nákladu STR_SORT_BY_WAITING :množství čekajícího nákladu
@@ -517,7 +517,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT :Přiblíženo n
STR_ABOUT_MENU_GIANT_SCREENSHOT :Screenshot celé mapy STR_ABOUT_MENU_GIANT_SCREENSHOT :Screenshot celé mapy
STR_ABOUT_MENU_ABOUT_OPENTTD :O 'OpenTTD' STR_ABOUT_MENU_ABOUT_OPENTTD :O 'OpenTTD'
STR_ABOUT_MENU_SPRITE_ALIGNER :Zarovnávání spritů STR_ABOUT_MENU_SPRITE_ALIGNER :Zarovnávání spritů
STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Přepnout ohraničení
############ range ends here ############ range ends here
############ range for days starts (also used for the place in the highscore window) ############ range for days starts (also used for the place in the highscore window)
@@ -941,10 +940,10 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Měna
STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Výběr jednotek měny STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Výběr jednotek měny
############ start of currency region ############ start of currency region
STR_GAME_OPTIONS_CURRENCY_GBP :Libra (GBP) STR_GAME_OPTIONS_CURRENCY_GBP :Libra (£)
STR_GAME_OPTIONS_CURRENCY_USD :Dolar (USD) STR_GAME_OPTIONS_CURRENCY_USD :Dolar ($)
STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) STR_GAME_OPTIONS_CURRENCY_EUR :Euro ()
STR_GAME_OPTIONS_CURRENCY_YEN :Japonský jen (JPY) STR_GAME_OPTIONS_CURRENCY_YEN :Japonský jen (¥)
STR_GAME_OPTIONS_CURRENCY_ATS :Rakouský šilink (ATS) STR_GAME_OPTIONS_CURRENCY_ATS :Rakouský šilink (ATS)
STR_GAME_OPTIONS_CURRENCY_BEF :Belgický frank (BEF) STR_GAME_OPTIONS_CURRENCY_BEF :Belgický frank (BEF)
STR_GAME_OPTIONS_CURRENCY_CHF :Švýcarský frank (CHF) STR_GAME_OPTIONS_CURRENCY_CHF :Švýcarský frank (CHF)
@@ -1139,7 +1138,6 @@ STR_SEA_LEVEL_HIGH :vysoká
STR_SEA_LEVEL_CUSTOM :Uživatelský STR_SEA_LEVEL_CUSTOM :Uživatelský
STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Uživatelský ({NUM}%) STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Uživatelský ({NUM}%)
STR_DISASTER_NONE :žádné STR_DISASTER_NONE :žádné
STR_DISASTER_REDUCED :snížené STR_DISASTER_REDUCED :snížené
STR_DISASTER_NORMAL :běžné STR_DISASTER_NORMAL :běžné
@@ -1490,7 +1488,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Ukázat,
STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Ukázat nastavení AI STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Ukázat nastavení AI
STR_INTRO_TOOLTIP_QUIT :{BLACK}Ukončit 'OpenTTD' STR_INTRO_TOOLTIP_QUIT :{BLACK}Ukončit 'OpenTTD'
# Quit window # Quit window
STR_QUIT_CAPTION :{WHITE}Konec STR_QUIT_CAPTION :{WHITE}Konec
STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Opravdu chceš opustit tuto hru a odejít do {STRING}? STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Opravdu chceš opustit tuto hru a odejít do {STRING}?
@@ -2613,8 +2610,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY :{COMMA} jednot{
STR_NEWGRF_INVALID_ENGINE :<neplatný druh vozidla> STR_NEWGRF_INVALID_ENGINE :<neplatný druh vozidla>
STR_NEWGRF_INVALID_INDUSTRYTYPE :<neplatný průmysl> STR_NEWGRF_INVALID_INDUSTRYTYPE :<neplatný průmysl>
# NewGRF scanning window
# Sign list window # Sign list window
STR_SIGN_LIST_CAPTION :{WHITE}Seznam popisků - {COMMA} popis{P ek ky ků} STR_SIGN_LIST_CAPTION :{WHITE}Seznam popisků - {COMMA} popis{P ek ky ků}
STR_SIGN_LIST_MATCH_CASE :{BLACK}Shoda STR_SIGN_LIST_MATCH_CASE :{BLACK}Shoda
@@ -3288,8 +3283,6 @@ STR_ORDER_DROP_HALT_DEPOT :Zastavit
STR_ORDER_SERVICE_TOOLTIP :{BLACK}Přeskoč tento cíl, pokud není potřeba pravidelná údržba STR_ORDER_SERVICE_TOOLTIP :{BLACK}Přeskoč tento cíl, pokud není potřeba pravidelná údržba
STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Vlastnost vozidla, podle které přeskakovat STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Vlastnost vozidla, podle které přeskakovat
# Conditional order variables, must follow order of OrderConditionVariable enum
STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Procento naložení STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Procento naložení
STR_ORDER_CONDITIONAL_RELIABILITY :Spolehlivost STR_ORDER_CONDITIONAL_RELIABILITY :Spolehlivost
STR_ORDER_CONDITIONAL_MAX_SPEED :Maximální rychlost STR_ORDER_CONDITIONAL_MAX_SPEED :Maximální rychlost
@@ -3541,8 +3534,6 @@ STR_ERROR_PNGMAP_MISC :{WHITE}... něc
STR_ERROR_BMPMAP :{WHITE}Nebylo možné nahrát krajinu z BMP... STR_ERROR_BMPMAP :{WHITE}Nebylo možné nahrát krajinu z BMP...
STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... nelze převést formát obrázku STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... nelze převést formát obrázku
STR_ERROR_HEIGHTMAP_TOO_LARGE :{WHITE}... obrázek je příliš velký
STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Varování kvůli velikosti STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Varování kvůli velikosti
STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}Tak velká zmena velikosti zdrojové mapy není doporučena. Pokračovat s generováním? STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}Tak velká zmena velikosti zdrojové mapy není doporučena. Pokračovat s generováním?

View File

@@ -447,7 +447,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT :Zoomet skærmbi
STR_ABOUT_MENU_GIANT_SCREENSHOT :Kæmpe skærmbillede (Ctrl-G) STR_ABOUT_MENU_GIANT_SCREENSHOT :Kæmpe skærmbillede (Ctrl-G)
STR_ABOUT_MENU_ABOUT_OPENTTD :Om 'OpenTTD' STR_ABOUT_MENU_ABOUT_OPENTTD :Om 'OpenTTD'
STR_ABOUT_MENU_SPRITE_ALIGNER :Tilpas grafikelement STR_ABOUT_MENU_SPRITE_ALIGNER :Tilpas grafikelement
STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Slå afgrænsningsrammerne til/fra
############ range ends here ############ range ends here
############ range for days starts (also used for the place in the highscore window) ############ range for days starts (also used for the place in the highscore window)
@@ -1057,7 +1056,6 @@ STR_SEA_LEVEL_HIGH :Højt
STR_SEA_LEVEL_CUSTOM :Brugerdefineret STR_SEA_LEVEL_CUSTOM :Brugerdefineret
STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Brugerdefineret ({NUM}%) STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Brugerdefineret ({NUM}%)
STR_DISASTER_NONE :Ingen STR_DISASTER_NONE :Ingen
STR_DISASTER_REDUCED :Reduceret STR_DISASTER_REDUCED :Reduceret
STR_DISASTER_NORMAL :Normal STR_DISASTER_NORMAL :Normal
@@ -1084,7 +1082,7 @@ STR_CITY_APPROVAL_PERMISSIVE :Passiv
STR_CITY_APPROVAL_TOLERANT :Tolerant STR_CITY_APPROVAL_TOLERANT :Tolerant
STR_CITY_APPROVAL_HOSTILE :Fjendtlig STR_CITY_APPROVAL_HOSTILE :Fjendtlig
STR_WARNING_NO_SUITABLE_AI :{WHITE}Der blev ikke fundet en egnet computer-spiller...{}Du kan downloade flere forskellige computer-spillere gennem 'Online Indhold'. STR_WARNING_NO_SUITABLE_AI :{WHITE}Der blev ikke fundet en egnet computer-spiller...{}Du kan downloade flere forskellige computer-spillere genem'Online Indhold'.
STR_WARNING_DIFFICULTY_TO_CUSTOM :{WHITE}Denne handling ændrer sværhedsgraden til speciel STR_WARNING_DIFFICULTY_TO_CUSTOM :{WHITE}Denne handling ændrer sværhedsgraden til speciel
# Advanced settings window # Advanced settings window
@@ -1408,7 +1406,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Tjek for
STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Vis indstillinger for computerstyrede spillere STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Vis indstillinger for computerstyrede spillere
STR_INTRO_TOOLTIP_QUIT :{BLACK}Afslut 'OpenTTD' STR_INTRO_TOOLTIP_QUIT :{BLACK}Afslut 'OpenTTD'
# Quit window # Quit window
STR_QUIT_CAPTION :{WHITE}Afslut STR_QUIT_CAPTION :{WHITE}Afslut
STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Er du sikker på, at du vil forlade dette spil og returnere til {STRING}? STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Er du sikker på, at du vil forlade dette spil og returnere til {STRING}?
@@ -2525,8 +2522,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY :{COMMA} af <ikk
STR_NEWGRF_INVALID_ENGINE :<ugyldig køretøjsmodel> STR_NEWGRF_INVALID_ENGINE :<ugyldig køretøjsmodel>
STR_NEWGRF_INVALID_INDUSTRYTYPE :<ikke gyldig industri type> STR_NEWGRF_INVALID_INDUSTRYTYPE :<ikke gyldig industri type>
# NewGRF scanning window
# Sign list window # Sign list window
STR_SIGN_LIST_CAPTION :{WHITE}Liste over skilte - {COMMA} Skilt{P "" e} STR_SIGN_LIST_CAPTION :{WHITE}Liste over skilte - {COMMA} Skilt{P "" e}
STR_SIGN_LIST_MATCH_CASE :{BLACK}Match store og små bogstaver STR_SIGN_LIST_MATCH_CASE :{BLACK}Match store og små bogstaver
@@ -3194,8 +3189,6 @@ STR_ORDER_DROP_HALT_DEPOT :Stop
STR_ORDER_SERVICE_TOOLTIP :{BLACK}Spring denne ordre over medmindre der er behov for service STR_ORDER_SERVICE_TOOLTIP :{BLACK}Spring denne ordre over medmindre der er behov for service
STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Data som ordrespring baseres på STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Data som ordrespring baseres på
# Conditional order variables, must follow order of OrderConditionVariable enum
STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Last-procentdel STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Last-procentdel
STR_ORDER_CONDITIONAL_RELIABILITY :Pålidelighed STR_ORDER_CONDITIONAL_RELIABILITY :Pålidelighed
STR_ORDER_CONDITIONAL_MAX_SPEED :Tophastighed STR_ORDER_CONDITIONAL_MAX_SPEED :Tophastighed
@@ -3362,7 +3355,7 @@ STR_AI_DEBUG_SELECT_AI_TOOLTIP :{BLACK}Se debug
STR_ERROR_NO_AI :{WHITE}OpenTTD er kompileret uden understøttelse for kunstig intelligens... STR_ERROR_NO_AI :{WHITE}OpenTTD er kompileret uden understøttelse for kunstig intelligens...
STR_ERROR_NO_AI_SUB :{WHITE}... ingen kunstig intelligens er tilgængeligt! STR_ERROR_NO_AI_SUB :{WHITE}... ingen kunstig intelligens er tilgængeligt!
STR_ERROR_AI_NO_AI_FOUND :Ingen passende AI kan findes.{}Denne AI er en pladsholder, og vil ikke gøre noget.{} Du kan downloade indtil flere AI'er fra 'Online Indhold'-systemet. STR_ERROR_AI_NO_AI_FOUND :Ingen passende AI kan findes.{}Denne AI er en pladsholder, og vil ikke gøre noget.{} Du kan downloade indtil flere AI'er fra 'Online Contet' systemet.
STR_ERROR_AI_PLEASE_REPORT_CRASH :{WHITE}En computerstyret spiller gik ned. Rapporter det venligst til udvikleren af computerspilleren med et skærmbilledet af computerspiller-debugvinduet. STR_ERROR_AI_PLEASE_REPORT_CRASH :{WHITE}En computerstyret spiller gik ned. Rapporter det venligst til udvikleren af computerspilleren med et skærmbilledet af computerspiller-debugvinduet.
STR_ERROR_AI_DEBUG_SERVER_ONLY :{YELLOW}Computerspiller-debugvindue er kun tilgængeligt på serveren STR_ERROR_AI_DEBUG_SERVER_ONLY :{YELLOW}Computerspiller-debugvindue er kun tilgængeligt på serveren
@@ -3447,7 +3440,6 @@ STR_ERROR_PNGMAP_MISC :{WHITE}... noge
STR_ERROR_BMPMAP :{WHITE}Kan ikke hente landskab fra BMP... STR_ERROR_BMPMAP :{WHITE}Kan ikke hente landskab fra BMP...
STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... kunne ikke konvertere billedtypen. STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... kunne ikke konvertere billedtypen.
STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Skalerings advarsel STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Skalerings advarsel
STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}At ændre størrelsen på kildebilledet anbefales ikke. Fortsæt genereringen? STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}At ændre størrelsen på kildebilledet anbefales ikke. Fortsæt genereringen?

View File

@@ -859,10 +859,10 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Valuta
STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Kies valuta STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Kies valuta
############ start of currency region ############ start of currency region
STR_GAME_OPTIONS_CURRENCY_GBP :Britse Pond (GBP) STR_GAME_OPTIONS_CURRENCY_GBP :Pond (£)
STR_GAME_OPTIONS_CURRENCY_USD :Dollar (USD) STR_GAME_OPTIONS_CURRENCY_USD :Dollar ($)
STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) STR_GAME_OPTIONS_CURRENCY_EUR :Euro ()
STR_GAME_OPTIONS_CURRENCY_YEN :Japanse Yen (JPY) STR_GAME_OPTIONS_CURRENCY_YEN :Yen (¥)
STR_GAME_OPTIONS_CURRENCY_ATS :Oostenrijkse Shilling (ATS) STR_GAME_OPTIONS_CURRENCY_ATS :Oostenrijkse Shilling (ATS)
STR_GAME_OPTIONS_CURRENCY_BEF :Belgische Frank (BEF) STR_GAME_OPTIONS_CURRENCY_BEF :Belgische Frank (BEF)
STR_GAME_OPTIONS_CURRENCY_CHF :Zwitserse Frank (CHF) STR_GAME_OPTIONS_CURRENCY_CHF :Zwitserse Frank (CHF)
@@ -948,7 +948,7 @@ STR_GAME_OPTIONS_FULLSCREEN_TOOLTIP :{BLACK}Vink dit
STR_GAME_OPTIONS_RESOLUTION :{BLACK}Schermresolutie STR_GAME_OPTIONS_RESOLUTION :{BLACK}Schermresolutie
STR_GAME_OPTIONS_RESOLUTION_TOOLTIP :{BLACK}Selecteer de schermresolutie STR_GAME_OPTIONS_RESOLUTION_TOOLTIP :{BLACK}Selecteer de schermresolutie
STR_GAME_OPTIONS_RESOLUTION_OTHER :Anders STR_GAME_OPTIONS_RESOLUTION_OTHER :anders
STR_GAME_OPTIONS_SCREENSHOT_FORMAT :{BLACK}Screenshotformaat STR_GAME_OPTIONS_SCREENSHOT_FORMAT :{BLACK}Screenshotformaat
STR_GAME_OPTIONS_SCREENSHOT_FORMAT_TOOLTIP :{BLACK}Selecteer het bestandsformaat van screenshots STR_GAME_OPTIONS_SCREENSHOT_FORMAT_TOOLTIP :{BLACK}Selecteer het bestandsformaat van screenshots
@@ -1057,7 +1057,6 @@ STR_SEA_LEVEL_HIGH :Hoog
STR_SEA_LEVEL_CUSTOM :Aangepast STR_SEA_LEVEL_CUSTOM :Aangepast
STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Aangepast ({NUM}%) STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Aangepast ({NUM}%)
STR_DISASTER_NONE :Geen STR_DISASTER_NONE :Geen
STR_DISASTER_REDUCED :Verminderd STR_DISASTER_REDUCED :Verminderd
STR_DISASTER_NORMAL :Normaal STR_DISASTER_NORMAL :Normaal
@@ -1408,7 +1407,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Zoeken n
STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Toon AI-instellingen STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Toon AI-instellingen
STR_INTRO_TOOLTIP_QUIT :{BLACK}Verlaat 'OpenTTD' STR_INTRO_TOOLTIP_QUIT :{BLACK}Verlaat 'OpenTTD'
# Quit window # Quit window
STR_QUIT_CAPTION :{WHITE}Afsluiten STR_QUIT_CAPTION :{WHITE}Afsluiten
STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Weet je zeker dat je OpenTTD wilt verlaten en terug wilt keren naar {STRING}? STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Weet je zeker dat je OpenTTD wilt verlaten en terug wilt keren naar {STRING}?
@@ -1930,7 +1928,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL :{BLACK}Graaf sp
STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Kies tussen bouwen en verwijderen van sporen, seinen, controleposten en stations. Houd Ctrl ingedrukt om ook het spoor van controleposten en stations te verwijderen STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Kies tussen bouwen en verwijderen van sporen, seinen, controleposten en stations. Houd Ctrl ingedrukt om ook het spoor van controleposten en stations te verwijderen
STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL :{BLACK}Verander spoortype. Shift schakelt tussen bouwen/inschatting van de kosten STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL :{BLACK}Verander spoortype. Shift schakelt tussen bouwen/inschatting van de kosten
# Rail depot construction window # Rail depot construction window
STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION :{WHITE}Richting van treindepot STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION :{WHITE}Richting van treindepot
STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP :{BLACK}Selecteer richting van treindepot STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP :{BLACK}Selecteer richting van treindepot
@@ -2405,6 +2402,7 @@ STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP :{BLACK}Verplaat
STR_NEWGRF_SETTINGS_MOVEDOWN :{BLACK}Naar beneden STR_NEWGRF_SETTINGS_MOVEDOWN :{BLACK}Naar beneden
STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP :{BLACK}Verplaats het geselecteerde NewGRF-bestand naar beneden in de lijst STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP :{BLACK}Verplaats het geselecteerde NewGRF-bestand naar beneden in de lijst
STR_NEWGRF_SETTINGS_FILE_TOOLTIP :{BLACK}Een lijst van de NewGRF-bestanden die zijn geïnstalleerd. Klik op een bestand om de parameters te wijzigen STR_NEWGRF_SETTINGS_FILE_TOOLTIP :{BLACK}Een lijst van de NewGRF-bestanden die zijn geïnstalleerd. Klik op een bestand om de parameters te wijzigen
STR_NEWGRF_SETTINGS_SET_PARAMETERS :{BLACK}Stel parameters in STR_NEWGRF_SETTINGS_SET_PARAMETERS :{BLACK}Stel parameters in
STR_NEWGRF_SETTINGS_TOGGLE_PALETTE :{BLACK}Palet omzetten STR_NEWGRF_SETTINGS_TOGGLE_PALETTE :{BLACK}Palet omzetten
STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP :{BLACK}Verander het palet van het geselecteerde NewGRF-bestand.{}Gebruik deze mogelijkheid als de afbeeldingen van dit NewGRF-bestand er paars uit zien in het spel STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP :{BLACK}Verander het palet van het geselecteerde NewGRF-bestand.{}Gebruik deze mogelijkheid als de afbeeldingen van dit NewGRF-bestand er paars uit zien in het spel
@@ -2437,8 +2435,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME :Parameter {NUM}
STR_NEWGRF_PARAMETERS_SETTING :{STRING}: {ORANGE}{STRING} STR_NEWGRF_PARAMETERS_SETTING :{STRING}: {ORANGE}{STRING}
STR_NEWGRF_PARAMETERS_NUM_PARAM :{LTBLUE}Aantal parameters: {ORANGE}{NUM} STR_NEWGRF_PARAMETERS_NUM_PARAM :{LTBLUE}Aantal parameters: {ORANGE}{NUM}
# NewGRF readme window
# NewGRF inspect window # NewGRF inspect window
STR_NEWGRF_INSPECT_CAPTION :{WHITE}Inspecteer - {STRING} STR_NEWGRF_INSPECT_CAPTION :{WHITE}Inspecteer - {STRING}
STR_NEWGRF_INSPECT_PARENT_BUTTON :{BLACK}Huidig STR_NEWGRF_INSPECT_PARENT_BUTTON :{BLACK}Huidig
@@ -2527,8 +2523,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY :{COMMA} van <on
STR_NEWGRF_INVALID_ENGINE :<ongeldig treinmodel> STR_NEWGRF_INVALID_ENGINE :<ongeldig treinmodel>
STR_NEWGRF_INVALID_INDUSTRYTYPE :<ongeldige industrie> STR_NEWGRF_INVALID_INDUSTRYTYPE :<ongeldige industrie>
# NewGRF scanning window
# Sign list window # Sign list window
STR_SIGN_LIST_CAPTION :{WHITE}Bordenlijst - {COMMA} bord{P "" en} STR_SIGN_LIST_CAPTION :{WHITE}Bordenlijst - {COMMA} bord{P "" en}
STR_SIGN_LIST_MATCH_CASE :{BLACK}Hoofdletter gevoelig STR_SIGN_LIST_MATCH_CASE :{BLACK}Hoofdletter gevoelig
@@ -3196,12 +3190,10 @@ STR_ORDER_DROP_HALT_DEPOT :Stop
STR_ORDER_SERVICE_TOOLTIP :{BLACK}Sla deze order over tenzij onderhoud nodig is STR_ORDER_SERVICE_TOOLTIP :{BLACK}Sla deze order over tenzij onderhoud nodig is
STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Voertuig info voor basisspringen wanneer STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Voertuig info voor basisspringen wanneer
# Conditional order variables, must follow order of OrderConditionVariable enum
STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Laad percentage STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Laad percentage
STR_ORDER_CONDITIONAL_RELIABILITY :Betrouwbaarheid STR_ORDER_CONDITIONAL_RELIABILITY :Betrouwbaarheid
STR_ORDER_CONDITIONAL_MAX_SPEED :Maximum snelheid STR_ORDER_CONDITIONAL_MAX_SPEED :Maximum snelheid
STR_ORDER_CONDITIONAL_AGE :Leeftijd (jaren) STR_ORDER_CONDITIONAL_AGE :Voertuigleeftijd (jaren)
STR_ORDER_CONDITIONAL_REQUIRES_SERVICE :Heeft onderhoud nodig STR_ORDER_CONDITIONAL_REQUIRES_SERVICE :Heeft onderhoud nodig
STR_ORDER_CONDITIONAL_UNCONDITIONALLY :Altijd STR_ORDER_CONDITIONAL_UNCONDITIONALLY :Altijd
@@ -3276,8 +3268,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD :(Niet lossen en
STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY :(Niet lossen en één soort vracht volledig laden) STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY :(Niet lossen en één soort vracht volledig laden)
STR_ORDER_NO_UNLOAD_NO_LOAD :(Niet lossen en niet laden) STR_ORDER_NO_UNLOAD_NO_LOAD :(Niet lossen en niet laden)
STR_ORDER_STOP_LOCATION_NEAR_END :[begin] STR_ORDER_STOP_LOCATION_NEAR_END :[begin]
STR_ORDER_STOP_LOCATION_MIDDLE :[midden] STR_ORDER_STOP_LOCATION_MIDDLE :[midden]
STR_ORDER_STOP_LOCATION_FAR_END :[einde] STR_ORDER_STOP_LOCATION_FAR_END :[einde]
@@ -3451,8 +3441,6 @@ STR_ERROR_PNGMAP_MISC :{WHITE}... er g
STR_ERROR_BMPMAP :{WHITE}Kan het landschap uit BMP niet laden... STR_ERROR_BMPMAP :{WHITE}Kan het landschap uit BMP niet laden...
STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... kan dit type afbeelding niet omzetten STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... kan dit type afbeelding niet omzetten
STR_ERROR_HEIGHTMAP_TOO_LARGE :{WHITE}... afbeelding is te groot
STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Schaalwaarschuwing STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Schaalwaarschuwing
STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}Het aanpassen van de grootte van een bronkaart is niet aan te bevelen. Toch doorgaan? STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}Het aanpassen van de grootte van een bronkaart is niet aan te bevelen. Toch doorgaan?
@@ -3476,7 +3464,7 @@ STR_ERROR_LAND_SLOPED_IN_WRONG_DIRECTION :{WHITE}Landhell
STR_ERROR_CAN_T_DO_THIS :{WHITE}Kan dit niet uitvoeren... STR_ERROR_CAN_T_DO_THIS :{WHITE}Kan dit niet uitvoeren...
STR_ERROR_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Gebouw moet eerst gesloopt worden STR_ERROR_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Gebouw moet eerst gesloopt worden
STR_ERROR_CAN_T_CLEAR_THIS_AREA :{WHITE}Kan dit gebied niet ontruimen... STR_ERROR_CAN_T_CLEAR_THIS_AREA :{WHITE}Kan dit gebied niet ontruimen...
STR_ERROR_SITE_UNSUITABLE :{WHITE}... locatie ongeschikt STR_ERROR_SITE_UNSUITABLE :{WHITE}... lokatie ongeschikt
STR_ERROR_ALREADY_BUILT :{WHITE}... reeds gebouwd STR_ERROR_ALREADY_BUILT :{WHITE}... reeds gebouwd
STR_ERROR_OWNED_BY :{WHITE}... is eigendom van {STRING} STR_ERROR_OWNED_BY :{WHITE}... is eigendom van {STRING}
STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... gebied is van ander bedrijf STR_ERROR_AREA_IS_OWNED_BY_ANOTHER :{WHITE}... gebied is van ander bedrijf

View File

@@ -274,7 +274,7 @@ STR_SORT_BY_MAX_SPEED :Maximum speed
STR_SORT_BY_MODEL :Model STR_SORT_BY_MODEL :Model
STR_SORT_BY_VALUE :Value STR_SORT_BY_VALUE :Value
STR_SORT_BY_LENGTH :Length STR_SORT_BY_LENGTH :Length
STR_SORT_BY_LIFE_TIME :Remaining lifetime STR_SORT_BY_LIFE_TIME :Remaining life time
STR_SORT_BY_TIMETABLE_DELAY :Timetable delay STR_SORT_BY_TIMETABLE_DELAY :Timetable delay
STR_SORT_BY_FACILITY :Station type STR_SORT_BY_FACILITY :Station type
STR_SORT_BY_WAITING :Waiting cargo value STR_SORT_BY_WAITING :Waiting cargo value
@@ -859,26 +859,26 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Currency
STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Currency units selection STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Currency units selection
############ start of currency region ############ start of currency region
STR_GAME_OPTIONS_CURRENCY_GBP :British Pound (GBP) STR_GAME_OPTIONS_CURRENCY_GBP :Pounds (£)
STR_GAME_OPTIONS_CURRENCY_USD :American Dollar (USD) STR_GAME_OPTIONS_CURRENCY_USD :Dollars ($)
STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) STR_GAME_OPTIONS_CURRENCY_EUR :Euro ()
STR_GAME_OPTIONS_CURRENCY_YEN :Japanese Yen (JPY) STR_GAME_OPTIONS_CURRENCY_YEN :Yen (¥)
STR_GAME_OPTIONS_CURRENCY_ATS :Austrian Shilling (ATS) STR_GAME_OPTIONS_CURRENCY_ATS :Austrian Shilling (ATS)
STR_GAME_OPTIONS_CURRENCY_BEF :Belgian Franc (BEF) STR_GAME_OPTIONS_CURRENCY_BEF :Belgian Franc (BEF)
STR_GAME_OPTIONS_CURRENCY_CHF :Swiss Franc (CHF) STR_GAME_OPTIONS_CURRENCY_CHF :Swiss Franc (CHF)
STR_GAME_OPTIONS_CURRENCY_CZK :Czech Koruna (CZK) STR_GAME_OPTIONS_CURRENCY_CZK :Czech Koruna (CZK)
STR_GAME_OPTIONS_CURRENCY_DEM :Deutschmark (DEM) STR_GAME_OPTIONS_CURRENCY_DEM :Deutschmark (DEM)
STR_GAME_OPTIONS_CURRENCY_DKK :Danish Krone (DKK) STR_GAME_OPTIONS_CURRENCY_DKK :Danish Krone (DKK)
STR_GAME_OPTIONS_CURRENCY_ESP :Spanish Peseta (ESP) STR_GAME_OPTIONS_CURRENCY_ESP :Peseta (ESP)
STR_GAME_OPTIONS_CURRENCY_FIM :Finnish Markka (FIM) STR_GAME_OPTIONS_CURRENCY_FIM :Finnish Markka (FIM)
STR_GAME_OPTIONS_CURRENCY_FRF :French Franc (FRF) STR_GAME_OPTIONS_CURRENCY_FRF :Franc (FRF)
STR_GAME_OPTIONS_CURRENCY_GRD :Greek Drachma (GRD) STR_GAME_OPTIONS_CURRENCY_GRD :Greek Drachma (GRD)
STR_GAME_OPTIONS_CURRENCY_HUF :Hungarian Forint (HUF) STR_GAME_OPTIONS_CURRENCY_HUF :Hungarian Forint (HUF)
STR_GAME_OPTIONS_CURRENCY_ISK :Icelandic Krona (ISK) STR_GAME_OPTIONS_CURRENCY_ISK :Icelandic Krona (ISK)
STR_GAME_OPTIONS_CURRENCY_ITL :Italian Lira (ITL) STR_GAME_OPTIONS_CURRENCY_ITL :Italian Lira (ITL)
STR_GAME_OPTIONS_CURRENCY_NLG :Dutch Guilder (NLG) STR_GAME_OPTIONS_CURRENCY_NLG :Dutch Guilder (NLG)
STR_GAME_OPTIONS_CURRENCY_NOK :Norwegian Krone (NOK) STR_GAME_OPTIONS_CURRENCY_NOK :Norwegian Krone (NOK)
STR_GAME_OPTIONS_CURRENCY_PLN :Polish Złoty (PLN) STR_GAME_OPTIONS_CURRENCY_PLN :Polish Zloty (PLN)
STR_GAME_OPTIONS_CURRENCY_RON :Romanian Leu (RON) STR_GAME_OPTIONS_CURRENCY_RON :Romanian Leu (RON)
STR_GAME_OPTIONS_CURRENCY_RUR :Russian Rubles (RUR) STR_GAME_OPTIONS_CURRENCY_RUR :Russian Rubles (RUR)
STR_GAME_OPTIONS_CURRENCY_SIT :Slovenian Tolar (SIT) STR_GAME_OPTIONS_CURRENCY_SIT :Slovenian Tolar (SIT)
@@ -1057,7 +1057,6 @@ STR_SEA_LEVEL_HIGH :High
STR_SEA_LEVEL_CUSTOM :Custom STR_SEA_LEVEL_CUSTOM :Custom
STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Custom ({NUM}%) STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Custom ({NUM}%)
STR_DISASTER_NONE :None STR_DISASTER_NONE :None
STR_DISASTER_REDUCED :Reduced STR_DISASTER_REDUCED :Reduced
STR_DISASTER_NORMAL :Normal STR_DISASTER_NORMAL :Normal
@@ -1112,8 +1111,8 @@ STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC :Realistic
STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL :{LTBLUE}Road vehicle acceleration model: {ORANGE}{STRING1} STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL :{LTBLUE}Road vehicle acceleration model: {ORANGE}{STRING1}
STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_ORIGINAL :Original STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_ORIGINAL :Original
STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_REALISTIC :Realistic STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_REALISTIC :Realistic
STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS :{LTBLUE}Slope steepness for trains: {ORANGE}{STRING1}% STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS :{LTBLUE}Slope steepness for trains {ORANGE}{STRING1}%
STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS :{LTBLUE}Slope steepness for road vehicles: {ORANGE}{STRING1}% STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS :{LTBLUE}Slope steepness for road vehicles {ORANGE}{STRING1}%
STR_CONFIG_SETTING_FORBID_90_DEG :{LTBLUE}Forbid trains and ships from making 90° turns: {ORANGE}{STRING1} STR_CONFIG_SETTING_FORBID_90_DEG :{LTBLUE}Forbid trains and ships from making 90° turns: {ORANGE}{STRING1}
STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS :{LTBLUE}Allow to join stations not directly adjacent: {ORANGE}{STRING1} STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS :{LTBLUE}Allow to join stations not directly adjacent: {ORANGE}{STRING1}
STR_CONFIG_SETTING_IMPROVEDLOAD :{LTBLUE}Use improved loading algorithm: {ORANGE}{STRING1} STR_CONFIG_SETTING_IMPROVEDLOAD :{LTBLUE}Use improved loading algorithm: {ORANGE}{STRING1}
@@ -1408,7 +1407,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Check fo
STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Display AI settings STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Display AI settings
STR_INTRO_TOOLTIP_QUIT :{BLACK}Quit 'OpenTTD' STR_INTRO_TOOLTIP_QUIT :{BLACK}Quit 'OpenTTD'
# Quit window # Quit window
STR_QUIT_CAPTION :{WHITE}Quit STR_QUIT_CAPTION :{WHITE}Quit
STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Are you sure you want to exit OpenTTD and return to {STRING}? STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Are you sure you want to exit OpenTTD and return to {STRING}?
@@ -1884,7 +1882,6 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST :{WHITE}... conn
STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE :{WHITE}... file not writable STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE :{WHITE}... file not writable
STR_CONTENT_ERROR_COULD_NOT_EXTRACT :{WHITE}Could not decompress the downloaded file STR_CONTENT_ERROR_COULD_NOT_EXTRACT :{WHITE}Could not decompress the downloaded file
# Transparency settings window # Transparency settings window
STR_TRANSPARENCY_CAPTION :{WHITE}Transparency Options STR_TRANSPARENCY_CAPTION :{WHITE}Transparency Options
STR_TRANSPARENT_SIGNS_TOOLTIP :{BLACK}Toggle transparency for station signs. Ctrl+Click to lock STR_TRANSPARENT_SIGNS_TOOLTIP :{BLACK}Toggle transparency for station signs. Ctrl+Click to lock
@@ -1931,7 +1928,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL :{BLACK}Build ra
STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Toggle build/remove for railway track, signals, waypoints and stations. Hold Ctrl to also remove the rail of waypoints and stations STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Toggle build/remove for railway track, signals, waypoints and stations. Hold Ctrl to also remove the rail of waypoints and stations
STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL :{BLACK}Convert/Upgrade the type of rail. Shift toggles building/showing cost estimate STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL :{BLACK}Convert/Upgrade the type of rail. Shift toggles building/showing cost estimate
# Rail depot construction window # Rail depot construction window
STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION :{WHITE}Train Depot Orientation STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION :{WHITE}Train Depot Orientation
STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP :{BLACK}Select railway depot orientation STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP :{BLACK}Select railway depot orientation
@@ -2407,8 +2403,6 @@ STR_NEWGRF_SETTINGS_MOVEDOWN :{BLACK}Move Dow
STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP :{BLACK}Move the selected NewGRF file down the list STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP :{BLACK}Move the selected NewGRF file down the list
STR_NEWGRF_SETTINGS_FILE_TOOLTIP :{BLACK}A list of the NewGRF files that are installed. Click a file to change its parameters STR_NEWGRF_SETTINGS_FILE_TOOLTIP :{BLACK}A list of the NewGRF files that are installed. Click a file to change its parameters
# Additional textfiles accompanying NewGRFs
STR_NEWGRF_SETTINGS_SET_PARAMETERS :{BLACK}Set parameters STR_NEWGRF_SETTINGS_SET_PARAMETERS :{BLACK}Set parameters
STR_NEWGRF_SETTINGS_TOGGLE_PALETTE :{BLACK}Toggle palette STR_NEWGRF_SETTINGS_TOGGLE_PALETTE :{BLACK}Toggle palette
STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP :{BLACK}Toggle the palette of the selected NewGRF.{}Do this when the graphics from this NewGRF look pink in-game STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP :{BLACK}Toggle the palette of the selected NewGRF.{}Do this when the graphics from this NewGRF look pink in-game
@@ -2431,6 +2425,7 @@ STR_NEWGRF_SETTINGS_DISABLED :{RED}Disabled
STR_NEWGRF_SETTINGS_INCOMPATIBLE :{RED}Incompatible with this version of OpenTTD STR_NEWGRF_SETTINGS_INCOMPATIBLE :{RED}Incompatible with this version of OpenTTD
STR_NEWGRF_SETTINGS_PARAMETER_QUERY :{BLACK}Enter NewGRF parameters STR_NEWGRF_SETTINGS_PARAMETER_QUERY :{BLACK}Enter NewGRF parameters
# NewGRF parameters window # NewGRF parameters window
STR_NEWGRF_PARAMETERS_CAPTION :{WHITE}Change NewGRF parameters STR_NEWGRF_PARAMETERS_CAPTION :{WHITE}Change NewGRF parameters
STR_NEWGRF_PARAMETERS_CLOSE :{BLACK}Close STR_NEWGRF_PARAMETERS_CLOSE :{BLACK}Close
@@ -2440,8 +2435,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME :Parameter {NUM}
STR_NEWGRF_PARAMETERS_SETTING :{STRING1}: {ORANGE}{STRING1} STR_NEWGRF_PARAMETERS_SETTING :{STRING1}: {ORANGE}{STRING1}
STR_NEWGRF_PARAMETERS_NUM_PARAM :{LTBLUE}Number of parameters: {ORANGE}{NUM} STR_NEWGRF_PARAMETERS_NUM_PARAM :{LTBLUE}Number of parameters: {ORANGE}{NUM}
# NewGRF textfile window
# NewGRF inspect window # NewGRF inspect window
STR_NEWGRF_INSPECT_CAPTION :{WHITE}Inspect - {STRING5} STR_NEWGRF_INSPECT_CAPTION :{WHITE}Inspect - {STRING5}
STR_NEWGRF_INSPECT_PARENT_BUTTON :{BLACK}Parent STR_NEWGRF_INSPECT_PARENT_BUTTON :{BLACK}Parent
@@ -2530,8 +2523,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY :{COMMA} of <inv
STR_NEWGRF_INVALID_ENGINE :<invalid vehicle model> STR_NEWGRF_INVALID_ENGINE :<invalid vehicle model>
STR_NEWGRF_INVALID_INDUSTRYTYPE :<invalid industry> STR_NEWGRF_INVALID_INDUSTRYTYPE :<invalid industry>
# NewGRF scanning window
# Sign list window # Sign list window
STR_SIGN_LIST_CAPTION :{WHITE}Sign List - {COMMA} Sign{P "" s} STR_SIGN_LIST_CAPTION :{WHITE}Sign List - {COMMA} Sign{P "" s}
STR_SIGN_LIST_MATCH_CASE :{BLACK}Match case STR_SIGN_LIST_MATCH_CASE :{BLACK}Match case
@@ -3199,12 +3190,10 @@ STR_ORDER_DROP_HALT_DEPOT :Stop
STR_ORDER_SERVICE_TOOLTIP :{BLACK}Skip this order unless a service is needed STR_ORDER_SERVICE_TOOLTIP :{BLACK}Skip this order unless a service is needed
STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Vehicle data to base jumping on STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Vehicle data to base jumping on
# Conditional order variables, must follow order of OrderConditionVariable enum
STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Load percentage STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Load percentage
STR_ORDER_CONDITIONAL_RELIABILITY :Reliability STR_ORDER_CONDITIONAL_RELIABILITY :Reliability
STR_ORDER_CONDITIONAL_MAX_SPEED :Maximum speed STR_ORDER_CONDITIONAL_MAX_SPEED :Maximum speed
STR_ORDER_CONDITIONAL_AGE :Age (years) STR_ORDER_CONDITIONAL_AGE :Vehicle age (years)
STR_ORDER_CONDITIONAL_REQUIRES_SERVICE :Requires service STR_ORDER_CONDITIONAL_REQUIRES_SERVICE :Requires service
STR_ORDER_CONDITIONAL_UNCONDITIONALLY :Always STR_ORDER_CONDITIONAL_UNCONDITIONALLY :Always
@@ -3279,8 +3268,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD :(No unloading a
STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY :(No unloading and wait for any full load) STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY :(No unloading and wait for any full load)
STR_ORDER_NO_UNLOAD_NO_LOAD :(No unloading and no loading) STR_ORDER_NO_UNLOAD_NO_LOAD :(No unloading and no loading)
STR_ORDER_STOP_LOCATION_NEAR_END :[near end] STR_ORDER_STOP_LOCATION_NEAR_END :[near end]
STR_ORDER_STOP_LOCATION_MIDDLE :[middle] STR_ORDER_STOP_LOCATION_MIDDLE :[middle]
STR_ORDER_STOP_LOCATION_FAR_END :[far end] STR_ORDER_STOP_LOCATION_FAR_END :[far end]
@@ -3454,8 +3441,6 @@ STR_ERROR_PNGMAP_MISC :{WHITE}... some
STR_ERROR_BMPMAP :{WHITE}Can't load landscape from BMP... STR_ERROR_BMPMAP :{WHITE}Can't load landscape from BMP...
STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... could not convert image type STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... could not convert image type
STR_ERROR_HEIGHTMAP_TOO_LARGE :{WHITE}... image is too large
STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Scale warning STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Scale warning
STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}Resizing source map too much is not recommended. Continue with the generation? STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}Resizing source map too much is not recommended. Continue with the generation?

View File

@@ -274,7 +274,7 @@ STR_SORT_BY_MAX_SPEED :Maximum speed
STR_SORT_BY_MODEL :Model STR_SORT_BY_MODEL :Model
STR_SORT_BY_VALUE :Value STR_SORT_BY_VALUE :Value
STR_SORT_BY_LENGTH :Length STR_SORT_BY_LENGTH :Length
STR_SORT_BY_LIFE_TIME :Remaining lifetime STR_SORT_BY_LIFE_TIME :Remaining life time
STR_SORT_BY_TIMETABLE_DELAY :Timetable delay STR_SORT_BY_TIMETABLE_DELAY :Timetable delay
STR_SORT_BY_FACILITY :Station type STR_SORT_BY_FACILITY :Station type
STR_SORT_BY_WAITING :Waiting cargo value STR_SORT_BY_WAITING :Waiting cargo value
@@ -859,26 +859,26 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Currency
STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Currency units selection STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Currency units selection
############ start of currency region ############ start of currency region
STR_GAME_OPTIONS_CURRENCY_GBP :British Pound (GBP) STR_GAME_OPTIONS_CURRENCY_GBP :Pounds (£)
STR_GAME_OPTIONS_CURRENCY_USD :American Dollar (USD) STR_GAME_OPTIONS_CURRENCY_USD :Dollars ($)
STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) STR_GAME_OPTIONS_CURRENCY_EUR :Euro ()
STR_GAME_OPTIONS_CURRENCY_YEN :Japanese Yen (JPY) STR_GAME_OPTIONS_CURRENCY_YEN :Yen (¥)
STR_GAME_OPTIONS_CURRENCY_ATS :Austrian Shilling (ATS) STR_GAME_OPTIONS_CURRENCY_ATS :Austrian Shilling (ATS)
STR_GAME_OPTIONS_CURRENCY_BEF :Belgian Franc (BEF) STR_GAME_OPTIONS_CURRENCY_BEF :Belgian Franc (BEF)
STR_GAME_OPTIONS_CURRENCY_CHF :Swiss Franc (CHF) STR_GAME_OPTIONS_CURRENCY_CHF :Swiss Franc (CHF)
STR_GAME_OPTIONS_CURRENCY_CZK :Czech Koruna (CZK) STR_GAME_OPTIONS_CURRENCY_CZK :Czech Koruna (CZK)
STR_GAME_OPTIONS_CURRENCY_DEM :Deutschmark (DEM) STR_GAME_OPTIONS_CURRENCY_DEM :Deutschmark (DEM)
STR_GAME_OPTIONS_CURRENCY_DKK :Danish Krone (DKK) STR_GAME_OPTIONS_CURRENCY_DKK :Danish Krone (DKK)
STR_GAME_OPTIONS_CURRENCY_ESP :Spanish Peseta (ESP) STR_GAME_OPTIONS_CURRENCY_ESP :Peseta (ESP)
STR_GAME_OPTIONS_CURRENCY_FIM :Finnish Markka (FIM) STR_GAME_OPTIONS_CURRENCY_FIM :Finnish Markka (FIM)
STR_GAME_OPTIONS_CURRENCY_FRF :French Franc (FRF) STR_GAME_OPTIONS_CURRENCY_FRF :Franc (FRF)
STR_GAME_OPTIONS_CURRENCY_GRD :Greek Drachma (GRD) STR_GAME_OPTIONS_CURRENCY_GRD :Greek Drachma (GRD)
STR_GAME_OPTIONS_CURRENCY_HUF :Hungarian Forint (HUF) STR_GAME_OPTIONS_CURRENCY_HUF :Hungarian Forint (HUF)
STR_GAME_OPTIONS_CURRENCY_ISK :Icelandic Krona (ISK) STR_GAME_OPTIONS_CURRENCY_ISK :Icelandic Krona (ISK)
STR_GAME_OPTIONS_CURRENCY_ITL :Italian Lira (ITL) STR_GAME_OPTIONS_CURRENCY_ITL :Italian Lira (ITL)
STR_GAME_OPTIONS_CURRENCY_NLG :Dutch Guilder (NLG) STR_GAME_OPTIONS_CURRENCY_NLG :Dutch Guilder (NLG)
STR_GAME_OPTIONS_CURRENCY_NOK :Norwegian Krone (NOK) STR_GAME_OPTIONS_CURRENCY_NOK :Norwegian Krone (NOK)
STR_GAME_OPTIONS_CURRENCY_PLN :Polish Złoty (PLN) STR_GAME_OPTIONS_CURRENCY_PLN :Polish Zloty (PLN)
STR_GAME_OPTIONS_CURRENCY_RON :Romanian Leu (RON) STR_GAME_OPTIONS_CURRENCY_RON :Romanian Leu (RON)
STR_GAME_OPTIONS_CURRENCY_RUR :Russian Rubel (RUR) STR_GAME_OPTIONS_CURRENCY_RUR :Russian Rubel (RUR)
STR_GAME_OPTIONS_CURRENCY_SIT :Slovenian Tolar (SIT) STR_GAME_OPTIONS_CURRENCY_SIT :Slovenian Tolar (SIT)
@@ -1057,7 +1057,6 @@ STR_SEA_LEVEL_HIGH :High
STR_SEA_LEVEL_CUSTOM :Custom STR_SEA_LEVEL_CUSTOM :Custom
STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Custom ({NUM}%) STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Custom ({NUM}%)
STR_DISASTER_NONE :None STR_DISASTER_NONE :None
STR_DISASTER_REDUCED :Reduced STR_DISASTER_REDUCED :Reduced
STR_DISASTER_NORMAL :Normal STR_DISASTER_NORMAL :Normal
@@ -1112,8 +1111,8 @@ STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC :Realistic
STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL :{LTBLUE}Road vehicle acceleration model: {ORANGE}{STRING} STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL :{LTBLUE}Road vehicle acceleration model: {ORANGE}{STRING}
STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_ORIGINAL :Original STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_ORIGINAL :Original
STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_REALISTIC :Realistic STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_REALISTIC :Realistic
STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS :{LTBLUE}Slope steepness for trains: {ORANGE}{STRING}% STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS :{LTBLUE}Slope steepness for trains {ORANGE}{STRING}%
STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS :{LTBLUE}Slope steepness for road vehicles: {ORANGE}{STRING}% STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS :{LTBLUE}Slope steepness for road vehicles {ORANGE}{STRING}%
STR_CONFIG_SETTING_FORBID_90_DEG :{LTBLUE}Forbid trains and ships to make 90 deg turns: {ORANGE}{STRING} STR_CONFIG_SETTING_FORBID_90_DEG :{LTBLUE}Forbid trains and ships to make 90 deg turns: {ORANGE}{STRING}
STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS :{LTBLUE}Allow joining stations not directly adjacent: {ORANGE}{STRING} STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS :{LTBLUE}Allow joining stations not directly adjacent: {ORANGE}{STRING}
STR_CONFIG_SETTING_IMPROVEDLOAD :{LTBLUE}Use improved loading algorithm: {ORANGE}{STRING} STR_CONFIG_SETTING_IMPROVEDLOAD :{LTBLUE}Use improved loading algorithm: {ORANGE}{STRING}
@@ -1262,7 +1261,7 @@ STR_CONFIG_SETTING_AI_BUILDS_ROAD_VEHICLES :{LTBLUE}Disable
STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT :{LTBLUE}Disable aircraft for computer: {ORANGE}{STRING} STR_CONFIG_SETTING_AI_BUILDS_AIRCRAFT :{LTBLUE}Disable aircraft for computer: {ORANGE}{STRING}
STR_CONFIG_SETTING_AI_BUILDS_SHIPS :{LTBLUE}Disable ships for computer: {ORANGE}{STRING} STR_CONFIG_SETTING_AI_BUILDS_SHIPS :{LTBLUE}Disable ships for computer: {ORANGE}{STRING}
STR_CONFIG_SETTING_AI_IN_MULTIPLAYER :{LTBLUE}Allow AIs in multiplayer: {ORANGE}{STRING} STR_CONFIG_SETTING_AI_IN_MULTIPLAYER :{LTBLUE}Allow AIs in multiplayer (experimental): {ORANGE}{STRING}
STR_CONFIG_SETTING_AI_MAX_OPCODES :{LTBLUE}#opcodes before AI is suspended: {ORANGE}{STRING} STR_CONFIG_SETTING_AI_MAX_OPCODES :{LTBLUE}#opcodes before AI is suspended: {ORANGE}{STRING}
STR_CONFIG_SETTING_SERVINT_ISPERCENT :{LTBLUE}Maintenance intervals are in percents: {ORANGE}{STRING} STR_CONFIG_SETTING_SERVINT_ISPERCENT :{LTBLUE}Maintenance intervals are in percents: {ORANGE}{STRING}
@@ -1408,7 +1407,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Check fo
STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Display AI settings STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Display AI settings
STR_INTRO_TOOLTIP_QUIT :{BLACK}Quit 'OpenTTD' STR_INTRO_TOOLTIP_QUIT :{BLACK}Quit 'OpenTTD'
# Quit window # Quit window
STR_QUIT_CAPTION :{WHITE}Quit STR_QUIT_CAPTION :{WHITE}Quit
STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Are you sure you want to quit OpenTTD and return to {STRING}? STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Are you sure you want to quit OpenTTD and return to {STRING}?
@@ -1884,7 +1882,6 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST :{WHITE}... conn
STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE :{WHITE}... file not writable STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE :{WHITE}... file not writable
STR_CONTENT_ERROR_COULD_NOT_EXTRACT :{WHITE}Could not decompress the downloaded file STR_CONTENT_ERROR_COULD_NOT_EXTRACT :{WHITE}Could not decompress the downloaded file
# Transparency settings window # Transparency settings window
STR_TRANSPARENCY_CAPTION :{WHITE}Transparency Options STR_TRANSPARENCY_CAPTION :{WHITE}Transparency Options
STR_TRANSPARENT_SIGNS_TOOLTIP :{BLACK}Toggle transparency for station signs. Ctrl+Click to lock STR_TRANSPARENT_SIGNS_TOOLTIP :{BLACK}Toggle transparency for station signs. Ctrl+Click to lock
@@ -1931,7 +1928,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL :{BLACK}Build ra
STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Toggle build/remove for railroad track, signals, waypoints and stations. Hold Ctrl to also remove the rail of waypoints and stations STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Toggle build/remove for railroad track, signals, waypoints and stations. Hold Ctrl to also remove the rail of waypoints and stations
STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL :{BLACK}Convert/Upgrade the type of rail. Shift toggles building/showing cost estimate STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL :{BLACK}Convert/Upgrade the type of rail. Shift toggles building/showing cost estimate
# Rail depot construction window # Rail depot construction window
STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION :{WHITE}Train Depot Orientation STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION :{WHITE}Train Depot Orientation
STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP :{BLACK}Select railroad depot orientation STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP :{BLACK}Select railroad depot orientation
@@ -2407,8 +2403,6 @@ STR_NEWGRF_SETTINGS_MOVEDOWN :{BLACK}Move Dow
STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP :{BLACK}Move the selected NewGRF file down the list STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP :{BLACK}Move the selected NewGRF file down the list
STR_NEWGRF_SETTINGS_FILE_TOOLTIP :{BLACK}A list of the NewGRF files that are installed. Click a file to change its parameters STR_NEWGRF_SETTINGS_FILE_TOOLTIP :{BLACK}A list of the NewGRF files that are installed. Click a file to change its parameters
# Additional textfiles accompanying NewGRFs
STR_NEWGRF_SETTINGS_SET_PARAMETERS :{BLACK}Set parameters STR_NEWGRF_SETTINGS_SET_PARAMETERS :{BLACK}Set parameters
STR_NEWGRF_SETTINGS_TOGGLE_PALETTE :{BLACK}Toggle palette STR_NEWGRF_SETTINGS_TOGGLE_PALETTE :{BLACK}Toggle palette
STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP :{BLACK}Toggle the palette of the selected NewGRF.{}Do this when the graphics from this NewGRF look pink in-game STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP :{BLACK}Toggle the palette of the selected NewGRF.{}Do this when the graphics from this NewGRF look pink in-game
@@ -2431,6 +2425,7 @@ STR_NEWGRF_SETTINGS_DISABLED :{RED}Disabled
STR_NEWGRF_SETTINGS_INCOMPATIBLE :{RED}Incompatible with this version of OpenTTD STR_NEWGRF_SETTINGS_INCOMPATIBLE :{RED}Incompatible with this version of OpenTTD
STR_NEWGRF_SETTINGS_PARAMETER_QUERY :{BLACK}Enter NewGRF parameters STR_NEWGRF_SETTINGS_PARAMETER_QUERY :{BLACK}Enter NewGRF parameters
# NewGRF parameters window # NewGRF parameters window
STR_NEWGRF_PARAMETERS_CAPTION :{WHITE}Change NewGRF parameters STR_NEWGRF_PARAMETERS_CAPTION :{WHITE}Change NewGRF parameters
STR_NEWGRF_PARAMETERS_CLOSE :{BLACK}Close STR_NEWGRF_PARAMETERS_CLOSE :{BLACK}Close
@@ -2440,8 +2435,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME :Parameter {NUM}
STR_NEWGRF_PARAMETERS_SETTING :{STRING}: {ORANGE}{STRING} STR_NEWGRF_PARAMETERS_SETTING :{STRING}: {ORANGE}{STRING}
STR_NEWGRF_PARAMETERS_NUM_PARAM :{LTBLUE}Number of parameters: {ORANGE}{NUM} STR_NEWGRF_PARAMETERS_NUM_PARAM :{LTBLUE}Number of parameters: {ORANGE}{NUM}
# NewGRF textfile window
# NewGRF inspect window # NewGRF inspect window
STR_NEWGRF_INSPECT_CAPTION :{WHITE}Inspect - {STRING} STR_NEWGRF_INSPECT_CAPTION :{WHITE}Inspect - {STRING}
STR_NEWGRF_INSPECT_PARENT_BUTTON :{BLACK}Parent STR_NEWGRF_INSPECT_PARENT_BUTTON :{BLACK}Parent
@@ -2530,8 +2523,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY :{COMMA} of <inv
STR_NEWGRF_INVALID_ENGINE :<invalid vehicle model> STR_NEWGRF_INVALID_ENGINE :<invalid vehicle model>
STR_NEWGRF_INVALID_INDUSTRYTYPE :<invalid industry> STR_NEWGRF_INVALID_INDUSTRYTYPE :<invalid industry>
# NewGRF scanning window
# Sign list window # Sign list window
STR_SIGN_LIST_CAPTION :{WHITE}Sign List - {COMMA} Sign{P "" s} STR_SIGN_LIST_CAPTION :{WHITE}Sign List - {COMMA} Sign{P "" s}
STR_SIGN_LIST_MATCH_CASE :{BLACK}Match case STR_SIGN_LIST_MATCH_CASE :{BLACK}Match case
@@ -3199,12 +3190,10 @@ STR_ORDER_DROP_HALT_DEPOT :Stop
STR_ORDER_SERVICE_TOOLTIP :{BLACK}Skip this order unless maintenance is needed STR_ORDER_SERVICE_TOOLTIP :{BLACK}Skip this order unless maintenance is needed
STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Vehicle data to base jumping on STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Vehicle data to base jumping on
# Conditional order variables, must follow order of OrderConditionVariable enum
STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Load percentage STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Load percentage
STR_ORDER_CONDITIONAL_RELIABILITY :Reliability STR_ORDER_CONDITIONAL_RELIABILITY :Reliability
STR_ORDER_CONDITIONAL_MAX_SPEED :Maximum speed STR_ORDER_CONDITIONAL_MAX_SPEED :Maximum speed
STR_ORDER_CONDITIONAL_AGE :Age (years) STR_ORDER_CONDITIONAL_AGE :Vehicle age (years)
STR_ORDER_CONDITIONAL_REQUIRES_SERVICE :Requires maintenance STR_ORDER_CONDITIONAL_REQUIRES_SERVICE :Requires maintenance
STR_ORDER_CONDITIONAL_UNCONDITIONALLY :Always STR_ORDER_CONDITIONAL_UNCONDITIONALLY :Always
@@ -3279,8 +3268,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD :(No unloading a
STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY :(No unloading and wait for any full load) STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY :(No unloading and wait for any full load)
STR_ORDER_NO_UNLOAD_NO_LOAD :(No unloading and no loading) STR_ORDER_NO_UNLOAD_NO_LOAD :(No unloading and no loading)
STR_ORDER_STOP_LOCATION_NEAR_END :[near end] STR_ORDER_STOP_LOCATION_NEAR_END :[near end]
STR_ORDER_STOP_LOCATION_MIDDLE :[middle] STR_ORDER_STOP_LOCATION_MIDDLE :[middle]
STR_ORDER_STOP_LOCATION_FAR_END :[far end] STR_ORDER_STOP_LOCATION_FAR_END :[far end]
@@ -3454,8 +3441,6 @@ STR_ERROR_PNGMAP_MISC :{WHITE}... some
STR_ERROR_BMPMAP :{WHITE}Can't load landscape from BMP... STR_ERROR_BMPMAP :{WHITE}Can't load landscape from BMP...
STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... could not convert image type STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... could not convert image type
STR_ERROR_HEIGHTMAP_TOO_LARGE :{WHITE}... image is too large
STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Scale warning STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Scale warning
STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}Resizing source map too much is not recommended. Continue with the generation? STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}Resizing source map too much is not recommended. Continue with the generation?

View File

@@ -274,7 +274,7 @@ STR_SORT_BY_MAX_SPEED :Maksimuma rapid
STR_SORT_BY_MODEL :Tipo STR_SORT_BY_MODEL :Tipo
STR_SORT_BY_VALUE :Valoro STR_SORT_BY_VALUE :Valoro
STR_SORT_BY_LENGTH :Longo STR_SORT_BY_LENGTH :Longo
STR_SORT_BY_LIFE_TIME :Resta vivo STR_SORT_BY_LIFE_TIME :Restanta vivdaŭro
STR_SORT_BY_TIMETABLE_DELAY :Horara malfruo STR_SORT_BY_TIMETABLE_DELAY :Horara malfruo
STR_SORT_BY_FACILITY :Stacidoma tipo STR_SORT_BY_FACILITY :Stacidoma tipo
STR_SORT_BY_WAITING :Valoro de atendanta ŝarĝo STR_SORT_BY_WAITING :Valoro de atendanta ŝarĝo
@@ -446,7 +446,6 @@ STR_ABOUT_MENU_SCREENSHOT :Ekranfoto
STR_ABOUT_MENU_ZOOMIN_SCREENSHOT :Pligrandiga ekranfoto STR_ABOUT_MENU_ZOOMIN_SCREENSHOT :Pligrandiga ekranfoto
STR_ABOUT_MENU_GIANT_SCREENSHOT :Tuta karto ekranfoto STR_ABOUT_MENU_GIANT_SCREENSHOT :Tuta karto ekranfoto
STR_ABOUT_MENU_ABOUT_OPENTTD :Pri 'OpenTTD' STR_ABOUT_MENU_ABOUT_OPENTTD :Pri 'OpenTTD'
STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Montri/ne montri limigujo
############ range ends here ############ range ends here
############ range for days starts (also used for the place in the highscore window) ############ range for days starts (also used for the place in the highscore window)
@@ -857,9 +856,9 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Monunuoj
STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Elekto de monunuoj STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Elekto de monunuoj
############ start of currency region ############ start of currency region
STR_GAME_OPTIONS_CURRENCY_GBP :Brita Pundo (GBP) STR_GAME_OPTIONS_CURRENCY_GBP :Pundoj (£)
STR_GAME_OPTIONS_CURRENCY_USD :Amerika Dolaro (USD) STR_GAME_OPTIONS_CURRENCY_USD :Dolaroj ($)
STR_GAME_OPTIONS_CURRENCY_EUR :Eŭro (EUR) STR_GAME_OPTIONS_CURRENCY_EUR :Eŭroj ()
STR_GAME_OPTIONS_CURRENCY_YEN :Enoj (¥) STR_GAME_OPTIONS_CURRENCY_YEN :Enoj (¥)
STR_GAME_OPTIONS_CURRENCY_ATS :Aŭstriaj Ŝilingoj (ATS) STR_GAME_OPTIONS_CURRENCY_ATS :Aŭstriaj Ŝilingoj (ATS)
STR_GAME_OPTIONS_CURRENCY_BEF :Belgaj Frankoj (BEF) STR_GAME_OPTIONS_CURRENCY_BEF :Belgaj Frankoj (BEF)
@@ -1052,7 +1051,6 @@ STR_SEA_LEVEL_HIGH :Alte
STR_SEA_LEVEL_CUSTOM :Alia STR_SEA_LEVEL_CUSTOM :Alia
STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Alia ({NUM}%) STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Alia ({NUM}%)
STR_DISASTER_NONE :Neniu STR_DISASTER_NONE :Neniu
STR_DISASTER_REDUCED :Malpli STR_DISASTER_REDUCED :Malpli
STR_DISASTER_NORMAL :Normale STR_DISASTER_NORMAL :Normale
@@ -1107,8 +1105,8 @@ STR_CONFIG_SETTING_TRAIN_ACCELERATION_MODEL_REALISTIC :Realisme
STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL :{LTBLUE}Modelo de stratveturilakcelado: {ORANGE}{STRING} STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL :{LTBLUE}Modelo de stratveturilakcelado: {ORANGE}{STRING}
STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_ORIGINAL :Originale STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_ORIGINAL :Originale
STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_REALISTIC :Realisme STR_CONFIG_SETTING_ROAD_VEHICLE_ACCELERATION_MODEL_REALISTIC :Realisme
STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS :{LTBLUE}Dekliva kruteco por vagonaroj: {ORANGE}{STRING}% STR_CONFIG_SETTING_TRAIN_SLOPE_STEEPNESS :{LTBLUE}Kruteco de deklivo por vagonaroj {ORANGE}{STRING}%
STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS :{LTBLUE}Dekliva kruteco por stratveturiloj: {ORANGE}{STRING}% STR_CONFIG_SETTING_ROAD_VEHICLE_SLOPE_STEEPNESS :{LTBLUE}Kruteco de deklivo por stratveturiloj {ORANGE}{STRING}%
STR_CONFIG_SETTING_FORBID_90_DEG :{LTBLUE}Vagonaroj kaj ŝipoj ne ort-turniĝu: {ORANGE}{STRING} STR_CONFIG_SETTING_FORBID_90_DEG :{LTBLUE}Vagonaroj kaj ŝipoj ne ort-turniĝu: {ORANGE}{STRING}
STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS :{LTBLUE}Permesu ligi staciojn ne rekte najbarajn: {ORANGE}{STRING} STR_CONFIG_SETTING_DISTANT_JOIN_STATIONS :{LTBLUE}Permesu ligi staciojn ne rekte najbarajn: {ORANGE}{STRING}
STR_CONFIG_SETTING_IMPROVEDLOAD :{LTBLUE}Uzu plibonigitan ŝarĝalgoritmon: {ORANGE}{STRING} STR_CONFIG_SETTING_IMPROVEDLOAD :{LTBLUE}Uzu plibonigitan ŝarĝalgoritmon: {ORANGE}{STRING}
@@ -1401,7 +1399,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Serĉi p
STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Montri AI-agordojn. STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Montri AI-agordojn.
STR_INTRO_TOOLTIP_QUIT :{BLACK}Fermu 'OpenTTD' STR_INTRO_TOOLTIP_QUIT :{BLACK}Fermu 'OpenTTD'
# Quit window # Quit window
STR_QUIT_CAPTION :{WHITE}Fermi STR_QUIT_CAPTION :{WHITE}Fermi
STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Ĉu vi vere volas fermi la ludon kaj reiri al {STRING}? STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Ĉu vi vere volas fermi la ludon kaj reiri al {STRING}?
@@ -1873,7 +1870,6 @@ STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_CONNECTION_LOST :{WHITE}... neko
STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE :{WHITE}... dosiero ne skribebla STR_CONTENT_ERROR_COULD_NOT_DOWNLOAD_FILE_NOT_WRITABLE :{WHITE}... dosiero ne skribebla
STR_CONTENT_ERROR_COULD_NOT_EXTRACT :{WHITE}Ne povis malkompaktigi la elŝutitan dosieron STR_CONTENT_ERROR_COULD_NOT_EXTRACT :{WHITE}Ne povis malkompaktigi la elŝutitan dosieron
# Transparency settings window # Transparency settings window
STR_TRANSPARENCY_CAPTION :{WHITE}Ebloj por travidebleco STR_TRANSPARENCY_CAPTION :{WHITE}Ebloj por travidebleco
STR_TRANSPARENT_SIGNS_TOOLTIP :{BLACK}Baskuligi travideblecon de staciosignoj. Stir+Klak por ŝlosi. STR_TRANSPARENT_SIGNS_TOOLTIP :{BLACK}Baskuligi travideblecon de staciosignoj. Stir+Klak por ŝlosi.
@@ -1919,7 +1915,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL :{BLACK}Konstruu
STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Elekti inter konstruado/forigado de trako, signaliloj, vojpunktoj kaj stacidomoj. Tenu Stir-klavon por forigi relojn de vojpunktoj kaj stacioj. STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Elekti inter konstruado/forigado de trako, signaliloj, vojpunktoj kaj stacidomoj. Tenu Stir-klavon por forigi relojn de vojpunktoj kaj stacioj.
STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL :{BLACK}Transigu reltipon STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL :{BLACK}Transigu reltipon
# Rail depot construction window # Rail depot construction window
STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION :{WHITE}Direkto de la trajngaraĝo STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION :{WHITE}Direkto de la trajngaraĝo
STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP :{BLACK}Elekti direkton de la trajngaraĝo STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP :{BLACK}Elekti direkton de la trajngaraĝo
@@ -2375,8 +2370,6 @@ STR_NEWGRF_SETTINGS_MOVEDOWN :{BLACK}Malsupre
STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP :{BLACK}Movu la elektitan NewGRF-dosieron malsupren en la listo STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP :{BLACK}Movu la elektitan NewGRF-dosieron malsupren en la listo
STR_NEWGRF_SETTINGS_FILE_TOOLTIP :{BLACK}Listo da instalitaj NewGRF-dosieroj. Alklaku dosieron por ŝanĝi la parametrojn STR_NEWGRF_SETTINGS_FILE_TOOLTIP :{BLACK}Listo da instalitaj NewGRF-dosieroj. Alklaku dosieron por ŝanĝi la parametrojn
# Additional textfiles accompanying NewGRFs
STR_NEWGRF_SETTINGS_SET_PARAMETERS :{BLACK}Agordu parametrojn STR_NEWGRF_SETTINGS_SET_PARAMETERS :{BLACK}Agordu parametrojn
STR_NEWGRF_SETTINGS_TOGGLE_PALETTE :{BLACK}Baskuligi paletron STR_NEWGRF_SETTINGS_TOGGLE_PALETTE :{BLACK}Baskuligi paletron
STR_NEWGRF_SETTINGS_APPLY_CHANGES :{BLACK}Apliku ŝanĝojn STR_NEWGRF_SETTINGS_APPLY_CHANGES :{BLACK}Apliku ŝanĝojn
@@ -2398,6 +2391,7 @@ STR_NEWGRF_SETTINGS_DISABLED :{RED}Malaktiva
STR_NEWGRF_SETTINGS_INCOMPATIBLE :{RED}Malkongrua ĉe ĉi tio versio de OpenTTD STR_NEWGRF_SETTINGS_INCOMPATIBLE :{RED}Malkongrua ĉe ĉi tio versio de OpenTTD
STR_NEWGRF_SETTINGS_PARAMETER_QUERY :{BLACK}Enigu NewGRF-parametrojn STR_NEWGRF_SETTINGS_PARAMETER_QUERY :{BLACK}Enigu NewGRF-parametrojn
# NewGRF parameters window # NewGRF parameters window
STR_NEWGRF_PARAMETERS_CAPTION :{WHITE}Ŝanĝu parametroj de la NewGRF STR_NEWGRF_PARAMETERS_CAPTION :{WHITE}Ŝanĝu parametroj de la NewGRF
STR_NEWGRF_PARAMETERS_CLOSE :{BLACK}Fermu STR_NEWGRF_PARAMETERS_CLOSE :{BLACK}Fermu
@@ -2407,8 +2401,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME :Parametro {NUM}
STR_NEWGRF_PARAMETERS_SETTING :{STRING}: {ORANGE}{STRING} STR_NEWGRF_PARAMETERS_SETTING :{STRING}: {ORANGE}{STRING}
STR_NEWGRF_PARAMETERS_NUM_PARAM :{LTBLUE}Nombro da parametroj: {ORANGE}{NUM} STR_NEWGRF_PARAMETERS_NUM_PARAM :{LTBLUE}Nombro da parametroj: {ORANGE}{NUM}
# NewGRF textfile window
# NewGRF inspect window # NewGRF inspect window
STR_NEWGRF_INSPECT_CAPTION :{WHITE}Inspektu - {STRING} STR_NEWGRF_INSPECT_CAPTION :{WHITE}Inspektu - {STRING}
STR_NEWGRF_INSPECT_PARENT_BUTTON :{BLACK}Magistro STR_NEWGRF_INSPECT_PARENT_BUTTON :{BLACK}Magistro
@@ -2436,14 +2428,14 @@ STR_NEWGRF_ERROR_MSG_ERROR :{RED}Eraro: {SI
STR_NEWGRF_ERROR_MSG_FATAL :{RED}Fatalo: {SILVER}{STRING} STR_NEWGRF_ERROR_MSG_FATAL :{RED}Fatalo: {SILVER}{STRING}
STR_NEWGRF_ERROR_FATAL_POPUP :{WHITE}Neriparebla NewGRF-eraro okazis: {}{STRING} STR_NEWGRF_ERROR_FATAL_POPUP :{WHITE}Neriparebla NewGRF-eraro okazis: {}{STRING}
STR_NEWGRF_ERROR_VERSION_NUMBER :{1:STRING} ne funkcios kun la versio de TTDPatch menciata de OpenTTD. STR_NEWGRF_ERROR_VERSION_NUMBER :{1:STRING} ne funkcios kun la versio de TTDPatch menciata de OpenTTD.
STR_NEWGRF_ERROR_DOS_OR_WINDOWS :{1:STRING} estas por la {STRING} versio de TTD. STR_NEWGRF_ERROR_DOS_OR_WINDOWS :{1:STRING} estas por versio {STRING} de TTD.
STR_NEWGRF_ERROR_UNSET_SWITCH :{1:STRING} estas intencita por uzo kun {STRING} STR_NEWGRF_ERROR_UNSET_SWITCH :{1:STRING} estas intencita por uzo kun {STRING}
STR_NEWGRF_ERROR_INVALID_PARAMETER :Nevalida parametro por {1:STRING}: parametro{STRING} ({NUM}) STR_NEWGRF_ERROR_INVALID_PARAMETER :Nevalida parametro por {1:STRING}: parametro{STRING} ({NUM})
STR_NEWGRF_ERROR_LOAD_BEFORE :{1:STRING} devi esti ŝarĝata antaŭ {STRING}. STR_NEWGRF_ERROR_LOAD_BEFORE :{1:STRING} estu ŝarĝata antaŭ {STRING}.
STR_NEWGRF_ERROR_LOAD_AFTER :{1:STRING} devi esti ŝarĝata post {STRING}. STR_NEWGRF_ERROR_LOAD_AFTER :{1:STRING} estu ŝarĝata post {STRING}.
STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER :{1:STRING} bezonas OpenTTD versio {STRING} aŭ pli bona STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER :{1:STRING} bezonas almenaŭ version {STRING} de OpenTTD
STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE :la GRF-dosiero estas farita por traduki STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE :la GRF-dosiero estas farita por traduki
STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED :Tro da NewGRF-oj estas ŝarĝataj STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED :Tro da novaj grafikaĵoj estas ŝarĝataj
STR_NEWGRF_ERROR_UNEXPECTED_SPRITE :Neatendita bildeto. STR_NEWGRF_ERROR_UNEXPECTED_SPRITE :Neatendita bildeto.
STR_NEWGRF_ERROR_INVALID_ID :Atenco uzi nevalida ID. STR_NEWGRF_ERROR_INVALID_ID :Atenco uzi nevalida ID.
STR_NEWGRF_ERROR_CORRUPT_SPRITE :{YELLOW}{STRING} enhavas rompitan bildeton. Ĉiuj rompitaj bildetoj aspektos kiel ruĝaj demandsignoj (?). STR_NEWGRF_ERROR_CORRUPT_SPRITE :{YELLOW}{STRING} enhavas rompitan bildeton. Ĉiuj rompitaj bildetoj aspektos kiel ruĝaj demandsignoj (?).
@@ -2480,8 +2472,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY :{COMMA} de <mal
STR_NEWGRF_INVALID_ENGINE :<malvalida modelo de veturilo> STR_NEWGRF_INVALID_ENGINE :<malvalida modelo de veturilo>
STR_NEWGRF_INVALID_INDUSTRYTYPE :<malvalida industrio> STR_NEWGRF_INVALID_INDUSTRYTYPE :<malvalida industrio>
# NewGRF scanning window
# Sign list window # Sign list window
STR_SIGN_LIST_CAPTION :{WHITE}Signolisto - {COMMA} Signo{P "" j} STR_SIGN_LIST_CAPTION :{WHITE}Signolisto - {COMMA} Signo{P "" j}
STR_SIGN_LIST_MATCH_CASE :{BLACK}Parigu kazon STR_SIGN_LIST_MATCH_CASE :{BLACK}Parigu kazon
@@ -2971,7 +2961,7 @@ STR_VEHICLE_VIEW_AIRCRAFT_SEND_TO_DEPOT_TOOLTIP :{BLACK}Sendi av
STR_VEHICLE_VIEW_CLONE_TRAIN_INFO :{BLACK}Aĉeti kopion de la trajno kun ĉiuj vagonoj. Stir+Klak por kunhavigi la itineron. STR_VEHICLE_VIEW_CLONE_TRAIN_INFO :{BLACK}Aĉeti kopion de la trajno kun ĉiuj vagonoj. Stir+Klak por kunhavigi la itineron.
STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO :{BLACK}Aĉeti kopion de la stratveturilo. Stir+Klak por kunhavigi la itineron. STR_VEHICLE_VIEW_CLONE_ROAD_VEHICLE_INFO :{BLACK}Aĉeti kopion de la stratveturilo. Stir+Klak por kunhavigi la itineron.
STR_VEHICLE_VIEW_CLONE_SHIP_INFO :{BLACK}Aĉeti kopion de la ŝipo. Stir+Klak por kunhavigi la itineron. STR_VEHICLE_VIEW_CLONE_SHIP_INFO :{BLACK}Aĉeti kopion de la ŝipo. Stir+Klak por kunhavigi la itineron.
STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO :{BLACK}Aĉeti kopion de la aviadilo. Stir+Klak por kunhavigi la itinero. Maj+klak montros la antaŭvidatan koston sen jam aĉetin. STR_VEHICLE_VIEW_CLONE_AIRCRAFT_INFO :{BLACK}Aĉeti kopion de la aviadilo. Stir+Klak por kunhavigi la itineron.
STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP :{BLACK}Igu trajnon iri malgraŭ signalo STR_VEHICLE_VIEW_TRAIN_IGNORE_SIGNAL_TOOLTIP :{BLACK}Igu trajnon iri malgraŭ signalo
@@ -3146,12 +3136,10 @@ STR_ORDER_DROP_SERVICE_DEPOT :Prizorgu se nec
STR_ORDER_DROP_HALT_DEPOT :Haltu. STR_ORDER_DROP_HALT_DEPOT :Haltu.
STR_ORDER_SERVICE_TOOLTIP :{BLACK}Transsalti ordonon escepte de prizorgo necesas STR_ORDER_SERVICE_TOOLTIP :{BLACK}Transsalti ordonon escepte de prizorgo necesas
# Conditional order variables, must follow order of OrderConditionVariable enum
STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Ŝarĝu procenton STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Ŝarĝu procenton
STR_ORDER_CONDITIONAL_RELIABILITY :Fidindo STR_ORDER_CONDITIONAL_RELIABILITY :Fidindo
STR_ORDER_CONDITIONAL_MAX_SPEED :Maksimuma rapido. STR_ORDER_CONDITIONAL_MAX_SPEED :Maksimuma rapido.
STR_ORDER_CONDITIONAL_AGE :Aĝo (jaroj) STR_ORDER_CONDITIONAL_AGE :Aĝo de la veturilo (jaroj)
STR_ORDER_CONDITIONAL_REQUIRES_SERVICE :Prizorgo necesas. STR_ORDER_CONDITIONAL_REQUIRES_SERVICE :Prizorgo necesas.
STR_ORDER_CONDITIONAL_UNCONDITIONALLY :Ĉiam STR_ORDER_CONDITIONAL_UNCONDITIONALLY :Ĉiam
@@ -3224,8 +3212,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD :(Ne malŝarĝu
STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY :(Ne malŝarĝu kaj atendu ajnan plenan ŝarĝon) STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY :(Ne malŝarĝu kaj atendu ajnan plenan ŝarĝon)
STR_ORDER_NO_UNLOAD_NO_LOAD :(Ne malŝarĝu kaj ne ŝarĝu) STR_ORDER_NO_UNLOAD_NO_LOAD :(Ne malŝarĝu kaj ne ŝarĝu)
STR_ORDER_STOP_LOCATION_NEAR_END :[near end] STR_ORDER_STOP_LOCATION_NEAR_END :[near end]
STR_ORDER_STOP_LOCATION_MIDDLE :[middle] STR_ORDER_STOP_LOCATION_MIDDLE :[middle]
STR_ORDER_STOP_LOCATION_FAR_END :[far end] STR_ORDER_STOP_LOCATION_FAR_END :[far end]
@@ -3390,13 +3376,10 @@ STR_ERROR_PNGMAP_MISC :{WHITE}... io s
STR_ERROR_BMPMAP :{WHITE}Ne povas ŝarĝi landaspekton el BMP... STR_ERROR_BMPMAP :{WHITE}Ne povas ŝarĝi landaspekton el BMP...
STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... ne povis transigi bildotipon. STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... ne povis transigi bildotipon.
STR_ERROR_HEIGHTMAP_TOO_LARGE :{WHITE}... bildo estas tro granda
STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Skala averto STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Skala averto
STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}Ne rekomendindas tro ŝanĝi la grandecon de la mapo. Ĉu daŭrigi la generadon? STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}Ne rekomendindas tro ŝanĝi la grandecon de la mapo. Ĉu daŭrigi la generadon?
# Soundset messages # Soundset messages
STR_WARNING_FALLBACK_SOUNDSET :{WHITE}Sola bakupa sona aro estis trovata. Se vi bezonas sonojn, instalu sonan aron per la enhava elŝulta sistemo
# Screenshot related messages # Screenshot related messages
STR_MESSAGE_SCREENSHOT_SUCCESSFULLY :{WHITE}Ekranfoto sukcese konserviĝis kiel '{STRING}' STR_MESSAGE_SCREENSHOT_SUCCESSFULLY :{WHITE}Ekranfoto sukcese konserviĝis kiel '{STRING}'
@@ -3468,7 +3451,6 @@ STR_ERROR_TOO_MANY_TOWNS :{WHITE}... tro
STR_ERROR_NO_SPACE_FOR_TOWN :{WHITE}... spaco mankas sur la mapo STR_ERROR_NO_SPACE_FOR_TOWN :{WHITE}... spaco mankas sur la mapo
STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS :{WHITE}La urbo ne konstruos stratojn. Vi povas ebligi stratkonstruadon per Avancitaj Agordoj->Ekonomio->Urboj. STR_ERROR_TOWN_EXPAND_WARN_NO_ROADS :{WHITE}La urbo ne konstruos stratojn. Vi povas ebligi stratkonstruadon per Avancitaj Agordoj->Ekonomio->Urboj.
STR_ERROR_ROAD_WORKS_IN_PROGRESS :{WHITE}Aktivas vojprilaborado STR_ERROR_ROAD_WORKS_IN_PROGRESS :{WHITE}Aktivas vojprilaborado
STR_ERROR_TOWN_CAN_T_DELETE :{WHITE}Ne povas forviŝi ĉi tiun urbon...{}Stacidomo aŭ tenejo rilatas al la urbon aŭ urban kahelon ne povas forviŝigi
STR_ERROR_STATUE_NO_SUITABLE_PLACE :{WHITE}... ne jen estas konvenan lokon por statuo en la centro de ĉi tiu urbo STR_ERROR_STATUE_NO_SUITABLE_PLACE :{WHITE}... ne jen estas konvenan lokon por statuo en la centro de ĉi tiu urbo
# Industry related errors # Industry related errors

View File

@@ -504,7 +504,6 @@ STR_ABOUT_MENU_ZOOMIN_SCREENSHOT :Suumitud ekraan
STR_ABOUT_MENU_GIANT_SCREENSHOT :Terve kaardi ekraanitõmmis STR_ABOUT_MENU_GIANT_SCREENSHOT :Terve kaardi ekraanitõmmis
STR_ABOUT_MENU_ABOUT_OPENTTD :'OpenTTD' kohta STR_ABOUT_MENU_ABOUT_OPENTTD :'OpenTTD' kohta
STR_ABOUT_MENU_SPRITE_ALIGNER :Sprite aligner STR_ABOUT_MENU_SPRITE_ALIGNER :Sprite aligner
STR_ABOUT_MENU_TOGGLE_BOUNDING_BOXES :Kontuuride kuvamine
############ range ends here ############ range ends here
############ range for days starts (also used for the place in the highscore window) ############ range for days starts (also used for the place in the highscore window)
@@ -916,19 +915,19 @@ STR_GAME_OPTIONS_CURRENCY_UNITS_FRAME :{BLACK}Valuuta
STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Valuuta valimine STR_GAME_OPTIONS_CURRENCY_UNITS_DROPDOWN_TOOLTIP :{BLACK}Valuuta valimine
############ start of currency region ############ start of currency region
STR_GAME_OPTIONS_CURRENCY_GBP :Suurbritannia nael (GBP) STR_GAME_OPTIONS_CURRENCY_GBP :Naelad (£)
STR_GAME_OPTIONS_CURRENCY_USD :USA dollar (USD) STR_GAME_OPTIONS_CURRENCY_USD :Dollarid ($)
STR_GAME_OPTIONS_CURRENCY_EUR :Euro (EUR) STR_GAME_OPTIONS_CURRENCY_EUR :Euro ()
STR_GAME_OPTIONS_CURRENCY_YEN :Jaapani jeen (¥) STR_GAME_OPTIONS_CURRENCY_YEN :Jeen (¥)
STR_GAME_OPTIONS_CURRENCY_ATS :Austria ðilling (ATS) STR_GAME_OPTIONS_CURRENCY_ATS :Austria ðilling (ATS)
STR_GAME_OPTIONS_CURRENCY_BEF :Belgia frank (BEF) STR_GAME_OPTIONS_CURRENCY_BEF :Belgia frank (BEF)
STR_GAME_OPTIONS_CURRENCY_CHF :Sveitði frank (CHF) STR_GAME_OPTIONS_CURRENCY_CHF :Sveitði frank (CHF)
STR_GAME_OPTIONS_CURRENCY_CZK :Tðehhi kroon (CZK) STR_GAME_OPTIONS_CURRENCY_CZK :Tðehhi kroon (CZK)
STR_GAME_OPTIONS_CURRENCY_DEM :Saksamargad (DEM) STR_GAME_OPTIONS_CURRENCY_DEM :Saksamargad (DEM)
STR_GAME_OPTIONS_CURRENCY_DKK :Taani kroon (DKK) STR_GAME_OPTIONS_CURRENCY_DKK :Taani kroon (DKK)
STR_GAME_OPTIONS_CURRENCY_ESP :Hispaania peseeta (ESP) STR_GAME_OPTIONS_CURRENCY_ESP :Peseeta (ESP)
STR_GAME_OPTIONS_CURRENCY_FIM :Soome mark (FIM) STR_GAME_OPTIONS_CURRENCY_FIM :Soome mark (FIM)
STR_GAME_OPTIONS_CURRENCY_FRF :Prantsuse frank (FRF) STR_GAME_OPTIONS_CURRENCY_FRF :Frank (FRF)
STR_GAME_OPTIONS_CURRENCY_GRD :Kreeka drahm (GRD) STR_GAME_OPTIONS_CURRENCY_GRD :Kreeka drahm (GRD)
STR_GAME_OPTIONS_CURRENCY_HUF :Ungari Forint (HUF) STR_GAME_OPTIONS_CURRENCY_HUF :Ungari Forint (HUF)
STR_GAME_OPTIONS_CURRENCY_ISK :Islandi kroon (ISK) STR_GAME_OPTIONS_CURRENCY_ISK :Islandi kroon (ISK)
@@ -1114,7 +1113,6 @@ STR_SEA_LEVEL_HIGH :Kõrge
STR_SEA_LEVEL_CUSTOM :Kohandatud STR_SEA_LEVEL_CUSTOM :Kohandatud
STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Kohandatud ({NUM}%) STR_SEA_LEVEL_CUSTOM_PERCENTAGE :Kohandatud ({NUM}%)
STR_DISASTER_NONE :Puudub STR_DISASTER_NONE :Puudub
STR_DISASTER_REDUCED :Vähendatud STR_DISASTER_REDUCED :Vähendatud
STR_DISASTER_NORMAL :Harilik STR_DISASTER_NORMAL :Harilik
@@ -1465,7 +1463,6 @@ STR_INTRO_TOOLTIP_ONLINE_CONTENT :{BLACK}Otsi all
STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Näita tehismõistuse seadeid STR_INTRO_TOOLTIP_AI_SETTINGS :{BLACK}Näita tehismõistuse seadeid
STR_INTRO_TOOLTIP_QUIT :{BLACK}Välju 'OpenTTD'st STR_INTRO_TOOLTIP_QUIT :{BLACK}Välju 'OpenTTD'st
# Quit window # Quit window
STR_QUIT_CAPTION :{WHITE}Mängust väljumine STR_QUIT_CAPTION :{WHITE}Mängust väljumine
STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Kas soovite OpenTTD sulgeda ja minna tagasi süsteemi {STRING}? STR_QUIT_ARE_YOU_SURE_YOU_WANT_TO_EXIT_OPENTTD :{YELLOW}Kas soovite OpenTTD sulgeda ja minna tagasi süsteemi {STRING}?
@@ -1987,7 +1984,6 @@ STR_RAIL_TOOLBAR_TOOLTIP_BUILD_RAILROAD_TUNNEL :{BLACK}Ehita ro
STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Vaheta rongitee, signaalide, meldepunktide ja jaamade ehitamise ja lammutamise vahel. Ctrl-klahviga eemaldatakse meldepunktid ja jaamad. STR_RAIL_TOOLBAR_TOOLTIP_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Vaheta rongitee, signaalide, meldepunktide ja jaamade ehitamise ja lammutamise vahel. Ctrl-klahviga eemaldatakse meldepunktid ja jaamad.
STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL :{BLACK}Muuda/uuenda rööpaliiki. Shift valib ehitamise/hinna kuvamise režiimi STR_RAIL_TOOLBAR_TOOLTIP_CONVERT_RAIL :{BLACK}Muuda/uuenda rööpaliiki. Shift valib ehitamise/hinna kuvamise režiimi
# Rail depot construction window # Rail depot construction window
STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION :{WHITE}Depoo suund STR_BUILD_DEPOT_TRAIN_ORIENTATION_CAPTION :{WHITE}Depoo suund
STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP :{BLACK}Depoole suuna valimine STR_BUILD_DEPOT_TRAIN_ORIENTATION_TOOLTIP :{BLACK}Depoole suuna valimine
@@ -2462,6 +2458,7 @@ STR_NEWGRF_SETTINGS_MOVEUP_TOOLTIP :{BLACK}NewGRF-f
STR_NEWGRF_SETTINGS_MOVEDOWN :{BLACK}Liiguta alla STR_NEWGRF_SETTINGS_MOVEDOWN :{BLACK}Liiguta alla
STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP :{BLACK}NewGRF-faili liigutamine loendis alla STR_NEWGRF_SETTINGS_MOVEDOWN_TOOLTIP :{BLACK}NewGRF-faili liigutamine loendis alla
STR_NEWGRF_SETTINGS_FILE_TOOLTIP :{BLACK}Nimekiri installeerimata NewGRF failidest. Parameetrite muutmiseks klõpsa failil. STR_NEWGRF_SETTINGS_FILE_TOOLTIP :{BLACK}Nimekiri installeerimata NewGRF failidest. Parameetrite muutmiseks klõpsa failil.
STR_NEWGRF_SETTINGS_SET_PARAMETERS :{BLACK}Vali parameetrid STR_NEWGRF_SETTINGS_SET_PARAMETERS :{BLACK}Vali parameetrid
STR_NEWGRF_SETTINGS_TOGGLE_PALETTE :{BLACK}Vaheta paletti STR_NEWGRF_SETTINGS_TOGGLE_PALETTE :{BLACK}Vaheta paletti
STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP :{BLACK}Vaheta valitud NewGRF-i paletti.{}Tee seda, kui NewGRF-i graafika paistab mängus roosa. STR_NEWGRF_SETTINGS_TOGGLE_PALETTE_TOOLTIP :{BLACK}Vaheta valitud NewGRF-i paletti.{}Tee seda, kui NewGRF-i graafika paistab mängus roosa.
@@ -2494,8 +2491,6 @@ STR_NEWGRF_PARAMETERS_DEFAULT_NAME :Parameeter {NUM
STR_NEWGRF_PARAMETERS_SETTING :{STRING}: {ORANGE}{STRING} STR_NEWGRF_PARAMETERS_SETTING :{STRING}: {ORANGE}{STRING}
STR_NEWGRF_PARAMETERS_NUM_PARAM :{LTBLUE}Parameetrite arv: {ORANGE}{NUM} STR_NEWGRF_PARAMETERS_NUM_PARAM :{LTBLUE}Parameetrite arv: {ORANGE}{NUM}
# NewGRF readme window
# NewGRF inspect window # NewGRF inspect window
STR_NEWGRF_INSPECT_CAPTION :{WHITE}Inspekteeri- {STRING} STR_NEWGRF_INSPECT_CAPTION :{WHITE}Inspekteeri- {STRING}
STR_NEWGRF_INSPECT_PARENT_BUTTON :{BLACK}Vanem STR_NEWGRF_INSPECT_PARENT_BUTTON :{BLACK}Vanem
@@ -2584,8 +2579,6 @@ STR_NEWGRF_INVALID_CARGO_QUANTITY :{COMMA} <vale v
STR_NEWGRF_INVALID_ENGINE :<sobimatu mootorimudel> STR_NEWGRF_INVALID_ENGINE :<sobimatu mootorimudel>
STR_NEWGRF_INVALID_INDUSTRYTYPE :<vigane tööstus> STR_NEWGRF_INVALID_INDUSTRYTYPE :<vigane tööstus>
# NewGRF scanning window
# Sign list window # Sign list window
STR_SIGN_LIST_CAPTION :{WHITE}Siltide nimekiri - {COMMA} Silt{P "" i} STR_SIGN_LIST_CAPTION :{WHITE}Siltide nimekiri - {COMMA} Silt{P "" i}
STR_SIGN_LIST_MATCH_CASE :{BLACK}Tõstutundlik STR_SIGN_LIST_MATCH_CASE :{BLACK}Tõstutundlik
@@ -3253,12 +3246,10 @@ STR_ORDER_DROP_HALT_DEPOT :Peatu
STR_ORDER_SERVICE_TOOLTIP :{BLACK}Jäta see käsk vahele, kui hooldust ei vajata STR_ORDER_SERVICE_TOOLTIP :{BLACK}Jäta see käsk vahele, kui hooldust ei vajata
STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Sõiduki andmed, millel sihtpunkti vahetamine põhineb STR_ORDER_CONDITIONAL_VARIABLE_TOOLTIP :{BLACK}Sõiduki andmed, millel sihtpunkti vahetamine põhineb
# Conditional order variables, must follow order of OrderConditionVariable enum
STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Koorem prontsentides STR_ORDER_CONDITIONAL_LOAD_PERCENTAGE :Koorem prontsentides
STR_ORDER_CONDITIONAL_RELIABILITY :Tehnoseisund STR_ORDER_CONDITIONAL_RELIABILITY :Tehnoseisund
STR_ORDER_CONDITIONAL_MAX_SPEED :Tippkiirus STR_ORDER_CONDITIONAL_MAX_SPEED :Tippkiirus
STR_ORDER_CONDITIONAL_AGE :Vanus (aastates) STR_ORDER_CONDITIONAL_AGE :Sõiduki vanus (aastates)
STR_ORDER_CONDITIONAL_REQUIRES_SERVICE :Vajab hooldust STR_ORDER_CONDITIONAL_REQUIRES_SERVICE :Vajab hooldust
STR_ORDER_CONDITIONAL_UNCONDITIONALLY :Alati STR_ORDER_CONDITIONAL_UNCONDITIONALLY :Alati
@@ -3333,8 +3324,6 @@ STR_ORDER_NO_UNLOAD_FULL_LOAD :(Maha ei laadit
STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY :(Maha ei laadita ja oodatakse suvalist täislaadungit) STR_ORDER_NO_UNLOAD_FULL_LOAD_ANY :(Maha ei laadita ja oodatakse suvalist täislaadungit)
STR_ORDER_NO_UNLOAD_NO_LOAD :(Maha ei laadita ja peale ei laadita) STR_ORDER_NO_UNLOAD_NO_LOAD :(Maha ei laadita ja peale ei laadita)
STR_ORDER_STOP_LOCATION_NEAR_END :[lõpu lähedal] STR_ORDER_STOP_LOCATION_NEAR_END :[lõpu lähedal]
STR_ORDER_STOP_LOCATION_MIDDLE :[keskel] STR_ORDER_STOP_LOCATION_MIDDLE :[keskel]
STR_ORDER_STOP_LOCATION_FAR_END :[täiesti lõpus] STR_ORDER_STOP_LOCATION_FAR_END :[täiesti lõpus]
@@ -3508,8 +3497,6 @@ STR_ERROR_PNGMAP_MISC :{WHITE}... mida
STR_ERROR_BMPMAP :{WHITE}Ei suuda laadida maastikku BMP failist... STR_ERROR_BMPMAP :{WHITE}Ei suuda laadida maastikku BMP failist...
STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... ei suutnud muuta pildi tüüpi STR_ERROR_BMPMAP_IMAGE_TYPE :{WHITE}... ei suutnud muuta pildi tüüpi
STR_ERROR_HEIGHTMAP_TOO_LARGE :{WHITE}... pilt on liiga suur
STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Skaala hoiatus STR_WARNING_HEIGHTMAP_SCALE_CAPTION :{WHITE}Skaala hoiatus
STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}Kaardi suuruse liigne muutmine pole soovitatav. Jätka? STR_WARNING_HEIGHTMAP_SCALE_MESSAGE :{YELLOW}Kaardi suuruse liigne muutmine pole soovitatav. Jätka?

Some files were not shown because too many files have changed in this diff Show More