mirror of
https://github.com/OpenTTD/OpenTTD.git
synced 2026-09-15 04:49:36 +00:00
Compare commits
1
Commits
0.6.0
..
0.6.0-beta5
| Author | SHA1 | Date | |
|---|---|---|---|
 peter1138
|
8c6bca29ad |
Binary file not shown.
Binary file not shown.
+202
-238
@@ -1,249 +1,213 @@
|
||||
0.6.0 (2008-04-01)
|
||||
------------------------------------------------------------------------
|
||||
- Fix: Final formatting of some string codes from NewGRFs was not done correctly [FS#1889] (r12488)
|
||||
- Fix: Timetable times for aircraft were always doubled [FS#1883] (r12477)
|
||||
- Fix: Remove broken endian-dependent code and unnecessary rgb to bgr swapping [FS#1880] (r12453)
|
||||
- Fix: Do not 'disable' the drawing of autorail overlays when the tile is 'error'-marked (red pulsating selection) [FS#1871] (r12439)
|
||||
- Fix: Plural rule for Icelandic was wrong (r12417)
|
||||
|
||||
|
||||
0.6.0-RC1 (2008-03-26)
|
||||
------------------------------------------------------------------------
|
||||
- Feature: Show whether a town is a "city" in the town description title bar (r12391)
|
||||
- Feature: Increase house animation frame number from 32 to 128 (r12347)
|
||||
- Fix: Loading of TTD savegames (r12399, r12401)
|
||||
- Fix: Vehicle lists related to stations not closed when the station is deleted [FS#1872] (r12393)
|
||||
- Fix: Trams failing to turn on bridge heads/tunnel entrances [FS#1851] (r123890)
|
||||
- Fix: Train could break apart when reversed while partially in a depot [FS#1841] (r12386, r12384)
|
||||
- Fix: Non-breaking spaces should not be broken (r12385)
|
||||
- Fix: Check return of AfterLoadGame for success or failure when loading TTD games [FS#1860] (r12383)
|
||||
- Fix: Use 'items' unit for batteries, fizzy drinks, toys and bubbles in total cargo tab [FS#1864] (r12382)
|
||||
- Fix: The number of houses wasn't computed right [FS#1835, FS#1535] (r12381)
|
||||
- Fix: Update train acceleration and max speed after setting cached value to ensure the correct max speed is used with disabled real acceleration (r12380)
|
||||
- Fix: Refresh vehicle details window when cached values are updated (r12378)
|
||||
- Fix: Set cached value for vehicle property 25 before other cached values [FS#1854] (r12377)
|
||||
- Fix: Don't close a dropmenu when clicking on a dropdown widget (r12374)
|
||||
- Fix: win32 music driver fails if path is too long or if containing non-latin chars [FS#1849] (r12373, r12372)
|
||||
- Fix: Do not let window hide behind the main toolbar after resizing the screen [FS#1823] (r12371)
|
||||
- Fix: Close language drop down when parent window is clicked/closed [FS#1853] (r12370)
|
||||
- Fix: Reset train speed limits when _patches.realistic_acceleration changes (r12369)
|
||||
- Fix: Commands were sent to clients waiting for map download causing 'executing command from the past' error [FS#1650] (r12367)
|
||||
- Fix: Do not allow building 'zero' road bits (r12363)
|
||||
- Fix: Randomize variable 8F only once per callback 28 (r12362)
|
||||
- Fix: openttdd.grf was using the wrong colours for glyphs due to a grfcodec bug (fixed in grfcodec 0.9.10 r1837) (r12360)
|
||||
- Fix: Some callback-results were treated as 8 bit, when they were 15 bit, and vice versa (r12352, r12358)
|
||||
- Fix: Do not try to flood water tile [FS#1836] (r12350)
|
||||
- Fix: NTP skipped junction just after bridge end (r12348)
|
||||
- Fix: Remove duplicated and inconsistent code wrt. autoreplace with rules in both vehicles' group and ALL_GROUP [FS#1748, FS#1825] (r12346)
|
||||
- Fix: Don't try to restore backupped timetable when timetabling is disabled [FS#1828] (r12345)
|
||||
- Fix: Slow helicopters never got the 'chance' to finish the landing routine (r12343)
|
||||
- Fix: GRM buffer for cargos was incorrect size [FS#1827] (r12341)
|
||||
- Fix: Recalculate cached train data after clearing reversing flag when entering depot (r12339)
|
||||
|
||||
|
||||
0.6.0-beta5 (2008-03-04)
|
||||
------------------------------------------------------------------------
|
||||
- Feature: Vehicle variable FE bit 5, 6 and 8 [FS#1812] (r12331, r12330)
|
||||
- Feature: Support loading full range of 0xD0xx NewGRF strings which includes 0xD000 to 0xD3FF (r12316)
|
||||
- Feature: Ability to change aircraft speed factor, from so called 'realistic' (matching other vehicles) (1/1) to original TTD speed (1/4) (r12293, r12294)
|
||||
- Change: Update readme about where openttd looks for files (r12321)
|
||||
- Fix: Don't pause/unpause the game when showing load/save windows when the game is paused due to missing GRFs [FS#1733] (r12336)
|
||||
- Fix: Disallow building level crossings over one-way roads as this allowed competitors to remove the one-way state [FS#1819] (r12329)
|
||||
- Fix: Wrong Y pillar specified for girder with arch bridge (r12328)
|
||||
- Fix: Vehicles could be sorted in a wrong order when a vehicle name changed - cached name was not invalidated (r12324)
|
||||
- Fix: Vehicle sorting by name was broken, it was comparing the same string (when caching was not used) [FS#1821] (r12323)
|
||||
- Fix: Endian issue when saving/loading group owner (r12322)
|
||||
- Fix: Wrong transparency options could be saved after toggling all [FS#1817] (r12320)
|
||||
- Fix: Map string IDs that are embedded from other strings [FS#1815] (r12317)
|
||||
- Fix: Include prop 25 data for all train parts, not just those that carry cargo (r12314)
|
||||
- Fix: YAPF and NTP did not apply penalty for uphill tracks on steep slopes (r12313)
|
||||
- Fix: Restore timetable from backupped orders and add group ID to the backup [FS#1549] (r12296)
|
||||
- Fix: Do not draw trees nor lamps between tram tracks (r12290) [FS#1807]
|
||||
- Fix: [Win32] Do not create save dir on install (r12269)
|
||||
- Fix: Autoreplace did not update vehicle index for timetable window [FS#1805] (r12261)
|
||||
- Fix: GetProductionAroundTiles() may fail if only the second production slot exists (r12258)
|
||||
- Fix: Town variables 0x9E to 0xAD (company ratings) returned wrong values (r12247)
|
||||
- Fix: Typo resulting in no players are given the engine preview offer (r12244)
|
||||
- Fix: Mac OSX bundle display name should be 'OpenTTD' [FS#1798] (r12234)
|
||||
- Fix: [NewGRF] Support using any base price for rail and road vehicles' running cost, show running cost of wagons if available (r12209)
|
||||
- Fix: When loading a savegame fails, do not start creating a new game, just go straight back to the intro screen (r12202)
|
||||
- Fix: Force AI to build rail or road instead of bridges if possible, so it doesn't build bridges everywhere (r12200)
|
||||
- Fix: "Transparent buildings" now only toggles buildings, so show tick when buildings are transparent [FS#1789] (r12198)
|
||||
- Fix: Show correct last year profit when the train had negative income [FS#1788] (r12197)
|
||||
- Fix: There can be oil rigs at map borders, do not set water class for them [FS#1787] (r12195)
|
||||
- Fix: Do not start overtaking if the RV reaches wrong-way one-way-road in the next tiles (r12191)
|
||||
- Fix: Assert when trying to play tile sound at NW border of map (placing buyos, leveling land) [FS#1784] (r12186)
|
||||
- Fix: Take into account possible loan when AI is deciding which bridge to build, so it won't build wooden bridges everytime (r12184)
|
||||
|
||||
-Feature: Vehicle variable FE bit 8 (r12331) [FS#1812]
|
||||
-Feature: Vehicle variable FE bit 5 and 6 (r12330)
|
||||
-Feature: Support loading full range of 0xD0xx NewGRF strings which includes 0xD000 to 0xD3FF (r12316)
|
||||
-Feature: Ability to change aircraft speed factor, from so called 'realistic' (matching other vehicles) (1/1) to original TTD speed (1/4) (r12293, r12294)
|
||||
-Fix: Don't pause/unpause the game when showing load/save windows when the game is paused due to missing GRFs (r12336) [FS#1733]
|
||||
-Fix: Disallow building level crossings over one-way roads as this allowed competitors to remove the one-way state (r12329) [FS#1819]
|
||||
-Fix: Wrong Y pillar specified for girder with arch bridge (r12328)
|
||||
-Fix: Vehicles could be sorted in a wrong order when a vehicle name changed - cached name was not invalidated (r12324)
|
||||
-Fix: Vehicle sorting by name was broken, it was comparing two the same strings (when caching was not used) (r12323) [FS#1821]
|
||||
-Fix: Endian issue when saving/loading group owner (r12322)
|
||||
-Change: Update readme about where openttd looks for files (r12321)
|
||||
-Fix: Wrong transparency options could be saved after toggling all (r12320) [FS#1817]
|
||||
-Fix: Map string IDs that are embedded from other strings (r12317) [FS#1815]
|
||||
-Fix: Include prop 25 data for all train parts, not just those that carry cargo (r12314)
|
||||
-Fix: YAPF and NTP did not apply penalty for uphill tracks on steep slopes (r12313)
|
||||
-Fix: Restore timetable from backupped orders and add group ID to the backup (r12296) [FS#1549]
|
||||
-Fix: Do not draw trees nor lamps between tram tracks (r12290) [FS#1807]
|
||||
-Fix: [Win32] Don't create save dir on install (r12269)
|
||||
-Fix: Autoreplace did not update vehicle index for timetable window (r12261) [FS#1805]
|
||||
-Fix: GetProductionAroundTiles() may fail if only the second production slot exists (r12258)
|
||||
-Fix: Removing the Broken FollowTrack_t (pathfinding) fixed related functions (r12252) [FS#1801]
|
||||
-Fix: Town variables 0x9E to 0xAD (company ratings) returned wrong values (r12247)
|
||||
-Fix: Proper usage of Clamp() (r12246)
|
||||
-Fix: Typo resulting in no players are given the engine preview offer (r12244)
|
||||
-Fix: Mac OSX bundle display name should be 'OpenTTD' (r12234) [FS#1798]
|
||||
-Fix: [NewGRF] Support using any base price for rail and road vehicles' running cost, show running cost of wagons if available (r12209)
|
||||
-Fix: When loading a savegame fails, don't start creating a new game, just go straight back to the intro screen (r12202)
|
||||
-Fix: Force AI to build rail or road instead of bridges if possible, so it doesn't build bridges everywhere (r12200)
|
||||
-Fix: "Transparent buildings" now only toggles buildings, so show tick when buildings are transparent [FS#1789] (r12198)
|
||||
-Fix: Show correct last year profit when the train had negative income [FS#1788] (r12197)
|
||||
-Fix: There can be oil rigs at map borders, do not set water class for them [FS#1787] (r12195)
|
||||
-Fix: Clamp various town variables to 16bit prior to returning the value (r12192)
|
||||
-Fix: Do not start overtaking if the RV reaches wrong-way one-way-road in the next tiles (r12191)
|
||||
-Fix: YAPF always shows 0ms PF time in debug for debug level 2 [FS#1786] (r12190)
|
||||
-Fix: Assert when trying to play tile sound at NW border of map (placing buyos, leveling land) [FS#1784] (r12186)
|
||||
-Fix: Wrong operator priority, hopefully harmless (r12185)
|
||||
-Fix: Take into account possible loan when AI is deciding which bridge to build, so it won't build wooden bridges everytime (r12184)
|
||||
|
||||
0.6.0-beta4 (2008-02-18)
|
||||
------------------------------------------------------------------------
|
||||
- Feature: Allow buttons to resize in NewGRF settings window (r12172)
|
||||
- Feature: Change colour of autorail and autoroad selection when Ctrl is pressed (r12167)
|
||||
- Feature: Separate catenary transparency settings from building transparency settings (r12103)
|
||||
- Feature: Allow locking individual transparency settings so they will not be changed by pressing 'x' (r12102)
|
||||
- Feature: Add some missing VarAction2 variables (r12124)
|
||||
- Feature: Make snow appear on rail tiles dependant on track height, not on height of the lowest part of the tile (r12098)
|
||||
- Feature: [NewGRF] Specify the purchase, rail and road description of a bridge (r12069)
|
||||
- Feature: [NewGRF] Add support for var 12, Variational Action 2 (r12045)
|
||||
- Feature: Allow trees on shore (r12029)
|
||||
- Feature: Invisible trees are now separate from the building concept (r12022)
|
||||
- Feature: Add support for passenger engine designation for AI-use, NewGRF property 0x08 for trains (r12019)
|
||||
- Feature: Show all cargo sources (en-route from) in the station view cargo waiting list instead of just one (r11990)
|
||||
- Feature: [NewGRF] Resizable industry view window on callback 3A (r11987)
|
||||
- Feature: [NewGRF] Implement var 8F (random bits) during callback 28 [FS#1697] (r11985)
|
||||
- Feature: [NewGRF] Add support for Action 0D, var 13: informations about current map size (r11961)
|
||||
- Feature: Support Action5 type 0D (newwater) (r11947)
|
||||
- Feature: Allow building bridge heads on more slopes (r11937)
|
||||
- Feature: [NewGRF] Add support for Rivers. Rivers can currently only be placed with-in the scenario editor (r11926,r11938,r11949,r12071)
|
||||
- Feature: Generate.vbs script to allow project files generation for users unable to run generate bash script (r12123)
|
||||
- Feature: Sort the strings in languages dropdown (r11886)
|
||||
- Codechange: Drop MSVC 2003 support (r11979)
|
||||
- Fix: Test purchase list loading/loaded sprites instead of unconditionally returning a possibly non-existant sprite (r12180)
|
||||
- Fix: Return correct bridge price for AI when DC_QUERY_COST is set [FS#609] (r12171)
|
||||
- Fix: When drag&drop mode was cancelled by keyboard input, depot/group window wasn't updated [FS#337] (r12166)
|
||||
- Fix: Buffer overflow when drawing scrolling news [FS#1652, FS#1773] (r12165)
|
||||
- Fix: If a train is 'stopping' when entering a depot, do not let it leave again [FS#1705] (r12163)
|
||||
- Fix: Towns shouldn't build over houses owned by another town [FS#1757] (r12162)
|
||||
- Fix: Towns will no longer build houses > 1x1 there where should be road (with 2x2, 3x3 grid town layouts) (r12161)
|
||||
- Fix: Remove the arbitrary limit of 64 waypoints per town [FS#1744] (r12160)
|
||||
- Fix: Chance16I was now biased towards zero - round to nearest now (r12156)
|
||||
- Fix: Adjust aircraft slowing algorithm (r12144)
|
||||
- Fix: Callback 0x3D always gets a cargobit in var 0x18, independent of grf version [FS#1766] (r12142)
|
||||
- Fix: Do not allow adding tram to rail-road crossing when there is a vehicle on it (r12138)
|
||||
- Fix: Show cargo capacity for articulated vehicles correctly in the purchase list. Multiple cargo types can also now been shown [FS#1769] (r12137)
|
||||
- Fix: With mammoth trains disabled, maximum train length was limited to 9 (r12131)
|
||||
- Fix: Use tile index 0 for planes in the air, so it cannot have an invalid tile index [FS#1745] (r12109)
|
||||
- Fix: X/Y axis swap for station tiles in GetNearbyTile() was wrong way around [FS#1753]( r12108)
|
||||
- Fix: Loading older savegames fixes (r12096,r12097)
|
||||
- Fix: When a company bankrupts, remove drive-through road stops, ship depots and buoys too. Update owners of water and road [FS#1703] (r12095)
|
||||
- Fix: Do not set station owner for buoys when merging company (r12093)
|
||||
- Fix: Keep production level within delimited boundaries, while using var result 0D/0E and than multiplying/dividing it [FS#1755] (r12092)
|
||||
- Fix: Assert when loading savegame with wrong tiletype at south map borders (r12088)
|
||||
- Fix: Check overrides only for industries when mapping newgrf entities to 'real' entities [FS#1747] (r12086)
|
||||
- Fix: Update waypoint signs when changing language (r12080)
|
||||
- Fix: Use search paths when opening console scripts (r12079)
|
||||
- Fix: When reusing a renamed deleted waypoint, keep the new name (r12076)
|
||||
- Fix: Make docks at sea flood neighboured tiles (r12072)
|
||||
- Fix: Possible deadlock when there are no houses available to build at given tile (r12062)
|
||||
- Fix: Houses with zero probability could be built (r12062)
|
||||
- Fix: Do not clear tiles when the town won't be able to build any buildings anyway (r12060)
|
||||
- Fix: Allow building 2x2 building on slopes if not explicitly forbidden (r12060)
|
||||
- Fix: It was possible to build 2x1 and 1x2 buildings on slopes even if it was not allowed (r12060)
|
||||
- Fix: Teach NPF where road vehicles and trams can reverse (r12058)
|
||||
- Fix: Ships can drive through opponents' ship depots (r12058)
|
||||
- Fix: Slowdown train when approaching 90deg turn when 90deg turns are forbidden (r12057)
|
||||
- Fix: Enable YAPF to start searching inside a wormhole [FS#1704] (r12056)
|
||||
- Fix: Another way to fix AI trying to build road through depots (r12055)
|
||||
- Fix: The cargo translation table was loaded at the right time, but all the other global variables were now loaded too early [FS#1737] (r12052)
|
||||
- Fix: Random_func broke for desync debug (r12050)
|
||||
- Fix: Memset on multibyte array with wrong byte count (r12049)
|
||||
- Fix: Crash when centering on a vehicle (aircraft) that is outside of the map [FS#1741] (r12044)
|
||||
- Fix: Allow building transmitters and lighthouses on tree tiles [FS#1736] (r12043)
|
||||
- Fix: Reimplement how rivers and canals are stored in the map, allowing the sea/river/canal status to also be stored for buoys, docks, locks and depots. All these are now allowed on rivers and removal of them will revert to the original water type [FS#1676] (r12042)
|
||||
- Fix: Change ownership of or remove statues when merging/bankrupting companies (r12038)
|
||||
- Fix: For station tiles, only get road types for road stops (r12036)
|
||||
- Fix: Teach YAPF where trams can reverse, and where not [FS#1702] (r12035)
|
||||
- Fix: Do not show train speed as zero after loading paused game (r12033)
|
||||
- Fix: When removing a statue, remove town statue flag for the statue owner, not current player (r12032)
|
||||
- Fix: Prevent towns from removing or claiming ownership of player owned tiles when growing [FS#1689,FS#1719] (r12031)
|
||||
- Fix: In one case trees could spread under bridges (r12024)
|
||||
- Fix: Put a better suited text in the quit-dialog [FS#1690] (r12023)
|
||||
- Fix: Restore initial intent on the invisible tree while transparent building patch setting [FS#1721] (r12018)
|
||||
- Fix: When you have more than 9 network interfaces you'll enter the wonderfull world of overflows (r12017)
|
||||
- Fix: Better work on strings in regard to gender [FS#1716] (r12015)
|
||||
- Fix: Lighthouses and transmitters were never supposed to be build on a slope (r12014)
|
||||
- Fix: When modifying watered tiles, mark neighboured canals and rivers dirty in more cases (r12013)
|
||||
- Fix: Enable TownRatingTestMode during cost estimation with 'shift'-key (r12012)
|
||||
- Fix: Do not consider one-corner-raised-shores to be watered tiles from all sides [FS#1701] (r12011)
|
||||
- Fix: Avoid loading sample.cat if it 'looks' incorrect, and avoid later null pointer dereferences by moving volume lookup deeper [FS#1707] (r12009)
|
||||
- Fix: Possible reading from an invalid pointer [FS#1717] (r12005)
|
||||
- Fix: When skipping Action 11 or 12, also skip belonging sprites (r12001)
|
||||
- Fix: Do entrance-slope-check for every tile of railstations (r11999)
|
||||
- Fix: Possible remote assert by setting bit 6 of p1 for CMD_REMOVE_ROAD [FS#1692] (r11998)
|
||||
- Fix: Update train statusbar when stopping from zero speed [FS#1706] (r11996)
|
||||
- Fix: Resize station/roadstop/dock/airport construction windows if cargo acceptance list is too long (r11993)
|
||||
- Fix: When building two rail stations close to each other (with control) so they looked like one long track trains would see them as one (r11992)
|
||||
- Fix: Resize autoreplace window to fit purchase information text if it is too large (r11989)
|
||||
- Fix: Build system ignored changes to table/control_codes.h which require strgen to be rebuilt (r11986)
|
||||
- Fix: Also draw corner shores under rail tracks (r11984)
|
||||
- Fix: Use unicode glyph mapping to fix up missing/shuffled sprites in original data files instead of shuffling or skipping sprites directly [FS#1698] (r11981)
|
||||
- Fix: Industries using results 0D/0E on callback cb29/35 were a bit too eager to close down (r11976)
|
||||
- Fix: Shore and sea tiles under bridges were converted to canals in old savegames [FS#1684] (r11974)
|
||||
- Fix: Use grass tiles for corner shores, if shores got replaced by ActionA [FS#1683] (r11973)
|
||||
- Fix: Old AI shouldn't build fast planes with a small airport in orders(r11972)
|
||||
- Fix: MP_ROAD can have railbits too - OPF searching over rail of diffen t owner behind crossing (r11967)
|
||||
- Fix: OPF was searching through depots and normal road stops [FS#1403, FS#1506] (r11966)
|
||||
- Fix: Tropic zone data was returned incorrectly [FS#1685] (r11964)
|
||||
- Fix: NewAI couldn't build any road vehicles when there were any tram grfs loaded (r11958)
|
||||
- Fix: Disallow building locks and docks on rapids [FS#1675] (r11956)
|
||||
- Fix: Do not allow modifying roadbits when other roadtypes would need different foundation (r11953)
|
||||
- Fix: Loading of very old savegames was broken (r11951)
|
||||
- Fix: Slope detection of bridge ramps. Helps YAPF and Trolly (r11946)
|
||||
- Fix: FileExists() failed for non latin paths (win32) (r11945)
|
||||
- Fix: Allow building drive-through road/tram stops at road/tram track that has no owner (r11944)
|
||||
- Fix: 'BRIDGE_TOO_LOW_FOR_TERRAIN'-check was wrong for steep slopes (r11936)
|
||||
- Fix: [Autoreplace] Single to dualhead locomotive replacefailed when player had enough money to replace and refit one but not enough to refit the last one as well [FS#1624] (r11929)
|
||||
- Fix: [Autoreplace] Autoreplace could refit train engines to the wrong cargo type if the old engine had no cargo capacity and the new one had (r11928)
|
||||
- Fix: Loading old, pre savegame version 2, savegames (r11925)
|
||||
- Fix: AI was reading wrong tile slope while building road bridge (r11917)
|
||||
- Fix: set correctly crossing state after train reversal, train leaving crossing, train crash (r11900)
|
||||
- Fix: Segmentation faults/wrong frees due uninitialized memory in the AI [FS#1658] (r11887)
|
||||
- Fix: Assert when trying to remove rail from a house or industry tile [FS#1663,FS#1665-6-7-8,FS#1680,FS#1686-7-8 FS#1715 FS#1742 FS#1771 FS#1776](r11883)
|
||||
- Fix: Crash in MP in vehicle group window if the currently selected group is deleted by another player (r11878)
|
||||
- Fix: Another way to crash competitors' train in a station (r11877)
|
||||
- Fix: Automatically sending aircraft to depot for autoreplace/renew is now triggered by the correct conditions (r11875)
|
||||
- Fix: EngineHasReplacementForPlayer() didn't look in ALL_GROUP (r11872)
|
||||
- Fix: Do not update signals after each tile when building/removing a large block of track/signals/station [FS#1074] (r11871)
|
||||
- Fix: Slow down train when approaching tile we can't enter in more cases (r11870)
|
||||
- Fix: Do not make crossing red when we can't enter it in any case (r11870)
|
||||
|
||||
-Feature: Allow buttons to resize in NewGRF settings window (r12172)
|
||||
-Feature: Change colour of autorail and autoroad selection when Ctrl is pressed (r12167)
|
||||
-Feature: Separate catenary transparency settings from building transparency settings (r12103)
|
||||
-Feature: Allow locking individual transparency settings so they will not be changed by pressing 'x' (r12102)
|
||||
-Feature: Add some missing VarAction2 variables (r12124)
|
||||
-Feature: Make snow appear on rail tiles dependant on track height, not on height of the lowest part of the tile (r12098)
|
||||
-Feature[newGRF]: Specify the purchase, rail and road description of a bridge (r12069)
|
||||
-Feature[newGRF]: Add support for var 12, Variational Action 2 (r12045)
|
||||
-Feature: Allow trees on shore (r12029)
|
||||
-Feature: Invisible trees are now separate from the building concept (r12022)
|
||||
-Feature: Add support for passenger engine designation for AI-use, NewGRF property 0x08 for trains (r12019)
|
||||
-Feature: Show all cargo sources (en-route from) in the station view cargo waiting list instead of just one (r11990)
|
||||
-Feature[newGRF]: Resizable industry view window on callback 3A (r11987)
|
||||
-Feature[newGRF]: Implement var 8F(random bits) during callback 28 [FS#1697] (r11985)
|
||||
-Feature[newGRF]: Add support for Action 0D, var 13: informations about current map size (r11961)
|
||||
-Feature: Make use of new sprites added by Action5 type 0D (r11947)
|
||||
-Feature: Allow building bridge heads on more slopes (r11937)
|
||||
-Feature[newGRF]: Add support for Rivers. Rivers can currently only be placed with-in the scenario editor (r11926,r11938,r11949,r12071)
|
||||
-Feature: Generate.vbs script to allow project files generation for users unable to run generate bash script (r12123)
|
||||
-Feature: Sort the strings in languages dropdown (r11886)
|
||||
-Codechange: Drop MSVC 2003 support (r11979)
|
||||
-Fix: Test purchase list loading/loaded sprites instead of unconditionally returning a possibly non-existant sprite (r12180)
|
||||
-Fix: Return correct bridge price for AI when DC_QUERY_COST is set [FS#609] (r12171)
|
||||
-Fix: When drag&drop mode was cancelled by keyboard input, depot/group window wasn't updated [FS#337] (r12166)
|
||||
-Fix: Buffer overflow when drawing scrolling news [FS#1652, FS#1773] (r12165)
|
||||
-Fix: If a train is 'stopping' when entering a depot, do not let it leave again [FS#1705] (r12163)
|
||||
-Fix: Towns shouldn't build over houses owned by another town [FS#1757] (r12162)
|
||||
-Fix: Towns will no longer build houses > 1x1 there where should be road (with 2x2, 3x3 grid town layouts) (r12161)
|
||||
-Fix: Remove the arbitrary limit of 64 waypoints per town [FS#1744] (r12160)
|
||||
-Fix: Chance16I was now biased towards zero - round to nearest now (r12156)
|
||||
-Fix: Adjust aircraft slowing algorithm (r12144)
|
||||
-Fix: Callback 0x3D always gets a cargobit in var 0x18, independent of grf version [FS#1766] (r12142)
|
||||
-Fix: Do not allow adding tram to rail-road crossing when there is a vehicle on it (r12138)
|
||||
-Fix: Show cargo capacity for articulated vehicles correctly in the purchase list. Multiple cargo types can also now been shown [FS#1769] (r12137)
|
||||
-Fix: With mammoth trains disabled, maximum train length was limited to 9 (r12131)
|
||||
-Fix: Use tile index 0 for planes in the air, so it cannot have an invalid tile index [FS#1745] (r12109)
|
||||
-Fix: X/Y axis swap for station tiles in GetNearbyTile() was wrong way around [FS#1753]( r12108)
|
||||
-Fix: Loading older savegames fixes (r12096,r12097)
|
||||
-Fix: When a company bankrupts, remove drive-through road stops, ship depots and buoys too. Update owners of water and road [FS#1703] (r12095)
|
||||
-Fix: Do not set station owner for buoys when merging company (r12093)
|
||||
-Fix: Keep production level within delimited boundaries, while using var result 0D/0E and than multiplying/dividing it [FS#1755] (r12092)
|
||||
-Fix: Assert when loading savegame with wrong tiletype at south map borders (r12088)
|
||||
-Fix: Check overrides only for industries when mapping newgrf entities to 'real' entities [FS#1747] (r12086)
|
||||
-Fix: Update waypoint signs when changing language (r12080)
|
||||
-Fix: Use search paths when opening console scripts (r12079)
|
||||
-Fix: When reusing a renamed deleted waypoint, keep the new name (r12076)
|
||||
-Fix: Make docks at sea flood neighboured tiles (r12072)
|
||||
-Fix: Possible deadlock when there are no houses available to build at given tile (r12062)
|
||||
-Fix: Houses with zero probability could be built (r12062)
|
||||
-Fix: Do not clear tiles when the town won't be able to build any buildings anyway (r12060)
|
||||
-Fix: Allow building 2x2 building on slopes if not explicitly forbidden (r12060)
|
||||
-Fix: It was possible to build 2x1 and 1x2 buildings on slopes even if it was not allowed (r12060)
|
||||
-Fix: Teach NPF where road vehicles and trams can reverse (r12058)
|
||||
-Fix: Ships can drive through opponents' ship depots (r12058)
|
||||
-Fix: Slowdown train when approaching 90deg turn when 90deg turns are forbidden (r12057)
|
||||
-Fix: Enable YAPF to start searching inside a wormhole [FS#1704] (r12056)
|
||||
-Fix: Another way to fix AI trying to build road through depots (r12055)
|
||||
-Fix: The cargo translation table was loaded at the right time, but all the other global variables were now loaded too early [FS#1737] (r12052)
|
||||
-Fix: Random_func broke for desync debug (r12050)
|
||||
-Fix: Memset on multibyte array with wrong byte count (r12049)
|
||||
-Fix: Crash when centering on a vehicle (aircraft) that is outside of the map [FS#1741] (r12044)
|
||||
-Fix: Allow building transmitters and lighthouses on tree tiles [FS#1736] (r12043)
|
||||
-Fix: Reimplement how rivers and canals are stored in the map, allowing the sea/river/canal status to also be
|
||||
stored for buoys, docks, locks and depots. All these are now allowed on rivers and removal of them will revert to the
|
||||
original water type [FS#1676] (r12042)
|
||||
-Fix: Change ownership of or remove statues when merging/bankrupting companies (r12038)
|
||||
-Fix: For station tiles, only get road types for road stops (r12036)
|
||||
-Fix: Teach YAPF where trams can reverse, and where not [FS#1702] (r12035)
|
||||
-Fix: Do not show train speed as zero after loading paused game (r12033)
|
||||
-Fix: When removing a statue, remove town statue flag for the statue owner, not current player (r12032)
|
||||
-Fix: Prevent towns from removing or claiming ownership of player owned tiles when growing [FS#1689,FS#1719] (r12031)
|
||||
-Fix: In one case trees could spread under bridges (r12024)
|
||||
-Fix: Put a better suited text in the quit-dialog [FS#1690] (r12023)
|
||||
-Fix: Restore initial intent on the invisible tree while transparent building patch setting [FS#1721] (r12018)
|
||||
-Fix: When you have more than 9 network interfaces you'll enter the wonderfull world of overflows (r12017)
|
||||
-Fix: Better work on strings in regard to gender [FS#1716] (r12015)
|
||||
-Fix: Lighthouses and transmitters were never supposed to be build on a slope (r12014)
|
||||
-Fix: When modifying watered tiles, mark neighboured canals and rivers dirty in more cases (r12013)
|
||||
-Fix: Enable TownRatingTestMode during cost estimation with 'shift'-key (r12012)
|
||||
-Fix: Do not consider one-corner-raised-shores to be watered tiles from all sides [FS#1701] (r12011)
|
||||
-Fix: Avoid loading sample.cat if it 'looks' incorrect, and avoid later null pointer dereferences by moving volume lookup deeper [FS#1707] (r12009)
|
||||
-Fix: Possible reading from an invalid pointer [FS#1717] (r12005)
|
||||
-Fix: When skipping Action 11 or 12, also skip belonging sprites (r12001)
|
||||
-Fix: Do entrance-slope-check for every tile of railstations (r11999)
|
||||
-Fix: Possible remote assert by setting bit 6 of p1 for CMD_REMOVE_ROAD [FS#1692] (r11998)
|
||||
-Fix: Update train statusbar when stopping from zero speed [FS#1706] (r11996)
|
||||
-Fix: Resize station/roadstop/dock/airport construction windows if cargo acceptance list is too long (r11993)
|
||||
-Fix: When building two rail stations close to each other (with control) so they looked like one long track trains would see them as one (r11992)
|
||||
-Fix: Resize autoreplace window to fit purchase information text if it is too large (r11989)
|
||||
-Fix: Build system ignored changes to table/control_codes.h which require strgen to be rebuilt (r11986)
|
||||
-Fix: Also draw corner shores under rail tracks (r11984)
|
||||
-Revert(r8738): Now we have shores in corners. No need to remove them from TTDP games (r11982)
|
||||
-Fix: Use unicode glyph mapping to fix up missing/shuffled sprites in original data files instead of shuffling or skipping sprites directly [FS#1698] (r11981)
|
||||
-Fix: Industries using results 0D/0E on callback cb29/35 were a bit too eager to close down (r11976)
|
||||
-Fix: Shore and sea tiles under bridges were converted to canals in old savegames [FS#1684] (r11974)
|
||||
-Fix: Use grass tiles for corner shores, if shores got replaced by ActionA [FS#1683] (r11973)
|
||||
-Fix: Old AI shouldn't build fast planes with a small airport in orders(r11972)
|
||||
-Fix: MP_ROAD can have railbits too - OPF searching over rail of diffen t owner behind crossing (r11967)
|
||||
-Fix: OPF was searching through depots and normal road stops [FS#1403, FS#1506] (r11966)
|
||||
-Fix: Tropic zone data was returned incorrectly [FS#1685] (r11964)
|
||||
-Fix: NewAI couldn't build any road vehicles when there were any tram grfs loaded (r11958)
|
||||
-Fix: Disallow building locks and docks on rapids [FS#1675] (r11956)
|
||||
-Fix: Do not allow modifying roadbits when other roadtypes would need different foundation (r11953)
|
||||
-Fix: Loading of very old savegames was broken (r11951)
|
||||
-Fix: Slope detection of bridge ramps.Helps YAPF and Trolly (r11946)
|
||||
-Fix: FileExists() failed for non latin paths (win32) (r11945)
|
||||
-Fix: Allow building drive-through road/tram stops at road/tram track that has no owner (r11944)
|
||||
-Fix: 'BRIDGE_TOO_LOW_FOR_TERRAIN'-check was wrong for steep slopes (r11936)
|
||||
-Fix[autoreplace]: Single to dualhead locomotive replacefailed when player had enough money to replace and refit one but not enough to refit the last one as well [FS#1624] (r11929)
|
||||
-Fix[autoreplace]: Autoreplace could refit train engines to the wrong cargo type if the old engine had no cargo capacity and the new one had (r11928)
|
||||
-Fix: Loading old, pre savegame version 2, savegames (r11925)
|
||||
-Fix: AI was reading wrong tile slope while building road bridge (r11917)
|
||||
-Fix: set correctly crossing state after train reversal, train leaving crossing, train crash (r11900)
|
||||
-Fix: Segmentation faults/wrong frees due uninitialized memory in the AI [FS#1658] (r11887)
|
||||
-Fix: Assert when trying to remove rail from a house or industry tile [FS#1663,FS#1665-6-7-8,FS#1680,FS#1686-7-8 FS#1715 FS#1742 FS#1771 FS#1776](r11883)
|
||||
-Fix: Crash in MP in vehicle group window if the currently selected group is deleted by another player (r11878)
|
||||
-Fix: Another way to crash competitors' train in a station (r11877)
|
||||
-Fix: Automatically sending aircraft to depot for autoreplace/renew is now triggered by the correct conditions (r11875)
|
||||
-Fix: EngineHasReplacementForPlayer() didn't look in ALL_GROUP (r11872)
|
||||
-Fix: Do not update signals after each tile when building/removing a large block of track/signals/station [FS#1074] (r11871)
|
||||
-Fix: Slow down train when approaching tile we can't enter in more cases (r11870)
|
||||
-Fix: Do not make crossing red when we can't enter it in any case (r11870)
|
||||
|
||||
0.6.0-beta3 (2008-01-16)
|
||||
------------------------------------------------------------------------
|
||||
- Feature: Replaced fixed size custom name array. Names are now attached to their object directly and there is no limit to the amount of names (r11822)
|
||||
- Feature: Add drag-n-drop support to the raise/lower land tools. Land is raised/lowered at the start and the rest of the area levelled to match (r11759)
|
||||
- Feature: Add support for NewGRF's train 'tilt' flag. Trains with tilt capability (specific details are per NewGRF set) will be given a 20% speed limit bonus on curves (r11741)
|
||||
- Feature: Added sorting for cost, running costs and speed to road vehicles and ships build windows (r11710)
|
||||
- Feature: List neutral stations where the player has service in the station list too (r11670)
|
||||
- Feature: Check whether (some) characters are missing in the current 'font' for the 'currently' chosen language and give a warning when that does happen (r11646)
|
||||
- Feature: Support shore replacement via Action 5 (r11726)
|
||||
- Fix: When two NewGRFs 'fight' to define the same cargo it could happen that the strings are defined by one cargo and the 'action2' by another and when one assumes that both come from the same NewGRF [FS#1559] (r11862)
|
||||
- Fix: Recompute town population when removing a 'newhouses' grf, or when loading a game with missing 'newhouses' grfs [FS#1335] (r11855)
|
||||
- Fix: Road vehicle count was incorrect in network lobby window (r11844)
|
||||
- Fix: Mark dirty canal tile even in diagonal direction from flooded tile, draw correctly canal next to half flooded rail tile (r11843, r11838)
|
||||
- Fix: At least one instance of dmusic driver is needed for it to be registered and usable (r11826)
|
||||
- Fix: An articulated road vehicle could split up when it turned around at a corner and then would enter a drive through station at the next tile [FS#1627] (r11825)
|
||||
- Fix: Switch _screen to the output buffer and disable usage of 32bpp-anim animation buffer during giant screenshots [FS#1602] (r11813)
|
||||
- Fix: Do not crash trains when leaving depot to a very long track [FS#716] (r11802)
|
||||
- Fix: Take town rating into account when testing if a command can be executed [FS#1616] (r11795)
|
||||
- Fix: Reversing a train when loading at a station with an adjacent station in the same axis crashed [FS#1632] (r11794)
|
||||
- Fix: Group names got not deallocated in the command test run [FS#1614] (r11743)
|
||||
- Fix: Run window tick events when paused, so that news pop-ups and the about window still progress. For other windows the events are ignored when paused [FS#1319] (r11742)
|
||||
- Fix: Modify and possibly discard key events for code points in the unicode private use area [FS#1610] (r11740)
|
||||
- Fix: Set the new scroll position after zooming in instead of before, as the zoom will cancel it out [FS#1609] (r11739)
|
||||
- Fix: Do not reset loading indicator IDs when only reloading NewGRFs [FS#1574] (r11735)
|
||||
- Fix: Elrail merge gave elrail, monorail & maglev unintended speed bonuses for curves, as the bonus was based on the railtype index. The bonus is now specified by a property of the railtype (r11732)
|
||||
- Fix: Clear sprite override data before performing NewGRF wagon attach callback. This stopped the callback working for autoreplace and when moving wagons from train to train in a depot [FS#1582] ( r11731)
|
||||
- Fix: If there are no houses that can be build in a specific year yet, force the houses with the earliest introduction year to be available [FS#1577] (r11727)
|
||||
- Fix: Make it impossible (for users) to circumvent the length checking of the NewGRF 'allow wagon attach' callback by moving several wagons at a time (r11724)
|
||||
- Fix: Do not put more than one Random() in function calls because parameter evaluation order is not guaranteed in the C++ standard [FS#1561] (r11716)
|
||||
- Fix: Do not allow player inauguration date on scenarios to be bigger than current year [FS#1569] (r11714)
|
||||
- Fix: Add more house string id ranges to MapGRFStringID so NewGRFs use the proper string ids (r11712)
|
||||
- Fix: Do not allow refitting flooded (destroyed) vehicles (r11707)
|
||||
- Fix: Trains could have sprites with wrong direction when reversing, also was inconsistent with save/load process [FS#1557] (r11705)
|
||||
- Fix: When removing buoys, return to water or canal depending on their owner (r11666)
|
||||
- Fix: Animation informations should not be copied from original industry tile spec, while doing an action 00, industry tile, prop 08 (r11665)
|
||||
- Fix: Do not allow modifying non-uniform stations when non-uniform stations are disabled [FS#1563] (r11659)
|
||||
- Fix: 'Initialised' NewGRFs could still be deactivated in the later 'activation' pass (r11650)
|
||||
- Fix: Vehicles were still followed when sold [FS#1541] (r11632)
|
||||
- Fix: Many viewports could crash the scenario editor [FS#1527] (r11629)
|
||||
- Fix: Popping from text reference stack must be done in a precise order. But some compiler (MSVC) over optimised it and inverted this order [FS#1532] (r11627)
|
||||
- Fix: There were still some cases where one could not build a tram track, but the tram could become blocked [FS#1525] (r11621)
|
||||
- Fix: Do not make crossing red behind depot the train is entering [FS#1531] (r11619)
|
||||
- Fix: Buoys are just waypoints, so don't allow load/unload/transfert for them (r11618)
|
||||
- Fix: Sometimes large values could go off the chart [FS#1526] (r11616)
|
||||
- Fix: Temperate banks can only be built in towns (over a house) (r11615)
|
||||
-Feature: Replaced fixed size custom name array. Names are now attached to their object directly and there is no limit to the amount of names (r11822)
|
||||
-Feature: Add drag-n-drop support to the raise/lower land tools. Land is raised/lowered at the start and the rest of the area levelled to match (r11759)
|
||||
-Feature: Add support for NewGRF's train 'tilt' flag. Trains with tilt capability (specific details are per NewGRF set) will be given a 20% speed limit bonus on curves (r11741)
|
||||
-Feature: Added sorting for cost, running costs and speed to road vehicles and ships build windows (r11710)
|
||||
-Feature: List neutral stations where the player has service in the station list too (r11670)
|
||||
-Feature: Check whether (some) characters are missing in the current 'font' for the 'currently' chosen language and give a warning when that does happen (r11646)
|
||||
-Feature: Support shore replacement via Action 5 (r11726)
|
||||
-Fix: When two NewGRFs 'fight' to define the same cargo it could happen that the strings are defined by one cargo and the 'action2' by another and when one assumes that both come from the same NewGRF [FS#1559] (r11862)
|
||||
-Fix: Recompute town population when removing a 'newhouses' grf, or when loading a game with missing 'newhouses' grfs [FS#1335] (r11855)
|
||||
-Fix: Road vehicle count was incorrect in network lobby window (r11844)
|
||||
-Fix: Mark dirty canal tile even in diagonal direction from flooded tile, draw correctly canal next to half flooded rail tile (r11843, r11838)
|
||||
-Fix: At least one instance of dmusic driver is needed for it to be registered and usable (r11826)
|
||||
-Fix: An articulated road vehicle could split up when it turned around at a corner and then would enter a drive through station at the next tile [FS#1627] (r11825)
|
||||
-Fix: Switch _screen to the output buffer and disable usage of 32bpp-anim animation buffer during giant screenshots [FS#1602] (r11813)
|
||||
-Fix: Do not crash trains when leaving depot to a very long track [FS#716] (r11802)
|
||||
-Fix: Take town rating into account when testing if a command can be executed [FS#1616] (r11795)
|
||||
-Fix: Reversing a train when loading at a station with an adjacent station in the same axis crashed [FS#1632] (r11794)
|
||||
-Fix: Group names got not deallocated in the command test run [FS#1614] (r11743)
|
||||
-Fix: Run window tick events when paused, so that news pop-ups and the about window still progress. For other windows the events are ignored when paused [FS#1319] (r11742)
|
||||
-Fix: Modify and possibly discard key events for code points in the unicode private use area [FS#1610] (r11740)
|
||||
-Fix: Set the new scroll position after zooming in instead of before, as the zoom will cancel it out [FS#1609] (r11739)
|
||||
-Fix: Do not reset loading indicator IDs when only reloading NewGRFs [FS#1574] (r11735)
|
||||
-Fix: Elrail merge gave elrail, monorail & maglev unintended speed bonuses for curves, as the bonus was based on the railtype index. The bonus is now specified by a property of the railtype (r11732)
|
||||
-Fix: Clear sprite override data before performing NewGRF wagon attach callback. This stopped the callback working for autoreplace and when moving wagons from train to train in a depot [FS#1582] (r11731)
|
||||
-Fix: If there are no houses that can be build in a specific year yet, force the houses with the earliest introduction year to be available [FS#1577] (r11727)
|
||||
-Fix: Make it impossible (for users) to circumvent the length checking of the NewGRF 'allow wagon attach' callback by moving several wagons at a time (r11724)
|
||||
-Fix: Do not put more than one Random() in function calls because parameter evaluation order is not guaranteed in the c++ standard [FS#1561] (r11716)
|
||||
-Fix: Do not allow player inauguration date on scenarios to be bigger than current year [FS#1569] (r11714)
|
||||
-Fix: Add more house string id ranges to MapGRFStringID so NewGRFs use the proper string ids (r11712)
|
||||
-Fix: Do not allow refitting flooded (destroyed) vehicles (r11707)
|
||||
-Fix: Trains could have sprites with wrong direction when reversing, also was inconsistent with save/load process [FS#1557] (r11705)
|
||||
-Fix: When removing buoys, return to water or canal depending on their owner (r11666)
|
||||
-Fix: Animation informations should not be copied from original industry tile spec, while doing an action 00, industry tile, prop 08 (r11665)
|
||||
-Fix: Do not allow modifying non-uniform stations when non-uniform stations are disabled [FS#1563] (r11659)
|
||||
-Fix: 'Initialised' NewGRFs could still be deactivated in the later 'activation' pass (r11650)
|
||||
-Fix: Vehicles were still followed when sold [FS#1541] (r11632)
|
||||
-Fix: Many viewports could crash the scenario editor [FS#1527] (r11629)
|
||||
-Fix: Popping from text reference stack must be done in a precise order. But some compiler (MSVC) over optimised it and inverted this order [FS#1532] (r11627)
|
||||
-Fix: There were still some cases where one could not build a tram track, but the tram could become blocked [FS#1525] (r11621)
|
||||
-Fix: Do not make crossing red behind depot the train is entering [FS#1531] (r11619)
|
||||
-Fix: Buoys are just waypoints, so don't allow load/unload/transfert for them (r11618)
|
||||
-Fix: Sometimes large values could go off the chart [FS#1526] (r11616)
|
||||
-Fix: Temperate banks can only be built in towns (over a house) (r11615)
|
||||
|
||||
|
||||
0.6.0-beta2 (2007-12-09)
|
||||
|
||||
+9
-3
@@ -5,7 +5,7 @@ log() {
|
||||
}
|
||||
|
||||
set_default() {
|
||||
released_version="0.6.0"
|
||||
released_version="0.6.0-beta5"
|
||||
|
||||
ignore_extra_parameters="0"
|
||||
# We set all kinds of defaults for params. Later on the user can override
|
||||
@@ -40,7 +40,7 @@ set_default() {
|
||||
enable_static="1"
|
||||
enable_translator="0"
|
||||
enable_unicode="1"
|
||||
enable_assert="0"
|
||||
enable_assert="1"
|
||||
enable_strip="1"
|
||||
enable_universal="1"
|
||||
enable_osx_g5="0"
|
||||
@@ -970,6 +970,12 @@ make_cflags_and_ldflags() {
|
||||
if [ $cc_version -ge 42 ]; then
|
||||
CFLAGS="$CFLAGS -fno-strict-overflow"
|
||||
fi
|
||||
|
||||
# GCC 4.3+ gives a warning about empty body of
|
||||
# loops and conditions
|
||||
if [ $cc_version -ge 43 ]; then
|
||||
CFLAGS="$CFLAGS -Wno-empty-body"
|
||||
fi
|
||||
fi
|
||||
|
||||
if [ "$os" != "CYGWIN" ] && [ "$os" != "FREEBSD" ] && [ "$os" != "OPENBSD" ] && [ "$os" != "MINGW" ] && [ "$os" != "MORPHOS" ] && [ "$os" != "OSX" ] && [ "$os" != "WINCE" ] && [ "$os" != "PSP" ] && [ "$os" != "OS2" ]; then
|
||||
@@ -2335,7 +2341,7 @@ showhelp() {
|
||||
echo " version (Win32 ONLY)"
|
||||
echo " --disable-network disable network support"
|
||||
echo " --disable-assert disable asserts (continue on errors)"
|
||||
echo " --enable-strip enable any possible stripping"
|
||||
echo " --disable-strip disable any possible stripping"
|
||||
echo " --without-osx-sysroot disable the automatic adding of sysroot "
|
||||
echo " (OSX ONLY)"
|
||||
echo " --without-application-bundle disable generation of application bundle"
|
||||
|
||||
+2
-2
@@ -646,7 +646,6 @@
|
||||
</li>
|
||||
</ul>
|
||||
<li>m3 bit 6 : bit 8 of house type (m4), allowing 512 different types.</li>
|
||||
<li>m3 bit 5 : bit 6 of current animation frame (see m6)</li>
|
||||
<li>m3 bits 4..0 : triggers activated <a href="#newhouses">(newhouses)</a></li>
|
||||
<li>m4 : <a href="landscape_externals.html">town building type</a> (with m3[6] bit)</li>
|
||||
<li>m5 : see m3 bit 7</li>
|
||||
@@ -654,7 +653,8 @@
|
||||
<ul>
|
||||
<li>If <a href="#newhouses">newhouses</a> is activated
|
||||
<ul>
|
||||
<li>bits 7..2 : Current animation frame (bits 5..0); bit 6 in m3</li>
|
||||
<li>bits 7..3 : Current animation frame</li>
|
||||
<li>bit 2 : free</li>
|
||||
</ul>
|
||||
</li>
|
||||
<li>Standard behaviour
|
||||
|
||||
@@ -170,10 +170,10 @@ the array so you can quickly see what is used and what is not.
|
||||
<td class="bits">XXXX XXXX</td>
|
||||
<td class="bits">XXXX XXXX</td>
|
||||
<td class="bits">XXXX XXXX XXXX XXXX</td>
|
||||
<td class="bits">XXX<span class="option">~ ~~</span>XX</td>
|
||||
<td class="bits">XX<span class="free">O</span><span class="option">~ ~~</span>XX</td>
|
||||
<td class="bits">XXXX XXXX</td>
|
||||
<td class="bits">XXX<span class="abuse">X XXXX</span></td>
|
||||
<td class="bits"><span class="abuse">XXXX XX</span>XX</td>
|
||||
<td class="bits"><span class="abuse">XXXX X</span>XXX</td>
|
||||
<td class="bits">XXXX <span class="abuse">XXXX</span></td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
+4
-10
@@ -11,21 +11,15 @@ by the number below on http://bugs.openttd.org.
|
||||
If the bug report is closed, it has been fixed, which then can be verified
|
||||
in the latest SVN version of /trunk.
|
||||
|
||||
Bugs for 0.6.0
|
||||
Bugs for 0.6.0-beta5
|
||||
------------------------------------------------------------------------
|
||||
URL: http://bugs.openttd.org
|
||||
|
||||
- 1891 Go to depot for servicing is forgotten
|
||||
- 1890 Airplanes copy helipcopters goto heliport order
|
||||
- 1885 Almost all unserved industries die in big maps
|
||||
- 1868 In depot, cannot move wagon from another line before first wagon in a wagon-only line
|
||||
- 1858 Industry legend in small map overwrites buttons
|
||||
- 1852 Minor tram reversing glitches
|
||||
- 1802 Path with space in configure fails
|
||||
- 1793 Inconsistent travel time for fast trains
|
||||
- 1762 Strange Autoreplace behaviour
|
||||
- 1752 User input is not checked
|
||||
- 1711 Gravel and Clay have no worth
|
||||
- 1693 Removing road does not reset owner
|
||||
- 1495 Long vehicles block multistop station
|
||||
- 1487 Ending_year is never written to
|
||||
- 1473 Train not going to available platform
|
||||
- 1404 Spinner widget interprets one click as many
|
||||
- 1264 Autoreplace for multiple NewGRF DMU sets fails
|
||||
|
||||
+1
-13
@@ -1,16 +1,4 @@
|
||||
openttd (0.6.0) unstable; urgency=low
|
||||
|
||||
* New upstream release.
|
||||
|
||||
-- Matthijs Kooijman <m.kooijman@student.utwente.nl> Tue, 01 Apr 2008 13:33:37 +0100
|
||||
|
||||
openttd (0.6.0~RC1) unstable; urgency=low
|
||||
|
||||
* New upstream release.
|
||||
|
||||
-- Matthijs Kooijman <m.kooijman@student.utwente.nl> Wed, 26 Mar 2008 15:51:40 +0100
|
||||
|
||||
openttd (0.6.0~beta5-1) unstable; urgency=low
|
||||
openttd (0.6.0~beta5) unstable; urgency=low
|
||||
|
||||
* New upstream release.
|
||||
|
||||
|
||||
@@ -0,0 +1,9 @@
|
||||
You require the data files of the original Transport Tycoon Deluxe
|
||||
for Windows to play the game. You have to manually copy the following
|
||||
files to %{_gamesdatadir}/openttd/data/
|
||||
sample.cat
|
||||
trg1r.grf
|
||||
trgcr.grf
|
||||
trghr.grf
|
||||
trgir.grf
|
||||
trgtr.grf
|
||||
@@ -0,0 +1,146 @@
|
||||
#------------------------------------------------------------------------------
|
||||
# openttd.spec
|
||||
# This SPEC file controls the building of custom OpenTTD RPM
|
||||
# packages.
|
||||
#------------------------------------------------------------------------------
|
||||
|
||||
%define name openttd
|
||||
%define version 0.5.0
|
||||
%define release 1mdk
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# Prologue information
|
||||
#------------------------------------------------------------------------------
|
||||
Name: %{name}
|
||||
Version: %{version}
|
||||
Release: %{release}
|
||||
Summary: An open source clone of the Microprose game "Transport Tycoon Deluxe"
|
||||
Group: Games/Strategy
|
||||
License: GPL
|
||||
|
||||
URL: http://www.openttd.org
|
||||
|
||||
Source: %{name}-%{version}.tar.gz
|
||||
Packager: Dominik Scherer <dominik@openttd.com>
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
BuildRequires: libSDL1.2-devel >= 1.2.7
|
||||
BuildRequires: libpng3-devel >= 1.2.5
|
||||
BuildRequires: zlib1-devel >= 1.2.1
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# Description
|
||||
#------------------------------------------------------------------------------
|
||||
%description
|
||||
An enhanced open source clone of the Microprose game "Transport Tycoon Deluxe".
|
||||
You require the data files of the original Transport Tycoon Deluxe
|
||||
for Windows to play the game. You have to MANUALLY copy them to the
|
||||
game data directory!
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# install scripts
|
||||
#------------------------------------------------------------------------------
|
||||
%prep
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
%setup
|
||||
|
||||
%build
|
||||
make BINARY_DIR=%{_gamesbindir} PREFIX=%{_gamesdatadir} DATA_DIR=openttd INSTALL_DIR=%{_gamesdatadir}/openttd/ USE_HOMEDIR=1 PERSONAL_DIR=.openttd INSTALL=1 RELEASE=%{version}
|
||||
|
||||
%install
|
||||
mkdir -p $RPM_BUILD_ROOT%{_gamesbindir}
|
||||
mkdir -p $RPM_BUILD_ROOT%{_gamesdatadir}/openttd/lang
|
||||
mkdir -p $RPM_BUILD_ROOT%{_gamesdatadir}/openttd/data
|
||||
mkdir -p $RPM_BUILD_ROOT%{_gamesdatadir}/openttd/scenario
|
||||
|
||||
cp ./openttd $RPM_BUILD_ROOT%{_gamesbindir}/
|
||||
cp -r ./lang/*.lng $RPM_BUILD_ROOT%{_gamesdatadir}/openttd/lang/
|
||||
cp -r ./data/*.grf $RPM_BUILD_ROOT%{_gamesdatadir}/openttd/data/
|
||||
cp -r ./scenario/*.scn $RPM_BUILD_ROOT%{_gamesdatadir}/openttd/scenario/
|
||||
cp -r ./data/opntitle.dat $RPM_BUILD_ROOT%{_gamesdatadir}/openttd/data/
|
||||
|
||||
# icon
|
||||
install -m644 media/openttd.32.png -D $RPM_BUILD_ROOT%{_miconsdir}/%{name}.png
|
||||
install -m644 media/openttd.64.png -D $RPM_BUILD_ROOT%{_iconsdir}/%{name}.png
|
||||
install -m644 media/openttd.128.png -D $RPM_BUILD_ROOT%{_liconsdir}/%{name}.png
|
||||
|
||||
# menu entry
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_menudir}
|
||||
cat << EOF > $RPM_BUILD_ROOT/%{_menudir}/%{name}
|
||||
?package(%{name}):command="%{_gamesbindir}/openttd" icon="%{name}.png" \
|
||||
needs="X11" section="Amusement/Strategy" title="OpenTTD" \
|
||||
longtitle="%{Summary}"
|
||||
EOF
|
||||
|
||||
%clean
|
||||
rm -rf $RPM_BUILD_ROOT
|
||||
|
||||
%post
|
||||
%{update_menus}
|
||||
|
||||
%postun
|
||||
%{clean_menus}
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# Files listing.
|
||||
#------------------------------------------------------------------------------
|
||||
%files
|
||||
%defattr(-,root,root,0755)
|
||||
%{_gamesbindir}/openttd
|
||||
|
||||
%{_gamesdatadir}/openttd/lang/american.lng
|
||||
%{_gamesdatadir}/openttd/lang/catalan.lng
|
||||
%{_gamesdatadir}/openttd/lang/czech.lng
|
||||
%{_gamesdatadir}/openttd/lang/danish.lng
|
||||
%{_gamesdatadir}/openttd/lang/dutch.lng
|
||||
%{_gamesdatadir}/openttd/lang/english.lng
|
||||
%{_gamesdatadir}/openttd/lang/finnish.lng
|
||||
%{_gamesdatadir}/openttd/lang/french.lng
|
||||
%{_gamesdatadir}/openttd/lang/galician.lng
|
||||
%{_gamesdatadir}/openttd/lang/german.lng
|
||||
%{_gamesdatadir}/openttd/lang/hungarian.lng
|
||||
%{_gamesdatadir}/openttd/lang/icelandic.lng
|
||||
%{_gamesdatadir}/openttd/lang/italian.lng
|
||||
%{_gamesdatadir}/openttd/lang/norwegian.lng
|
||||
%{_gamesdatadir}/openttd/lang/origveh.lng
|
||||
%{_gamesdatadir}/openttd/lang/polish.lng
|
||||
%{_gamesdatadir}/openttd/lang/portuguese.lng
|
||||
%{_gamesdatadir}/openttd/lang/romanian.lng
|
||||
%{_gamesdatadir}/openttd/lang/slovak.lng
|
||||
%{_gamesdatadir}/openttd/lang/spanish.lng
|
||||
%{_gamesdatadir}/openttd/lang/swedish.lng
|
||||
|
||||
%{_gamesdatadir}/openttd/data/autorail.grf
|
||||
%{_gamesdatadir}/openttd/data/canalsw.grf
|
||||
%{_gamesdatadir}/openttd/data/openttd.grf
|
||||
%{_gamesdatadir}/openttd/data/opntitle.dat
|
||||
%{_gamesdatadir}/openttd/data/signalsw.grf
|
||||
%{_gamesdatadir}/openttd/data/trkfoundw.grf
|
||||
|
||||
"%{_gamesdatadir}/openttd/scenario/Linkgame Islands 2004.scn"
|
||||
"%{_gamesdatadir}/openttd/scenario/Mountain Pass.scn"
|
||||
"%{_gamesdatadir}/openttd/scenario/Volcano City.scn"
|
||||
|
||||
%{_menudir}/%{name}
|
||||
%{_iconsdir}/*.png
|
||||
%{_miconsdir}/*.png
|
||||
%{_liconsdir}/*.png
|
||||
|
||||
%doc changelog.txt readme.txt COPYING os/linux/README.urpmi
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# Change Log
|
||||
#------------------------------------------------------------------------------
|
||||
%changelog
|
||||
* Sun Jan 23 2005 Dominik Scherer <dominik@openttd.com> 0.3.6-1mdk
|
||||
- Upgraded to 0.3.6
|
||||
- Structured and commented the spec file a bit (inspired by ScummVM)
|
||||
|
||||
* Fri Dec 24 2004 Dominik Scherer <dominik@openttd.com> 0.3.5-1mdk
|
||||
- Upgraded to 0.3.5
|
||||
- Added a warning message about the additional required files (only displayed when installing via urpmi)
|
||||
|
||||
* Wed Sep 15 2004 Dominik Scherer <> 0.3.4-1mdk
|
||||
- Upgraded to 0.3.4
|
||||
|
||||
* Wed Jul 31 2004 Dominik Scherer <> 0.3.3-1mdk
|
||||
- Initial release
|
||||
@@ -1,75 +0,0 @@
|
||||
#
|
||||
# spec file for package openttd (trunk)
|
||||
#
|
||||
# Copyright (c) 2007 The OpenTTD team.
|
||||
# This file and all modifications and additions to the pristine
|
||||
# package are under the same license as the package itself
|
||||
#
|
||||
Name: openttd
|
||||
Version: svn
|
||||
Release: head
|
||||
Group: Applications/Games
|
||||
Source: %{name}-%{version}-%{release}.tar.gz
|
||||
License: GPL
|
||||
URL: http://www.openttd.org
|
||||
Packager: Denis Burlaka <burlaka@yandex.ru>
|
||||
Summary: OpenTTD is an Open Source clone of Chris Sawyer's Transport Tycoon Deluxe
|
||||
Requires: SDL zlib libpng freetype2 fontconfig
|
||||
BuildRequires: gcc SDL-devel zlib-devel libpng-devel fontconfig-devel
|
||||
%if %{_vendor}=="suse"
|
||||
BuildRequires: freetype2-devel
|
||||
%endif
|
||||
%if %{_vendor}=="fedora"
|
||||
BuildRequires: freetype-devel
|
||||
%endif
|
||||
%if %{_vendor}=="mandriva"
|
||||
BuildRequires: libfreetype6-devel
|
||||
%endif
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot
|
||||
Prefix: /usr
|
||||
|
||||
%description
|
||||
OpenTTD is a clone of the Microprose game "Transport Tycoon Deluxe", a popular game originally written by Chris Sawyer. It attempts to mimic the original game as closely as possible while extending it with new features.
|
||||
|
||||
OpenTTD is licensed under the GNU General Public License version 2.0. For more information, see the file 'COPYING' included with every release and source download of the game.
|
||||
|
||||
%prep
|
||||
%setup
|
||||
|
||||
%build
|
||||
./configure --prefix-dir=%{prefix} --binary-dir=bin --install-dir="$RPM_BUILD_ROOT"
|
||||
make
|
||||
|
||||
%install
|
||||
make ROOT="$RPM_BUILD_ROOT" install
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT/%{_datadir}/applications
|
||||
cat << EOF > $RPM_BUILD_ROOT/%{_datadir}/applications/%{name}.desktop
|
||||
[Desktop Entry]
|
||||
Categories=Games;
|
||||
Encoding=UTF-8
|
||||
Exec=/usr/bin/openttd
|
||||
Name=OpenTTD
|
||||
Icon=openttd.32
|
||||
Terminal=false
|
||||
Type=Application
|
||||
EOF
|
||||
|
||||
%clean
|
||||
rm -Rf "$RPM_BUILD_ROOT"
|
||||
|
||||
%files
|
||||
%dir %{_datadir}/games/%{name}
|
||||
%dir %{_datadir}/games/%{name}/lang
|
||||
%dir %{_datadir}/games/%{name}/data
|
||||
%dir %{_datadir}/games/%{name}/gm
|
||||
%dir %{_datadir}/games/%{name}/docs
|
||||
%dir %{_datadir}/pixmaps
|
||||
%defattr(644, root, games, 755)
|
||||
%attr(755, root, games) %{_bindir}/%{name}
|
||||
%{_datadir}/games/%{name}/lang/*
|
||||
%{_datadir}/games/%{name}/data/*
|
||||
%{_datadir}/games/%{name}/docs/*
|
||||
%{_datadir}/pixmaps/*
|
||||
%{_datadir}/applications/%{name}.desktop
|
||||
|
||||
Binary file not shown.
@@ -1,9 +1,9 @@
|
||||
!define APPNAME "OpenTTD" ; Define application name
|
||||
!define APPVERSION "0.6.0" ; Define application version
|
||||
!define INSTALLERVERSION 45 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
|
||||
!define INSTALLERVERSION 43 ; NEED TO UPDATE THIS FOR EVERY RELEASE!!!
|
||||
|
||||
!define APPURLLINK "http://www.openttd.org"
|
||||
!define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}"
|
||||
!define APPNAMEANDVERSION "${APPNAME} ${APPVERSION}-beta5"
|
||||
!define APPVERSIONINTERNAL "${APPVERSION}.0" ; Needs to be of the format X.X.X.X
|
||||
|
||||
!define MUI_ICON "..\..\..\media\openttd.ico"
|
||||
|
||||
@@ -53,43 +53,6 @@ Sub UpdateFiles(version)
|
||||
UpdateFile revision, version, cur_date, "../src/ottdres.rc"
|
||||
End Sub
|
||||
|
||||
Function ReadRegistryKey(shive, subkey, valuename, architecture)
|
||||
Dim hiveKey, objCtx, objLocator, objServices, objReg, Inparams, Outparams
|
||||
|
||||
' First, get the Registry Provider for the requested architecture
|
||||
Set objCtx = CreateObject("WbemScripting.SWbemNamedValueSet")
|
||||
objCtx.Add "__ProviderArchitecture", architecture ' Must be 64 of 32
|
||||
Set objLocator = CreateObject("Wbemscripting.SWbemLocator")
|
||||
Set objServices = objLocator.ConnectServer("","root\default","","",,,,objCtx)
|
||||
Set objReg = objServices.Get("StdRegProv")
|
||||
|
||||
' Check the hive and give it the right value
|
||||
Select Case shive
|
||||
Case "HKCR", "HKEY_CLASSES_ROOT"
|
||||
hiveKey = &h80000000
|
||||
Case "HKCU", "HKEY_CURRENT_USER"
|
||||
hiveKey = &H80000001
|
||||
Case "HKLM", "HKEY_LOCAL_MACHINE"
|
||||
hiveKey = &h80000002
|
||||
Case "HKU", "HKEY_USERS"
|
||||
hiveKey = &h80000003
|
||||
Case "HKCC", "HKEY_CURRENT_CONFIG"
|
||||
hiveKey = &h80000005
|
||||
Case "HKDD", "HKEY_DYN_DATA" ' Only valid for Windows 95/98
|
||||
hiveKey = &h80000006
|
||||
Case Else
|
||||
MsgBox "Hive not valid (ReadRegistryKey)"
|
||||
End Select
|
||||
|
||||
Set Inparams = objReg.Methods_("GetStringValue").Inparameters
|
||||
Inparams.Hdefkey = hiveKey
|
||||
Inparams.Ssubkeyname = subkey
|
||||
Inparams.Svaluename = valuename
|
||||
Set Outparams = objReg.ExecMethod_("GetStringValue", Inparams,,objCtx)
|
||||
|
||||
ReadRegistryKey = Outparams.SValue
|
||||
End Function
|
||||
|
||||
Function DetermineSVNVersion()
|
||||
Dim WshShell, version, url, oExec, line
|
||||
Set WshShell = CreateObject("WScript.Shell")
|
||||
@@ -98,35 +61,27 @@ Function DetermineSVNVersion()
|
||||
' Try TortoiseSVN
|
||||
' Get the directory where TortoiseSVN (should) reside(s)
|
||||
Dim sTortoise
|
||||
' First, try with 32-bit architecture
|
||||
sTortoise = ReadRegistryKey("HKLM", "SOFTWARE\TortoiseSVN", "Directory", 32)
|
||||
If sTortoise = Nothing Then
|
||||
' No 32-bit version of TortoiseSVN installed, try 64-bit version (doesn't hurt on 32-bit machines, it returns nothing or is ignored)
|
||||
sTortoise = ReadRegistryKey("HKLM", "SOFTWARE\TortoiseSVN", "Directory", 64)
|
||||
End If
|
||||
sTortoise = WshShell.RegRead("HKLM\SOFTWARE\TortoiseSVN\Directory")
|
||||
|
||||
' If TortoiseSVN is installed, try to get the revision number
|
||||
If sTortoise <> Nothing Then
|
||||
Dim file
|
||||
' Write some "magic" to a temporary file so we can acquire the svn revision/state
|
||||
Set file = FSO.CreateTextFile("tsvn_tmp", -1, 0)
|
||||
file.WriteLine "r$WCREV$$WCMODS?M:$"
|
||||
file.WriteLine "$WCURL$"
|
||||
file.Close
|
||||
Set oExec = WshShell.Exec(sTortoise & "\bin\SubWCRev.exe ../src tsvn_tmp tsvn_tmp")
|
||||
' Wait till the application is finished ...
|
||||
Do
|
||||
OExec.StdOut.ReadLine()
|
||||
Loop While Not OExec.StdOut.atEndOfStream
|
||||
Dim file
|
||||
' Write some "magic" to a temporary file so we can acquire the svn revision/state
|
||||
Set file = FSO.CreateTextFile("tsvn_tmp", -1, 0)
|
||||
file.WriteLine "r$WCREV$$WCMODS?M:$"
|
||||
file.WriteLine "$WCURL$"
|
||||
file.Close
|
||||
Set oExec = WshShell.Exec(sTortoise & "\bin\SubWCRev.exe ../src tsvn_tmp tsvn_tmp")
|
||||
' Wait till the application is finished ...
|
||||
Do
|
||||
OExec.StdOut.ReadLine()
|
||||
Loop While Not OExec.StdOut.atEndOfStream
|
||||
|
||||
Set file = FSO.OpenTextFile("tsvn_tmp", 1, 0, 0)
|
||||
version = file.ReadLine
|
||||
url = file.ReadLine
|
||||
file.Close
|
||||
Set file = FSO.OpenTextFile("tsvn_tmp", 1, 0, 0)
|
||||
version = file.ReadLine
|
||||
url = file.ReadLine
|
||||
file.Close
|
||||
|
||||
Set file = FSO.GetFile("tsvn_tmp")
|
||||
file.Delete
|
||||
End If
|
||||
Set file = FSO.GetFile("tsvn_tmp")
|
||||
file.Delete
|
||||
|
||||
' Looks like there is no TortoiseSVN installed either. Then we don't know it.
|
||||
If InStr(version, "$") Then
|
||||
@@ -239,7 +194,7 @@ Function IsCachedVersion(version)
|
||||
End Function
|
||||
|
||||
Dim version
|
||||
version = "0.6.0"
|
||||
version = "0.6.0-beta5"
|
||||
If Not (IsCachedVersion(version) And FSO.FileExists("../src/rev.cpp") And FSO.FileExists("../src/ottdres.rc")) Then
|
||||
UpdateFiles version
|
||||
End If
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
FavorSizeOrSpeed="2"
|
||||
OmitFramePointers="true"
|
||||
AdditionalIncludeDirectories="..\objs\langs"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="1"
|
||||
RuntimeLibrary="0"
|
||||
@@ -272,7 +272,7 @@
|
||||
FavorSizeOrSpeed="2"
|
||||
OmitFramePointers="true"
|
||||
AdditionalIncludeDirectories="..\objs\langs"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="1"
|
||||
RuntimeLibrary="0"
|
||||
|
||||
@@ -61,7 +61,7 @@
|
||||
FavorSizeOrSpeed="2"
|
||||
OmitFramePointers="true"
|
||||
AdditionalIncludeDirectories="..\objs\langs"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="1"
|
||||
RuntimeLibrary="0"
|
||||
@@ -272,7 +272,7 @@
|
||||
FavorSizeOrSpeed="2"
|
||||
OmitFramePointers="true"
|
||||
AdditionalIncludeDirectories="..\objs\langs"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="1"
|
||||
RuntimeLibrary="0"
|
||||
|
||||
@@ -62,7 +62,7 @@
|
||||
FavorSizeOrSpeed="2"
|
||||
OmitFramePointers="true"
|
||||
AdditionalIncludeDirectories="..\objs\langs"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="1"
|
||||
RuntimeLibrary="0"
|
||||
@@ -270,7 +270,7 @@
|
||||
FavorSizeOrSpeed="2"
|
||||
OmitFramePointers="true"
|
||||
AdditionalIncludeDirectories="..\objs\langs"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="1"
|
||||
RuntimeLibrary="0"
|
||||
|
||||
@@ -62,7 +62,7 @@
|
||||
FavorSizeOrSpeed="2"
|
||||
OmitFramePointers="true"
|
||||
AdditionalIncludeDirectories="..\objs\langs"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="1"
|
||||
RuntimeLibrary="0"
|
||||
@@ -270,7 +270,7 @@
|
||||
FavorSizeOrSpeed="2"
|
||||
OmitFramePointers="true"
|
||||
AdditionalIncludeDirectories="..\objs\langs"
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\""
|
||||
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE;WIN32_EXCEPTION_TRACKER;WIN32_ENABLE_DIRECTMUSIC_SUPPORT;WITH_ZLIB;WITH_PNG;WITH_FREETYPE;ENABLE_NETWORK;WITH_PERSONAL_DIR;PERSONAL_DIR=\"OpenTTD\";WITH_ASSERT"
|
||||
StringPooling="true"
|
||||
ExceptionHandling="1"
|
||||
RuntimeLibrary="0"
|
||||
|
||||
+2
-3
@@ -1,6 +1,6 @@
|
||||
OpenTTD README
|
||||
Last updated: 2008-04-01
|
||||
Release version: 0.6.0
|
||||
Last updated: 2008-03-04
|
||||
Release version: 0.6.0-beta5
|
||||
------------------------------------------------------------------------
|
||||
|
||||
|
||||
@@ -397,7 +397,6 @@ Thanks to:
|
||||
Michael Blunck - For revolutionizing TTD with awesome graphics
|
||||
George - Canal graphics
|
||||
David Dallaston (Pikka) - Tram tracks
|
||||
Zephyris - Trams
|
||||
All Translators - For their support to make OpenTTD a truly international game
|
||||
Bug Reporters - Thanks for all bug reports
|
||||
Chris Sawyer - For an amazing game!
|
||||
|
||||
+25
-28
@@ -1105,36 +1105,34 @@ static bool AircraftController(Vehicle *v)
|
||||
|
||||
/* Helicopter landing. */
|
||||
if (amd->flag & AMED_HELI_LOWER) {
|
||||
if (st->airport_tile == 0) {
|
||||
/* FIXME - AircraftController -> if station no longer exists, do not land
|
||||
* helicopter will circle until sign disappears, then go to next order
|
||||
* what to do when it is the only order left, right now it just stays in 1 place */
|
||||
v->u.air.state = FLYING;
|
||||
UpdateAircraftCache(v);
|
||||
AircraftNextAirportPos_and_Order(v);
|
||||
return false;
|
||||
}
|
||||
count = UpdateAircraftSpeed(v);
|
||||
if (count > 0) {
|
||||
if (st->airport_tile == 0) {
|
||||
/* FIXME - AircraftController -> if station no longer exists, do not land
|
||||
* helicopter will circle until sign disappears, then go to next order
|
||||
* what to do when it is the only order left, right now it just stays in 1 place */
|
||||
v->u.air.state = FLYING;
|
||||
UpdateAircraftCache(v);
|
||||
AircraftNextAirportPos_and_Order(v);
|
||||
return false;
|
||||
}
|
||||
|
||||
/* Vehicle is now at the airport. */
|
||||
v->tile = st->airport_tile;
|
||||
/* Vehicle is now at the airport. */
|
||||
v->tile = st->airport_tile;
|
||||
|
||||
/* Find altitude of landing position. */
|
||||
int z = GetSlopeZ(x, y) + 1 + afc->delta_z;
|
||||
/* Find altitude of landing position. */
|
||||
int z = GetSlopeZ(x, y) + 1 + afc->delta_z;
|
||||
|
||||
if (z == v->z_pos) {
|
||||
Vehicle *u = v->Next()->Next();
|
||||
if (z == v->z_pos) {
|
||||
Vehicle *u = v->Next()->Next();
|
||||
|
||||
/* Increase speed of rotors. When speed is 80, we've landed. */
|
||||
if (u->cur_speed >= 80) return true;
|
||||
u->cur_speed += 4;
|
||||
} else {
|
||||
count = UpdateAircraftSpeed(v);
|
||||
if (count > 0) {
|
||||
if (v->z_pos > z) {
|
||||
SetAircraftPosition(v, v->x_pos, v->y_pos, max(v->z_pos - count, z));
|
||||
} else {
|
||||
SetAircraftPosition(v, v->x_pos, v->y_pos, min(v->z_pos + count, z));
|
||||
}
|
||||
/* Increase speed of rotors. When speed is 80, we've landed. */
|
||||
if (u->cur_speed >= 80) return true;
|
||||
u->cur_speed += 4;
|
||||
} else if (v->z_pos > z) {
|
||||
SetAircraftPosition(v, v->x_pos, v->y_pos, max(v->z_pos - count, z));
|
||||
} else {
|
||||
SetAircraftPosition(v, v->x_pos, v->y_pos, min(v->z_pos + count, z));
|
||||
}
|
||||
}
|
||||
return false;
|
||||
@@ -2135,6 +2133,7 @@ static bool AirportFindFreeHelipad(Vehicle *v, const AirportFTAClass *apc)
|
||||
static void AircraftEventHandler(Vehicle *v, int loop)
|
||||
{
|
||||
v->tick_counter++;
|
||||
v->current_order_time++;
|
||||
|
||||
if (v->vehstatus & VS_CRASHED) {
|
||||
HandleCrashedAircraft(v);
|
||||
@@ -2171,8 +2170,6 @@ void Aircraft::Tick()
|
||||
|
||||
AgeAircraftCargo(this);
|
||||
|
||||
this->current_order_time++;
|
||||
|
||||
for (uint i = 0; i != 2; i++) {
|
||||
AircraftEventHandler(this, i);
|
||||
if (this->type != VEH_AIRCRAFT) // In case it was deleted
|
||||
|
||||
+28
-4
@@ -140,9 +140,18 @@ static CommandCost ReplaceVehicle(Vehicle **w, byte flags, Money total_cost)
|
||||
char *vehicle_name = NULL;
|
||||
CargoID replacement_cargo_type;
|
||||
|
||||
/* Check if there is a autoreplacement set for the vehicle */
|
||||
new_engine_type = EngineReplacementForPlayer(p, old_v->engine_type, old_v->group_id);
|
||||
/* if not, just renew to the same type */
|
||||
/* If the vehicle belongs to a group, check if the group is protected from the global autoreplace.
|
||||
* If not, chek if an global auto replacement is defined */
|
||||
new_engine_type = (IsValidGroupID(old_v->group_id) && GetGroup(old_v->group_id)->replace_protection) ?
|
||||
INVALID_ENGINE :
|
||||
EngineReplacementForPlayer(p, old_v->engine_type, ALL_GROUP);
|
||||
|
||||
/* If we don't set new_egnine_type previously, we try to check if an autoreplacement was defined
|
||||
* for the group and the engine_type of the vehicle */
|
||||
if (new_engine_type == INVALID_ENGINE && !IsAllGroupID(old_v->group_id)) {
|
||||
new_engine_type = EngineReplacementForPlayer(p, old_v->engine_type, old_v->group_id);
|
||||
}
|
||||
|
||||
if (new_engine_type == INVALID_ENGINE) new_engine_type = old_v->engine_type;
|
||||
|
||||
replacement_cargo_type = GetNewCargoTypeForReplace(old_v, new_engine_type);
|
||||
@@ -336,7 +345,22 @@ CommandCost MaybeReplaceVehicle(Vehicle *v, bool check, bool display_costs)
|
||||
// check if the vehicle should be replaced
|
||||
if (!w->NeedsAutorenewing(p) || // replace if engine is too old
|
||||
w->max_age == 0) { // rail cars got a max age of 0
|
||||
if (!EngineHasReplacementForPlayer(p, w->engine_type, w->group_id)) continue;
|
||||
/* If the vehicle belongs to a group, check if the group is protected from the global autoreplace.
|
||||
If not, chek if an global auto remplacement is defined */
|
||||
if (IsValidGroupID(w->group_id)) {
|
||||
if (!EngineHasReplacementForPlayer(p, w->engine_type, w->group_id) && (
|
||||
GetGroup(w->group_id)->replace_protection ||
|
||||
!EngineHasReplacementForPlayer(p, w->engine_type, ALL_GROUP))) {
|
||||
continue;
|
||||
}
|
||||
} else if (IsDefaultGroupID(w->group_id)) {
|
||||
if (!EngineHasReplacementForPlayer(p, w->engine_type, DEFAULT_GROUP) &&
|
||||
!EngineHasReplacementForPlayer(p, w->engine_type, ALL_GROUP)) {
|
||||
continue;
|
||||
}
|
||||
} else if (!EngineHasReplacementForPlayer(p, w->engine_type, ALL_GROUP)) {
|
||||
continue;
|
||||
}
|
||||
}
|
||||
|
||||
/* Now replace the vehicle */
|
||||
|
||||
+1
-1
@@ -12,7 +12,7 @@
|
||||
|
||||
enum {
|
||||
ALL_GROUP = 0xFFFD,
|
||||
DEFAULT_GROUP = 0xFFFE, ///< ungrouped vehicles are in this group.
|
||||
DEFAULT_GROUP = 0xFFFE,
|
||||
INVALID_GROUP = 0xFFFF,
|
||||
};
|
||||
|
||||
|
||||
+1
-1
@@ -499,7 +499,7 @@ static void GroupWndProc(Window *w, WindowEvent *e)
|
||||
}
|
||||
|
||||
case WE_CLICK:
|
||||
if (e->we.click.widget != GRP_WIDGET_SORT_BY_DROPDOWN && e->we.click.widget != GRP_WIDGET_MANAGE_VEHICLES_DROPDOWN) HideDropDownMenu(w);
|
||||
HideDropDownMenu(w);
|
||||
|
||||
switch(e->we.click.widget) {
|
||||
case GRP_WIDGET_SORT_BY_ORDER: // Flip sorting method ascending/descending
|
||||
|
||||
@@ -1052,7 +1052,6 @@ STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE :{LTBLUE}Permtir
|
||||
STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY :{LTBLUE}Permitir o envio de dinheiro a outras empresas: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}Estações não uniformes: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}Multiplicador de peso para trens simulando trens pesados: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PLANE_SPEED :{LTBLUE}Fator de velocidade para aeronaves: {ORANGE}1 / {STRING}
|
||||
STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD :{LTBLUE}Permitir estações drive-through em ruas locais: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ADJACENT_STATIONS :{LTBLUE}Permitir construção de estações adjacentes: {ORANGE}{STRING}
|
||||
|
||||
@@ -1614,7 +1613,6 @@ STR_1004_TOO_HIGH :{WHITE}Muito al
|
||||
STR_1005_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Tipo de linha não apropriado
|
||||
STR_1007_ALREADY_BUILT :{WHITE}...já construído
|
||||
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Deve remover a ferrovia primeiro
|
||||
STR_ERR_CROSSING_ON_ONEWAY_ROAD :{WHITE}Rua é mão única ou está bloqueado
|
||||
STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Construir ferrovias
|
||||
STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Construir ferrovias (elétricas)
|
||||
STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Construir ferrovias (monotrilho)
|
||||
@@ -1717,7 +1715,6 @@ STR_2002 :{TINYFONT}{BLAC
|
||||
STR_2002_WHITE :{TINYFONT}{WHITE}{SIGN}
|
||||
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}O edifício deve ser demolido primeiro
|
||||
STR_2005 :{WHITE}{TOWN}
|
||||
STR_CITY :{WHITE}{TOWN} (Cidade)
|
||||
STR_2006_POPULATION :{BLACK}População: {ORANGE}{COMMA}{BLACK} Casas: {ORANGE}{COMMA}
|
||||
STR_2007_RENAME_TOWN :Renomear Cidade
|
||||
STR_2008_CAN_T_RENAME_TOWN :{WHITE}Impossível renomear cidade...
|
||||
|
||||
@@ -1052,7 +1052,6 @@ STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE :{LTBLUE}Поз
|
||||
STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY :{LTBLUE}Позволи изпращане на пари до други компаний: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}Нестандартни станции: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}Теглови множител към товарите за симулация на тежки влакове: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PLANE_SPEED :{LTBLUE}Скоростоопределяща: {ORANGE}1 / {STRING}
|
||||
STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD :{LTBLUE}Преминаване през спирки на градски пътища: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ADJACENT_STATIONS :{LTBLUE}Позвалявай допрени гари: {ORANGE}{STRING}
|
||||
|
||||
@@ -1614,7 +1613,6 @@ STR_1004_TOO_HIGH :{WHITE}Прек
|
||||
STR_1005_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Неподходящ за употреба релсов път
|
||||
STR_1007_ALREADY_BUILT :{WHITE}...вече е построено
|
||||
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Първо трябва да премахнеш релсовия път
|
||||
STR_ERR_CROSSING_ON_ONEWAY_ROAD :{WHITE}Пътят е еднопосочен или блокиран
|
||||
STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Конструкции за Двурелсов път
|
||||
STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Строене на електрифицирана ЖП мрежа
|
||||
STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Конструкции за Еднорелсов път
|
||||
@@ -1717,7 +1715,6 @@ STR_2002 :{TINYFONT}{BLAC
|
||||
STR_2002_WHITE :{TINYFONT}{WHITE}{SIGN}
|
||||
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Сградата първо трябва да бъде разрушена
|
||||
STR_2005 :{WHITE}{TOWN}
|
||||
STR_CITY :{WHITE}{TOWN} (Град)
|
||||
STR_2006_POPULATION :{BLACK}Население: {ORANGE}{COMMA}{BLACK} Жилища: {ORANGE}{COMMA}
|
||||
STR_2007_RENAME_TOWN :Преименуване на град
|
||||
STR_2008_CAN_T_RENAME_TOWN :{WHITE}Градът не може да бъде преименуван
|
||||
@@ -2771,7 +2768,7 @@ STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Разт
|
||||
STR_TIMETABLE_TOOLTIP :{BLACK}Времетаблица - кликни върху заповед за да я маркираш.
|
||||
STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Промени времетраенето на маркираната заповед
|
||||
STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Изчисти времетраенето на маркираната заповед
|
||||
STR_TIMETABLE_RESET_LATENESS_TOOLTIP :{BLACK}Reset the lateness counter, so the vehicle will be on time
|
||||
STR_TIMETABLE_RESET_LATENESS_TOOLTIP :{BLACK}Преправи закъснялата бройка, такаче превозните средства да са на време
|
||||
STR_SERVICE_HINT :{BLACK}Пропусни освен ако е необходим ремонт
|
||||
STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER :{BLACK}Цена: {CURRENCY} Тегло: {WEIGHT_S}{}Скорост: {VELOCITY} Мощност: {POWER}{}Разход: {CURRENCY}/г.{}Капацитет: {CARGO}
|
||||
STR_885C_BROKEN_DOWN :{RED}Развален
|
||||
@@ -3358,7 +3355,6 @@ STR_TRANSPARENT_INDUSTRIES_DESC :{BLACK}Изпо
|
||||
STR_TRANSPARENT_BUILDINGS_DESC :{BLACK}Използвай прозрачност за сгради като гари, депа, пътни точки и висящи жици
|
||||
STR_TRANSPARENT_BRIDGES_DESC :{BLACK}Използвай прозрачност за мостове
|
||||
STR_TRANSPARENT_STRUCTURES_DESC :{BLACK}Използвай прозрачност за сгради като фарове и антени, може би в бъдеще за украси
|
||||
STR_TRANSPARENT_CATENARY_DESC :{BLACK}Активирай прозрачност за висящите. CTRL+клик за фиксиране.
|
||||
STR_TRANSPARENT_LOADING_DESC :{BLACK}Вклучи прозрачност за товарещи указатели
|
||||
|
||||
STR_PERCENT_UP_SMALL :{TINYFONT}{WHITE}{NUM}%{UPARROW}
|
||||
|
||||
@@ -1050,7 +1050,6 @@ STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE :{LTBLUE}Permet
|
||||
STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY :{LTBLUE}Permet enviar diners a altres companyies: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}Estacions no uniformes: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}Multiplicador de pes per contenidor per simular trens pesats: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PLANE_SPEED :{LTBLUE}Factor de velocitat dels avions: {ORANGE}1 / {STRING}
|
||||
STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD :{LTBLUE}Permet situar parades en carreteres que són propietat del poble: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ADJACENT_STATIONS :{LTBLUE}Permet construir estacions annexes: {ORANGE}{STRING}
|
||||
|
||||
@@ -1612,7 +1611,6 @@ STR_1004_TOO_HIGH :{WHITE}Massa al
|
||||
STR_1005_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Via de tren no apropiada
|
||||
STR_1007_ALREADY_BUILT :{WHITE}...ja construit
|
||||
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}S'ha de treure la via primer
|
||||
STR_ERR_CROSSING_ON_ONEWAY_ROAD :{WHITE}La carretera és un d'un sol sentit o està bloquejada
|
||||
STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Construcció de Ferrocarril
|
||||
STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Construcció de Ferrocarril Elèctric
|
||||
STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Construcció de Monorail
|
||||
@@ -1715,7 +1713,6 @@ STR_2002 :{TINYFONT}{BLAC
|
||||
STR_2002_WHITE :{TINYFONT}{WHITE}{SIGN}
|
||||
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}L'edifici s'ha d'enderrocar primer
|
||||
STR_2005 :{WHITE}{TOWN}
|
||||
STR_CITY :{WHITE}{TOWN} (Ciutat)
|
||||
STR_2006_POPULATION :{BLACK}Població: {ORANGE}{COMMA}{BLACK} Cases: {ORANGE}{COMMA}
|
||||
STR_2007_RENAME_TOWN :Reanomena Població
|
||||
STR_2008_CAN_T_RENAME_TOWN :{WHITE}No es pot reanomenar la població...
|
||||
|
||||
@@ -1108,7 +1108,6 @@ STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE :{LTBLUE}Umožni
|
||||
STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY :{LTBLUE}Umožnit zasílání peněz ostatním společnostem: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}Nejednolité stanice: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}Pro simulaci těžkých vlaků vynásobit hmotnost nákladu: {ORANGE}{STRING}x
|
||||
STR_CONFIG_PATCHES_PLANE_SPEED :{LTBLUE}Činitel rychlosti letadel: {ORANGE}1/{STRING}
|
||||
STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD :{LTBLUE}Povolit průjezdné zastávky na silnicích vlastněných obcemi: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ADJACENT_STATIONS :{LTBLUE}Povolit stavění přilehlých stanic: {ORANGE}{STRING}
|
||||
|
||||
@@ -1670,7 +1669,6 @@ STR_1004_TOO_HIGH :{WHITE}Příli
|
||||
STR_1005_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Žádné použitelné koleje
|
||||
STR_1007_ALREADY_BUILT :{WHITE}... již vystavěno
|
||||
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Musíš nejprve odstranit koleje
|
||||
STR_ERR_CROSSING_ON_ONEWAY_ROAD :{WHITE}Silnice je jednosměrná nebo zablokovaná
|
||||
STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Výstavba železnice
|
||||
STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Výstavba elektrifikované železnice
|
||||
STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Výstavba monorailu
|
||||
@@ -1773,7 +1771,6 @@ STR_2002 :{TINYFONT}{BLAC
|
||||
STR_2002_WHITE :{TINYFONT}{WHITE}{SIGN}
|
||||
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Budova musí být nejprve zničena
|
||||
STR_2005 :{WHITE}{TOWN}
|
||||
STR_CITY :{WHITE}{TOWN} (velkoměsto)
|
||||
STR_2006_POPULATION :{BLACK}Populace: {ORANGE}{COMMA}{BLACK} Domů: {ORANGE}{COMMA}
|
||||
STR_2007_RENAME_TOWN :Přejmenovat město
|
||||
STR_2008_CAN_T_RENAME_TOWN :{WHITE}Nemohu přejmenovat město:
|
||||
|
||||
@@ -1050,7 +1050,6 @@ STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE :{LTBLUE}Tillad
|
||||
STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY :{LTBLUE}Tillad at sende penge til andre firmaer: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}Ikke uniforme stationer: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}Vægtfaktor for fragt for at simulere tunge tog: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PLANE_SPEED :{LTBLUE}Fly-hastighedsfaktor: {ORANGE}1 / {STRING}
|
||||
STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD :{LTBLUE}Tillad gennemkørsels-stop på veje ejet af en by: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ADJACENT_STATIONS :{LTBLUE}Tillad bygning af tilstødende stationer: {ORANGE}{STRING}
|
||||
|
||||
@@ -1205,19 +1204,6 @@ STR_CONFIG_PATCHES_CURRENCY :{CURRENCY}
|
||||
STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Skift indstillingsværdi
|
||||
STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Nogle eller alle standard service intervaller nedenunder er uforenelige med den valgte opsætning! 5-90% og 30-800 dage er gyldige
|
||||
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Stifinder til tog: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Ikke anbefalet)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NPF :NPF
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_YAPF :YAPF {BLUE}(Anbefalet)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH :{LTBLUE}Stifinder til vejkøretøjer: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_OPF :Original {RED}(Ikke anbefalet)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_NPF :NPF
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_YAPF :YAPF {BLUE}(Anbefalet)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS :{LTBLUE}Stifinder til skibe: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_OPF :Original {BLUE}(Anbefalet)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_NPF :NPF
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_YAPF :YAPF {RED}(Ikke anbefalet)
|
||||
|
||||
STR_TEMPERATE_LANDSCAPE :Tempereret klima
|
||||
STR_SUB_ARCTIC_LANDSCAPE :Arktisk klima
|
||||
STR_SUB_TROPICAL_LANDSCAPE :Tropisk klima
|
||||
@@ -1612,7 +1598,6 @@ STR_1004_TOO_HIGH :{WHITE}For høj
|
||||
STR_1005_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Ingen brugbar jernbane
|
||||
STR_1007_ALREADY_BUILT :{WHITE}...allerede bygget
|
||||
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Det er nødvendigt at fjerne jernbaneskinnerne først
|
||||
STR_ERR_CROSSING_ON_ONEWAY_ROAD :{WHITE}Vejen er ensrettet eller blokeret
|
||||
STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Jernbanekonstruktion
|
||||
STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Elektrisk jernbanekonstruktion
|
||||
STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Monorailkonstruktion
|
||||
@@ -3355,7 +3340,6 @@ STR_TRANSPARENT_INDUSTRIES_DESC :{BLACK}Skift ge
|
||||
STR_TRANSPARENT_BUILDINGS_DESC :{BLACK}Skift gennemsigtighed for konstruktioner som stationer, værksteder, kontrolsteder og køreledninger
|
||||
STR_TRANSPARENT_BRIDGES_DESC :{BLACK}Skift gennemsigtighed for broer
|
||||
STR_TRANSPARENT_STRUCTURES_DESC :{BLACK}Skift gennemsigtighed for strukturer som fyrtårne og antenner, og måske i fremtiden for øjeguf
|
||||
STR_TRANSPARENT_CATENARY_DESC :{BLACK}Slå transparens til/fra for køreledninger. CTRL+klik for at låse.
|
||||
STR_TRANSPARENT_LOADING_DESC :{BLACK}Slå gennemsigtighed til/fra for laste-indikatorer
|
||||
|
||||
STR_PERCENT_UP_SMALL :{TINYFONT}{WHITE}{NUM}%{UPARROW}
|
||||
|
||||
+1
-3
@@ -1050,7 +1050,6 @@ STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE :{LTBLUE}Kopen v
|
||||
STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY :{LTBLUE}Geld geven aan andere bedrijven toestaan: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}Vrij gevormde stations: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}Gewichtsverhouding voor vracht om zware treinen te simuleren: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PLANE_SPEED :{LTBLUE}Vliegtuig snelheidsverhouding: {ORANGE}1 / {STRING}
|
||||
STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD :{LTBLUE}Laat toe dat doorrij wegstops worden geplaatst op door stad beheerde wegen: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ADJACENT_STATIONS :{LTBLUE}Bouwen van aangrenzende stations toestaan: {ORANGE}{STRING}
|
||||
|
||||
@@ -1212,7 +1211,7 @@ STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_YAPF :YAPF {BLUE}(Aan
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH :{LTBLUE}Routezoeker voor voertuigen: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_OPF :Original {RED}(Niet aanbevolen)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_NPF :NPF
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_YAPF :YAPF {BLUE}(Aanbevolen)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_YAPF :YAPF {BLUE}(Recommended)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS :{LTBLUE}Routezoeker voor schepen: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_OPF :Original {BLUE}(Aanbevolen)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_NPF :NPF
|
||||
@@ -1612,7 +1611,6 @@ STR_1004_TOO_HIGH :{WHITE}Te hoog
|
||||
STR_1005_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Geen bruikbaar spoor
|
||||
STR_1007_ALREADY_BUILT :{WHITE}...reeds gebouwd
|
||||
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Bestaand spoor moet eerst weggehaald worden
|
||||
STR_ERR_CROSSING_ON_ONEWAY_ROAD :{WHITE}Eenrichtingsverkeer of de weg is geblokkeerd
|
||||
STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Spoorwegconstructie
|
||||
STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Geëlectrificeerde spoorwegconstructie
|
||||
STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Monorailconstructie
|
||||
|
||||
@@ -1715,7 +1715,6 @@ STR_2002 :{TINYFONT}{BLAC
|
||||
STR_2002_WHITE :{TINYFONT}{WHITE}{SIGN}
|
||||
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Building must be demolished first
|
||||
STR_2005 :{WHITE}{TOWN}
|
||||
STR_CITY :{WHITE}{TOWN} (City)
|
||||
STR_2006_POPULATION :{BLACK}Population: {ORANGE}{COMMA}{BLACK} Houses: {ORANGE}{COMMA}
|
||||
STR_2007_RENAME_TOWN :Rename Town
|
||||
STR_2008_CAN_T_RENAME_TOWN :{WHITE}Can't rename town...
|
||||
|
||||
@@ -1150,7 +1150,6 @@ STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE :{LTBLUE}Luba ek
|
||||
STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY :{LTBLUE}Luba teistele ettevõtetele raha saata: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}Luba suvalise kujuga jaamad: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}Raskete rongide simuleerimiseks kasutatav raskuse korrutaja: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PLANE_SPEED :{LTBLUE}Lennuki kiiruse tegur: {ORANGE}1 / {STRING}
|
||||
STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD :{LTBLUE}Luba läbisõidupeatused linnateedel: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ADJACENT_STATIONS :{LTBLUE}Luba jaamu lähestikku ehitada: {ORANGE}{STRING}
|
||||
|
||||
@@ -1712,7 +1711,6 @@ STR_1004_TOO_HIGH :{WHITE}Liiga k
|
||||
STR_1005_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Sobiv rongitee puudub
|
||||
STR_1007_ALREADY_BUILT :{WHITE}...juba ehitatud
|
||||
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Rööbastee tuleb eelnevalt lammutada
|
||||
STR_ERR_CROSSING_ON_ONEWAY_ROAD :{WHITE}Läbipääsmatu või ühesuunaline maantee
|
||||
STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Rööbasteede ehitamine
|
||||
STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Elektrifitseeritud rööbasteede ehitamine
|
||||
STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Monorelsi ehitamine
|
||||
|
||||
@@ -1051,7 +1051,6 @@ STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE :{LTBLUE}Autoris
|
||||
STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY :{LTBLUE}Autoriser l'envoi d'argent aux autres compagnies: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}Gares non uniformes: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}Multiplier le poid pour les trains fret (simule des trains lourds): {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PLANE_SPEED :{LTBLUE}Facteur de vitesse des aéroplanes: {ORANGE}1 / {STRING}
|
||||
STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD :{LTBLUE}Autoriser les arrêts de bus sur les routes des municipalités: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ADJACENT_STATIONS :{LTBLUE}Autoriser la construction de stations adjacentes: {ORANGE}{STRING}
|
||||
|
||||
@@ -1613,7 +1612,6 @@ STR_1004_TOO_HIGH :{WHITE}Trop él
|
||||
STR_1005_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Aucuns rails convenables
|
||||
STR_1007_ALREADY_BUILT :{WHITE}...déjà construit
|
||||
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Vous devez d'abord enlever les rails
|
||||
STR_ERR_CROSSING_ON_ONEWAY_ROAD :{WHITE}La route est à sens unique ou bloquée
|
||||
STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Construction de voie ferrée
|
||||
STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Construction de voie ferrée électrifiée
|
||||
STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Construction de Monorail
|
||||
@@ -1716,7 +1714,6 @@ STR_2002 :{TINYFONT}{BLAC
|
||||
STR_2002_WHITE :{TINYFONT}{WHITE}{SIGN}
|
||||
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}L'édifice doit d'abord être démolit
|
||||
STR_2005 :{WHITE}{TOWN}
|
||||
STR_CITY :{WHITE}{TOWN} (Métropole)
|
||||
STR_2006_POPULATION :{BLACK}Population: {ORANGE}{COMMA}{BLACK} Maisons: {ORANGE}{COMMA}
|
||||
STR_2007_RENAME_TOWN :Renommer Ville
|
||||
STR_2008_CAN_T_RENAME_TOWN :{WHITE}Impossible de renommer la ville...
|
||||
|
||||
+1
-18
@@ -16,7 +16,6 @@ STR_EMPTY :
|
||||
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Ebenes Land erforderlich
|
||||
STR_0008_WAITING :{BLACK}Im Wartezustand: {WHITE}{STRING}
|
||||
STR_0009 :{WHITE}{CARGO}
|
||||
STR_EN_ROUTE_FROM :{YELLOW}({SHORTCARGO} unterwegs von {STATION})
|
||||
STR_000C_ACCEPTS :{BLACK}Akzeptiert: {WHITE}
|
||||
STR_000D_ACCEPTS :{BLACK}Akzeptiert: {GOLD}
|
||||
STR_000E :
|
||||
@@ -725,7 +724,7 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE :{BLACK}Felsige
|
||||
STR_028D_PLACE_LIGHTHOUSE :{BLACK}Leuchtturm errichten
|
||||
STR_028E_PLACE_TRANSMITTER :{BLACK}Sender errichten
|
||||
STR_028F_DEFINE_DESERT_AREA :{BLACK}Lege Wüstengebiet an.{}STRG drücken zum entfernen
|
||||
STR_CREATE_LAKE :{BLACK}Wasser erzeugen.{}Baut einen Kanal; Bei gedrückter Strg.-Taste wird ein Wasserfeld erzeugt, das umliegendes Land flutet.
|
||||
STR_CREATE_LAKE :{BLACK}Wasser erzeugen.{}Baut einen Kanal. Bei gedrückter Strg.-Taste wird ein Wasserfeld erzeugt, das umliegendes Land flutet.
|
||||
STR_CREATE_RIVER :{BLACK}Flüsse platzieren.
|
||||
STR_0290_DELETE :{BLACK}Löschen
|
||||
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Diese Stadt vollständig löschen
|
||||
@@ -1051,7 +1050,6 @@ STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE :{LTBLUE}Erlaube
|
||||
STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY :{LTBLUE}Erlaube es, anderen Firmen Geld zu schenken: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}Ungleichmäßige Bahnhöfe: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}Frachtgewicht erhöhen um schwere Züge zu simulieren: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PLANE_SPEED :{LTBLUE}Flugzeug-Geschwindigkeitsfaktor: {ORANGE}1 / {STRING}
|
||||
STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD :{LTBLUE}Bushaltestellen an städtischen Straßen erlauben: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ADJACENT_STATIONS :{LTBLUE}Bau angrenzender Stationen erlauben: {ORANGE}{STRING}
|
||||
|
||||
@@ -1206,19 +1204,6 @@ STR_CONFIG_PATCHES_CURRENCY :{CURRENCY}
|
||||
STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Einstellungswert ändern
|
||||
STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Einige oder alle dieser Standardwartungsintervalle sind inkompatibel mit den gewählten Einstellungen! 5-90% und 30-800 Tage sind gültig.
|
||||
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Pathfinder für Züge: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Not recommended)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NPF :NPF
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_YAPF :YAPF {BLUE}(Recommended)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH :{LTBLUE}Pathfinder für Straßenfahrzeuge: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_OPF :Original {RED}(nicht empfohlen)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_NPF :NPF
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_YAPF :YAPF {BLUE}(empfohlen)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS :{LTBLUE}Pathfinder für Schiffe: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_OPF :Original {BLUE}(empfohlen)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_NPF :NPF
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_YAPF :YAPF {RED}(nicht empfohlen)
|
||||
|
||||
STR_TEMPERATE_LANDSCAPE :Gemäßigt
|
||||
STR_SUB_ARCTIC_LANDSCAPE :Subarktisch
|
||||
STR_SUB_TROPICAL_LANDSCAPE :Subtropisch
|
||||
@@ -1613,7 +1598,6 @@ STR_1004_TOO_HIGH :{WHITE}Zu hoch
|
||||
STR_1005_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Keine geeigneten Gleise
|
||||
STR_1007_ALREADY_BUILT :{WHITE}...ist bereits gebaut
|
||||
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Gleise müssen erst entfernt werden
|
||||
STR_ERR_CROSSING_ON_ONEWAY_ROAD :{WHITE}Einbahnstraße oder blockierter Weg
|
||||
STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Gleis- / Bahnhofsbau
|
||||
STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Bau elektrifizierter Strecken
|
||||
STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Einschienenbahnbau
|
||||
@@ -3356,7 +3340,6 @@ STR_TRANSPARENT_INDUSTRIES_DESC :{BLACK}Transpar
|
||||
STR_TRANSPARENT_BUILDINGS_DESC :{BLACK}Transparenz für Gebäude wie Bahnhöfe, Depots, Wegpunkte und Oberleitung einstellen
|
||||
STR_TRANSPARENT_BRIDGES_DESC :{BLACK}Transparenz für Brücken einstellen
|
||||
STR_TRANSPARENT_STRUCTURES_DESC :{BLACK}Transparenz für Bauten wie Leuchttürme und Antennen, evtl. in der Zukunft auch für Sehenswürdigkeiten, einstellen
|
||||
STR_TRANSPARENT_CATENARY_DESC :{BLACK}Transparente Oberleitungen. Strg.+klick zum feststellen.
|
||||
STR_TRANSPARENT_LOADING_DESC :{BLACK}Transparenz für Ladestandsanzeige einstellen
|
||||
|
||||
STR_PERCENT_UP_SMALL :{TINYFONT}{WHITE}{NUM}%{UPARROW}
|
||||
|
||||
@@ -1115,7 +1115,6 @@ STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE :{LTBLUE}Lehesse
|
||||
STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY :{LTBLUE}Lehessen más vállalatoknak pénzt küldeni: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}Különböző vágánytípusok engedélyezése egy állomáson: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}Tömegszorzó tehervonatoknak (szimulációs célból): {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PLANE_SPEED :{LTBLUE}Repülőgép sebességszorzó: {ORANGE}1 / {STRING}
|
||||
STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD :{LTBLUE}Áthajtható állomások engedélyezése városi utakra: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ADJACENT_STATIONS :{LTBLUE}Érintkező állomások építésének engedélyezése: {ORANGE}{STRING}
|
||||
|
||||
@@ -1677,7 +1676,6 @@ STR_1004_TOO_HIGH :{WHITE}Túl mag
|
||||
STR_1005_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Nincs megfelelő sín
|
||||
STR_1007_ALREADY_BUILT :{WHITE}...már van itt
|
||||
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Előbb le kell rombolnod a sínt
|
||||
STR_ERR_CROSSING_ON_ONEWAY_ROAD :{WHITE}Az út egy irányú vagy blokkolt
|
||||
STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Vasútépítés
|
||||
STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Elektromos-vasút építés
|
||||
STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Egysínű vasút építése
|
||||
@@ -1780,7 +1778,6 @@ STR_2002 :{TINYFONT}{BLAC
|
||||
STR_2002_WHITE :{TINYFONT}{WHITE}{SIGN}
|
||||
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Előbb le kell rombolnod az épületet
|
||||
STR_2005 :{WHITE}{TOWN}
|
||||
STR_CITY :{WHITE}{TOWN} (Város)
|
||||
STR_2006_POPULATION :{BLACK}Lakosság: {ORANGE}{COMMA}{BLACK} Házak: {ORANGE}{COMMA}
|
||||
STR_2007_RENAME_TOWN :Város átnevezése
|
||||
STR_2008_CAN_T_RENAME_TOWN :{WHITE}Nem nevezheted át a várost...
|
||||
|
||||
+4
-398
@@ -1,11 +1,9 @@
|
||||
##name Icelandic
|
||||
##ownname Íslenska
|
||||
##isocode is_IS
|
||||
##plural 9
|
||||
##plural 0
|
||||
##gender karlkyn kvenkyn hvorugkyn
|
||||
|
||||
#
|
||||
|
||||
##id 0x0000
|
||||
STR_NULL :
|
||||
STR_0001_OFF_EDGE_OF_MAP :{WHITE}Brún kortsins
|
||||
@@ -16,7 +14,6 @@ STR_EMPTY :
|
||||
STR_0007_FLAT_LAND_REQUIRED :{WHITE}Sléttlendi nauðsynlegt
|
||||
STR_0008_WAITING :{BLACK}Bíður: {WHITE}{STRING}
|
||||
STR_0009 :{WHITE}{CARGO}
|
||||
STR_EN_ROUTE_FROM :{YELLOW}({SHORTCARGO} frá {STATION})
|
||||
STR_000C_ACCEPTS :{BLACK}Tekur við: {WHITE}
|
||||
STR_000D_ACCEPTS :{BLACK}Tekur við: {GOLD}
|
||||
STR_000E :
|
||||
@@ -281,7 +278,6 @@ STR_OSNAME_BEOS :BeOS
|
||||
STR_OSNAME_MORPHOS :MorphOS
|
||||
STR_OSNAME_AMIGAOS :AmigaOS
|
||||
STR_OSNAME_OS2 :OS/2
|
||||
STR_OSNAME_SUNOS :SunOS
|
||||
|
||||
STR_013B_OWNED_BY :{WHITE}...í eigu {STRING}
|
||||
STR_013C_CARGO :{BLACK}Farmur
|
||||
@@ -586,11 +582,7 @@ STR_0206_ARRIVAL_OF_FIRST_VEHICLE :{YELLOW}Aðkoma
|
||||
STR_0207_ARRIVAL_OF_FIRST_VEHICLE :{YELLOW}Aðkoma fyrsta farartækis á stöð andstæðings
|
||||
STR_0208_ACCIDENTS_DISASTERS :{YELLOW}Slys / hamfarir
|
||||
STR_0209_COMPANY_INFORMATION :{YELLOW}Fyrirtækisupplýsingar
|
||||
STR_NEWS_OPEN_CLOSE :{YELLOW}Opnun / lokun iðnaða
|
||||
STR_020A_ECONOMY_CHANGES :{YELLOW}Efnahagsbreytingar
|
||||
STR_INDUSTRY_CHANGES_SERVED_BY_PLAYER :{YELLOW}Framleiðslubreytingar fyrirtækja þjónustuð af leikmanni
|
||||
STR_INDUSTRY_CHANGES_SERVED_BY_OTHER :{YELLOW}Framleiðslubreytingar fyrirtækja þjónustuð af mótherjum
|
||||
STR_OTHER_INDUSTRY_PRODUCTION_CHANGES :{YELLOW}Aðrar framleiðslubreytingar
|
||||
STR_020B_ADVICE_INFORMATION_ON_PLAYER :{YELLOW}Ráð / upplýsingar um farartæki leikmanns
|
||||
STR_020C_NEW_VEHICLES :{YELLOW}Ný farartæki
|
||||
STR_020D_CHANGES_OF_CARGO_ACCEPTANCE :{YELLOW}Breyting á viðtöku farms
|
||||
@@ -725,8 +717,6 @@ STR_028C_PLACE_ROCKY_AREAS_ON_LANDSCAPE :{BLACK}Setja kl
|
||||
STR_028D_PLACE_LIGHTHOUSE :{BLACK}Setja vita
|
||||
STR_028E_PLACE_TRANSMITTER :{BLACK}Setja sendi
|
||||
STR_028F_DEFINE_DESERT_AREA :{BLACK}Afmarkaðu eyðimörk.{}Smelltu og haltu CTRL til að fjarlægja hana
|
||||
STR_CREATE_LAKE :{BLACK}Skilgreina vantssvæði.{}Grafa skipaskurð, nema CTRL sé haldið niðri við sjávarmál, þá flæðir það umhverfið í staðin.
|
||||
STR_CREATE_RIVER :{BLACK}Búa til fljót.
|
||||
STR_0290_DELETE :{BLACK}Eyða
|
||||
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Eyða þessum bæ algjörlega
|
||||
STR_0292_SAVE_SCENARIO :Vista kort
|
||||
@@ -750,7 +740,6 @@ STR_02A0_ENDS_OF_BRIDGE_MUST_BOTH :{WHITE}...báð
|
||||
STR_02A1_SMALL :{BLACK}Lítill
|
||||
STR_02A2_MEDIUM :{BLACK}Miðlungs
|
||||
STR_02A3_LARGE :{BLACK}Stór
|
||||
STR_SCENARIO_EDITOR_CITY :{BLACK}Borg
|
||||
STR_02A4_SELECT_TOWN_SIZE :{BLACK}Velja stærð bæjar
|
||||
STR_02A5_TOWN_SIZE :{YELLOW}Stærð bæjar:
|
||||
|
||||
@@ -775,7 +764,6 @@ STR_02C4_GAME_OPTIONS :Stillingar
|
||||
STR_02C6_DIFFICULTY_SETTINGS :Erfiðleikastig
|
||||
STR_MENU_CONFIG_PATCHES :Viðbætur
|
||||
STR_NEWGRF_SETTINGS :NewGRF stillingar
|
||||
STR_TRANSPARENCY_OPTIONS :Gegnsæisstillingar
|
||||
STR_GAMEOPTMENU_0A :
|
||||
STR_02CA_TOWN_NAMES_DISPLAYED :{SETX 12}Bæjarnöfn sýnd
|
||||
STR_02CC_STATION_NAMES_DISPLAYED :{SETX 12}Stöðvarnöfn sýnd
|
||||
@@ -858,7 +846,6 @@ STR_0313_FUND_NEW_INDUSTRY :Fjármagna nýj
|
||||
|
||||
STR_0314_FUND_NEW_INDUSTRY :{WHITE}Fjármagna nýjan iðnað
|
||||
STR_JUST_STRING :{STRING}
|
||||
STR_JUST_INT :{NUM}
|
||||
STR_0316_CAN_ONLY_BE_BUILT_IN_TOWNS :{WHITE}...aðeins hægt að byggja í bæjum
|
||||
STR_0317_CAN_ONLY_BE_BUILT_IN_RAINFOREST :{WHITE}...aðeins hægt að byggja á regnskógasvæðum
|
||||
STR_0318_CAN_ONLY_BE_BUILT_IN_DESERT :{WHITE}...aðeins hægt að byggja í eyðimörk
|
||||
@@ -936,7 +923,6 @@ STR_OPTIONS_LANG_TIP :{BLACK}Tungumá
|
||||
|
||||
STR_OPTIONS_FULLSCREEN :{BLACK}Fylla út í skjá
|
||||
STR_OPTIONS_FULLSCREEN_TIP :{BLACK}Smelltu hér til að OpenTTD fylli út í skjáinn
|
||||
STR_FULLSCREEN_FAILED :{WHITE}Skjáfyllihamur brást
|
||||
|
||||
STR_OPTIONS_RES :{BLACK}Skjáupplausn
|
||||
STR_OPTIONS_RES_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
|
||||
@@ -1020,7 +1006,6 @@ STR_CONFIG_PATCHES_OFF :Nei
|
||||
STR_CONFIG_PATCHES_ON :Já
|
||||
STR_CONFIG_PATCHES_VEHICLESPEED :{LTBLUE}Sýna hraða farartækis á upplýsingaslá: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_BUILDONSLOPES :{LTBLUE}Leyfilegt að byggja í halla og á strönd: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_AUTOSLOPE :{LTBLUE}Leyfa landslagsbreytingar undir byggingum, teinum o.fl. (landfylling): {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_CATCHMENT :{LTBLUE}Raunverulegri stærð svæðis sem stöðvar ná yfir: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_EXTRADYNAMITE :{LTBLUE}Leyfa meiri eyðingu vega, brúa, gangna o.s.frv. í eigu bæjar: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Leyfa mjög langar lestir: {ORANGE}{STRING}
|
||||
@@ -1034,8 +1019,6 @@ STR_CONFIG_PATCHES_INFLATION :{LTBLUE}Verðb
|
||||
STR_CONFIG_PATCHES_SELECTGOODS :{LTBLUE}Aðeins afhlaða farmi á stöðvum þar sem er eftirspurn: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_LONGBRIDGES :{LTBLUE}Leyfa byggingu mjög langra brúa: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_GOTODEPOT :{LTBLUE}Skýli má vera á áætlun lesta: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD :{LTBLUE}Fjármögnun nýrra hráefnisiðnaða: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_RAW_INDUSTRY_CONSTRUCTION_METHOD_NONE :engin
|
||||
STR_CONFIG_PATCHES_MULTIPINDTOWN :{LTBLUE}Leyfa marga svipaða iðnaði í sama bæ: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_SAMEINDCLOSE :{LTBLUE}Má byggja iðnaði af sömu gerð nálægt hvor öðrum: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_LONGDATE :{LTBLUE}Sýna alltaf fulla dagsetningu á upplýsingaslá: {ORANGE}{STRING}
|
||||
@@ -1045,12 +1028,9 @@ STR_CONFIG_PATCHES_NEW_NONSTOP :{LTBLUE}TTDPatc
|
||||
STR_CONFIG_PATCHES_ROADVEH_QUEUE :{LTBLUE}Bifreiðir bíða í röð (með skömmtunaráhrifum): {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_AUTOSCROLL :{LTBLUE}Færa sjónarhorn þegar músin nálgast brún gluggans: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_BRIBE :{LTBLUE}Leyfilegt að múta bæjaryfirvöldum: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE :{LTBLUE}Heimila sölu á sérleyfi til flutninga: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY :{LTBLUE}Heimila peningagreiðslur til annarra fyrirtækja: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}Órétthyrndar lestarstöðvar leyfðar: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}Margfalda þyngd farms til að líkja eftir þyngri lestum: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD :{LTBLUE}Leyfa strætóstöðvar á gangstéttum bæja: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ADJACENT_STATIONS :{LTBLUE}Heimila sambyggingu stöðva: {ORANGE}{STRING}
|
||||
|
||||
STR_CONFIG_PATCHES_SMALL_AIRPORTS :{LTBLUE}Alltaf leyfa litla flugvelli: {ORANGE}{STRING}
|
||||
|
||||
@@ -1091,40 +1071,12 @@ STR_CONFIG_PATCHES_STATION_SPREAD :{LTBLUE}Dreyfin
|
||||
STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}Skoða þyrlur sjálfvirkt á þyrlupalli: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Opna landmótunarglugga samhliða öðrum framkvæmdum: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_REVERSE_SCROLLING :{LTBLUE}Færa sjónarhorn í öfuga átt miðað við mús: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_SMOOTH_SCROLLING :{LTBLUE}Mjúkt skrun í skjágluggum: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_MEASURE_TOOLTIP :{LTBLUE}Sýna mælstiku við byggingu: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_LIVERIES :{LTBLUE}Sýna auka litastillingar: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_LIVERIES_NONE :Aldrei
|
||||
STR_CONFIG_PATCHES_LIVERIES_OWN :Eigin fyrirtækis
|
||||
STR_CONFIG_PATCHES_LIVERIES_ALL :Allra fyrirtækja
|
||||
STR_CONFIG_PATCHES_PREFER_TEAMCHAT :{LTBLUE}Nota liðsspjall með <ENTER>: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_SCROLLWHEEL_SCROLLING :{LTBLUE}Virkni skrunhjóls: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_SCROLLWHEEL_ZOOM :Víkka/þrengja sjónarhorn
|
||||
STR_CONFIG_PATCHES_SCROLLWHEEL_SCROLL :Skruna á korti
|
||||
STR_CONFIG_PATCHES_SCROLLWHEEL_OFF :Engin
|
||||
STR_CONFIG_PATCHES_SCROLLWHEEL_MULTIPLIER :{LTBLUE}Hraði skrunhjóls á korti: {ORANGE}{STRING}
|
||||
|
||||
STR_CONFIG_PATCHES_RIGHT_MOUSE_BTN_EMU_OFF :Af
|
||||
|
||||
STR_CONFIG_PATCHES_PAUSE_ON_NEW_GAME :{LTBLUE}Setja leik á bið þegar nýr leikur er hafinn: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ADVANCED_VEHICLE_LISTS :{LTBLUE}Ítarlegur listi yfir farartæki: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ADVANCED_VEHICLE_LISTS_OFF :Af
|
||||
STR_CONFIG_PATCHES_ADVANCED_VEHICLE_LISTS_OWN :Eigin fyrirtækis
|
||||
STR_CONFIG_PATCHES_ADVANCED_VEHICLE_LISTS_ALL :Allra fyrirtækja
|
||||
STR_CONFIG_PATCHES_LOADING_INDICATORS :{LTBLUE}Sýna stöðu lestunar: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_LOADING_INDICATORS_OFF :Engra fyrirtækja
|
||||
STR_CONFIG_PATCHES_LOADING_INDICATORS_OWN :Eigin fyrirtækis
|
||||
STR_CONFIG_PATCHES_LOADING_INDICATORS_ALL :Allra fyrirtækja
|
||||
STR_CONFIG_PATCHES_TIMETABLE_ALLOW :{LTBLUE}Virkja áætlanir fyrir farartæki: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_TIMETABLE_IN_TICKS :{LTBLUE}Birta áætlanir í slögum frekar en dögum: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE :{LTBLUE}Valin lestartegund (eftir nýjan leik/opnaðan leik): {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_RAIL :Hefðbundin lest
|
||||
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_ELRAIL :Rafmagnslest
|
||||
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MONORAIL :Einteinungslest
|
||||
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MAGLEV :Segulsviflest
|
||||
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_FIRST :Fyrsta mögulega
|
||||
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_LAST :Síðasta mögulega
|
||||
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MOST_USED :Mest notuð
|
||||
|
||||
STR_CONFIG_PATCHES_MAX_TRAINS :{LTBLUE}Lestir á leikmann mest: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_MAX_ROADVEH :{LTBLUE}Bifreiðir á leikmann mest: {ORANGE}{STRING}
|
||||
@@ -1158,32 +1110,12 @@ STR_CONFIG_PATCHES_SMOOTH_ECONOMY :{LTBLUE}Virkja
|
||||
STR_CONFIG_PATCHES_ALLOW_SHARES :{LTBLUE}Leyfa hlutabréfakaup í öðrum fyrirtækjum
|
||||
STR_CONFIG_PATCHES_DRAG_SIGNALS_DENSITY :{LTBLUE}Þegar dregið er, setja skilti á: {ORANGE}{STRING} hvern reit
|
||||
STR_CONFIG_PATCHES_SEMAPHORE_BUILD_BEFORE_DATE :{LTBLUE}Nota skilti í stað ljósa fyrir: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ENABLE_SIGNAL_GUI :{LTBLUE}Virkja valmynd lestarljósa: {ORANGE}{STRING}
|
||||
|
||||
STR_CONFIG_PATCHES_TOWN_LAYOUT_INVALID :{WHITE}Vegaskipulagið „ekki fleiri vegi“ er ekki gilt við landslagsgerð
|
||||
STR_CONFIG_PATCHES_TOWN_LAYOUT :{LTBLUE}Vegaskipulag bæja: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_TOWN_LAYOUT_NO_ROADS :ekki fleiri vegi
|
||||
STR_CONFIG_PATCHES_TOWN_LAYOUT_DEFAULT :sjálfgefið
|
||||
STR_CONFIG_PATCHES_TOWN_LAYOUT_BETTER_ROADS :betri vegi
|
||||
STR_CONFIG_PATCHES_TOWN_LAYOUT_2X2_GRID :2x2 net
|
||||
STR_CONFIG_PATCHES_TOWN_LAYOUT_3X3_GRID :3x3 net
|
||||
|
||||
STR_CONFIG_PATCHES_TOOLBAR_POS :{LTBLUE}Staðsetning tækjasláar: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_TOOLBAR_POS_LEFT :Vinstri
|
||||
STR_CONFIG_PATCHES_TOOLBAR_POS_CENTER :Miðja
|
||||
STR_CONFIG_PATCHES_TOOLBAR_POS_RIGHT :Hægri
|
||||
STR_CONFIG_PATCHES_SNAP_RADIUS :{LTBLUE}Gluggar smella saman við: {ORANGE}{STRING} punkta radíus
|
||||
STR_CONFIG_PATCHES_SNAP_RADIUS_DISABLED :{LTBLUE}Gluggar smella: {ORANGE}ekki saman
|
||||
STR_CONFIG_PATCHES_TOWN_GROWTH :{LTBLUE}Vaxtarhraði bæja: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_TOWN_GROWTH_NONE :Enginn
|
||||
STR_CONFIG_PATCHES_TOWN_GROWTH_SLOW :Hægur
|
||||
STR_CONFIG_PATCHES_TOWN_GROWTH_NORMAL :Venjulegur
|
||||
STR_CONFIG_PATCHES_TOWN_GROWTH_FAST :Hraður
|
||||
STR_CONFIG_PATCHES_TOWN_GROWTH_VERY_FAST :Mjög hraður
|
||||
STR_CONFIG_PATCHES_LARGER_TOWNS :{LTBLUE}Hlutfall bæja sem verða að borgum: {ORANGE}1 af {STRING}
|
||||
STR_CONFIG_PATCHES_LARGER_TOWNS_DISABLED :{LTBLUE}Hlutfall bæja sem verða að borgum: {ORANGE}Enginn
|
||||
STR_CONFIG_PATCHES_CITY_SIZE_MULTIPLIER :{LTBLUE}Upphaflegur margfaldari bogarstærðar: {ORANGE}{STRING}
|
||||
STR_CONFIG_MODIFIED_ROAD_REBUILD :{LTBLUE}Fjarlægja fráleita vegahluti þegar vegagerð stendur yfir
|
||||
|
||||
STR_CONFIG_PATCHES_GUI :{BLACK}Viðmót
|
||||
STR_CONFIG_PATCHES_CONSTRUCTION :{BLACK}Bygging
|
||||
@@ -1199,19 +1131,6 @@ STR_CONFIG_PATCHES_CURRENCY :{CURRENCY}
|
||||
STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Breyta gildi stillingar
|
||||
STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Einhver eða öll bil milli skoðana hér fyrir neðan eru ósamhæfanleg við valdar stillingar! 5-90% og 30-800 dagar er leyfilegt
|
||||
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Leiðsagnarkerfi lesta: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Óráðlegt)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NPF :NPF
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_YAPF :YAPF {BLUE}(Ráðlegt)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH :{LTBLUE}Leiðsögukerfi bifreiða: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_OPF :Original {RED}(Óráðlegt)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_NPF :NPF
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_YAPF :YAPF {BLUE}(Ráðlegt)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS :{LTBLUE}Leiðsögukerfi skipa: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_OPF :Original {BLUE}(Ráðlegt)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_NPF :NPF
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_YAPF :YAPF {RED}(Óráðlegt)
|
||||
|
||||
STR_TEMPERATE_LANDSCAPE :Temprað landslag
|
||||
STR_SUB_ARCTIC_LANDSCAPE :Heimskautalandslag
|
||||
STR_SUB_TROPICAL_LANDSCAPE :Miðjarðarlandslag
|
||||
@@ -1273,7 +1192,6 @@ STR_TREES_RANDOM_TYPE :{BLACK}Tré af
|
||||
STR_TREES_RANDOM_TYPE_TIP :{BLACK}Gróðursetja tré af handahófskenndri gerð
|
||||
|
||||
STR_CANT_BUILD_CANALS :{WHITE}Ekki hægt að grafa skipaskurð hér...
|
||||
STR_BUILD_CANALS_TIP :{BLACK}Grafa skipaskurði.
|
||||
STR_LANDINFO_CANAL :Skipaskurður
|
||||
|
||||
STR_CANT_BUILD_LOCKS :{WHITE}Ekki hægt að gera skurðgátt hér
|
||||
@@ -1282,7 +1200,6 @@ STR_LANDINFO_LOCK :Skurðgátt
|
||||
|
||||
STR_BUOY_IS_IN_USE :{WHITE}... bauja í notkun!
|
||||
|
||||
STR_LANDINFO_COORDS :{BLACK}Hnit: {LTBLUE}{NUM}x{NUM}x{NUM} ({STRING})
|
||||
|
||||
STR_CANT_REMOVE_PART_OF_STATION :{WHITE}Get ekki fjarlægt hluta af stöð...
|
||||
STR_CANT_CONVERT_RAIL :{WHITE}Get ekki breytt lestarteini...
|
||||
@@ -1393,23 +1310,18 @@ STR_NETWORK_SET_PASSWORD :{BLACK}Veldu ly
|
||||
STR_NETWORK_PASSWORD_TIP :{BLACK}Verndaðu leikinn þinn með lykilorði ef þú vilt ekki að óboðnir tengist honum
|
||||
STR_NETWORK_SELECT_MAP :{BLACK}Veldu kort:
|
||||
STR_NETWORK_SELECT_MAP_TIP :{BLACK}Hvaða kort viltu spila?
|
||||
STR_NETWORK_LAN_INTERNET_COMBO :{BLACK}{SKIP}{STRING}
|
||||
STR_NETWORK_NUMBER_OF_CLIENTS :{BLACK}Hámarksfjöldi notenda:
|
||||
STR_NETWORK_NUMBER_OF_CLIENTS_TIP :{BLACK}Veldu hámarksfjölda notenda. Ekki þarf að fylla öll pláss
|
||||
STR_NETWORK_LAN :Staðarnet
|
||||
STR_NETWORK_INTERNET :Internet
|
||||
STR_NETWORK_LAN_INTERNET :Staðarnet / Internet
|
||||
STR_NETWORK_INTERNET_ADVERTISE :Internet (auglýsa)
|
||||
STR_NETWORK_CLIENTS_SELECT :{BLACK}{SKIP}{SKIP}{NUM} biðlar{P i ar}
|
||||
STR_NETWORK_NUMBER_OF_CLIENTS :{BLACK}Hámarksfjöldi notenda:
|
||||
STR_NETWORK_NUMBER_OF_CLIENTS_TIP :{BLACK}Veldu hámarksfjölda notenda. Ekki þarf að fylla öll pláss
|
||||
STR_NETWORK_COMPANIES_SELECT :{BLACK}{SKIP}{SKIP}{SKIP}{NUM} Fyrirtæki
|
||||
STR_NETWORK_NUMBER_OF_COMPANIES :{BLACK}Hámarksfjöldi fyrirtækja:
|
||||
STR_NETWORK_NUMBER_OF_COMPANIES_TIP :{BLACK}Takmarka fjölda fyrirtækja á vefþjóni
|
||||
STR_NETWORK_SPECTATORS_SELECT :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{NUM} áhorf{P andi endur}
|
||||
STR_NETWORK_NUMBER_OF_SPECTATORS :{BLACK}Hámarksfjöldi áhorfanda:
|
||||
STR_NETWORK_NUMBER_OF_SPECTATORS_TIP :{BLACK}Takmarka fjölda áhorfanda á vefþjóninum
|
||||
STR_NETWORK_LANGUAGE_SPOKEN :{BLACK}Tungumál:
|
||||
STR_NETWORK_LANGUAGE_TIP :{BLACK}Aðrir notendur munu vita hvaða tungumál er talað á þjóninum
|
||||
STR_NETWORK_LANGUAGE_COMBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
|
||||
STR_NETWORK_START_GAME :{BLACK}Hefja leik
|
||||
STR_NETWORK_START_GAME_TIP :{BLACK}Hefja nýjan netleik í sérvöldu korti eða landslagi af handahófi
|
||||
STR_NETWORK_LOAD_GAME :{BLACK}Hlaða leik
|
||||
@@ -1420,31 +1332,6 @@ STR_NETWORK_LANG_ANY :Hvað sem er
|
||||
STR_NETWORK_LANG_ENGLISH :Enska
|
||||
STR_NETWORK_LANG_GERMAN :Þýska
|
||||
STR_NETWORK_LANG_FRENCH :Franska
|
||||
STR_NETWORK_LANG_BRAZILIAN :Brasilíska
|
||||
STR_NETWORK_LANG_BULGARIAN :Búlgarska
|
||||
STR_NETWORK_LANG_CHINESE :Kínverska
|
||||
STR_NETWORK_LANG_CZECH :Tékkneska
|
||||
STR_NETWORK_LANG_DANISH :Danska
|
||||
STR_NETWORK_LANG_DUTCH :Hollenska
|
||||
STR_NETWORK_LANG_ESPERANTO :Esperanto
|
||||
STR_NETWORK_LANG_FINNISH :Finnska
|
||||
STR_NETWORK_LANG_HUNGARIAN :Ungverska
|
||||
STR_NETWORK_LANG_ICELANDIC :Íslenska
|
||||
STR_NETWORK_LANG_ITALIAN :Ítalska
|
||||
STR_NETWORK_LANG_JAPANESE :Japanska
|
||||
STR_NETWORK_LANG_KOREAN :Kóreiska
|
||||
STR_NETWORK_LANG_LITHUANIAN :Litháenska
|
||||
STR_NETWORK_LANG_NORWEGIAN :Norska
|
||||
STR_NETWORK_LANG_POLISH :Pólska
|
||||
STR_NETWORK_LANG_PORTUGUESE :Portúgalska
|
||||
STR_NETWORK_LANG_ROMANIAN :Rómanska
|
||||
STR_NETWORK_LANG_RUSSIAN :Rússneska
|
||||
STR_NETWORK_LANG_SLOVAK :Slóvakíska
|
||||
STR_NETWORK_LANG_SLOVENIAN :Slóveska
|
||||
STR_NETWORK_LANG_SPANISH :Spænska
|
||||
STR_NETWORK_LANG_SWEDISH :Sænska
|
||||
STR_NETWORK_LANG_TURKISH :Tyrkneska
|
||||
STR_NETWORK_LANG_UKRAINIAN :Úkraínska
|
||||
############ End of leave-in-this-order
|
||||
|
||||
STR_NETWORK_GAME_LOBBY :{WHITE}Anddyri fjölspilunarleiks
|
||||
@@ -1606,7 +1493,6 @@ STR_1004_TOO_HIGH :{WHITE}Of hátt
|
||||
STR_1005_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Enginn hentugur lestarteinn
|
||||
STR_1007_ALREADY_BUILT :{WHITE}...nú þegar byggt
|
||||
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Verður að fjarlægja lestartein fyrst
|
||||
STR_ERR_CROSSING_ON_ONEWAY_ROAD :{WHITE}Vegurinn er einstefnuvegur eða stíflaður
|
||||
STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Járnbrautarlestarframkvæmdir
|
||||
STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Raflestaframkvæmdir
|
||||
STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Einteinungsframkvæmdir
|
||||
@@ -1638,14 +1524,6 @@ STR_1024_AREA_IS_OWNED_BY_ANOTHER :{WHITE}...svæ
|
||||
STR_RAILROAD_TRACK_WITH_NORMAL_SIGNALS :Lestarteinn með venjulegum ljósum
|
||||
STR_RAILROAD_TRACK_WITH_PRESIGNALS :Lestarteinn með forljósum
|
||||
STR_RAILROAD_TRACK_WITH_EXITSIGNALS :Lestarteinn með útljósum
|
||||
STR_RAILROAD_TRACK_WITH_COMBOSIGNALS :Járnbrautarspor með fjölljósum
|
||||
STR_RAILROAD_TRACK_WITH_NORMAL_PRESIGNALS :Járbrautarspor með venjulegum ljósum og forljósum
|
||||
STR_RAILROAD_TRACK_WITH_NORMAL_EXITSIGNALS :Járnbrautarspor með venjulegum ljósum og útgangsljósum
|
||||
STR_RAILROAD_TRACK_WITH_NORMAL_COMBOSIGNALS :Járnbrautarspor með venjulegum ljósum og fjölljósum
|
||||
STR_RAILROAD_TRACK_WITH_PRE_EXITSIGNALS :Járnbrautarspor með for- og útgangsljósum
|
||||
STR_RAILROAD_TRACK_WITH_PRE_COMBOSIGNALS :Járnbrautarspor með for- og fjölljósum
|
||||
STR_RAILROAD_TRACK_WITH_EXIT_COMBOSIGNALS :Járnbrautarspor með útgangs- og fjölljósum
|
||||
STR_MUST_REMOVE_RAILWAY_STATION_FIRST :{WHITE}Verður að fjarlægja járnbrautarstöð fyrst
|
||||
|
||||
|
||||
|
||||
@@ -1653,42 +1531,22 @@ STR_MUST_REMOVE_RAILWAY_STATION_FIRST :{WHITE}Verður
|
||||
STR_1801_MUST_REMOVE_ROAD_FIRST :{WHITE}Verður að fjarlægja veg fyrst
|
||||
STR_ROAD_WORKS_IN_PROGRESS :{WHITE}Vegaframkvæmdir standa yfir
|
||||
STR_1802_ROAD_CONSTRUCTION :{WHITE}Vegagerð
|
||||
STR_WHITE_TRAMWAY_CONSTRUCTION :{WHITE}Sporvagnaframkvæmdir
|
||||
STR_1803_SELECT_ROAD_BRIDGE :{WHITE}Veldu vegabrú
|
||||
STR_ERR_ONEWAY_ROADS_CAN_T_HAVE_JUNCTION :{WHITE}... einstefnuvegin geta ekki mætt öðrum vegi
|
||||
STR_1804_CAN_T_BUILD_ROAD_HERE :{WHITE}Get ekki lagt veg hér...
|
||||
STR_CAN_T_BUILD_TRAMWAY_HERE :{WHITE}Get ekki lagt sporvagnaspor hér...
|
||||
STR_1805_CAN_T_REMOVE_ROAD_FROM :{WHITE}Get ekki fjarlægt veg héðan...
|
||||
STR_CAN_T_REMOVE_TRAMWAY_FROM :{WHITE}Get ekki fjarlægt sporvagnaspor héðan...
|
||||
STR_1806_ROAD_DEPOT_ORIENTATION :{WHITE}Bifreiðaskýli
|
||||
STR_TRAM_DEPOT_ORIENTATION :{WHITE}Staða sporvagnaskýlis
|
||||
STR_1807_CAN_T_BUILD_ROAD_VEHICLE :{WHITE}Get ekki fjarlægt bifreiðaskýli héðan...
|
||||
STR_CAN_T_BUILD_TRAM_VEHICLE :{WHITE}Get ekki reist sporvagnaskýli hér...
|
||||
STR_1808_CAN_T_BUILD_BUS_STATION :{WHITE}Get ekki byggt strætóstoppistöð...
|
||||
STR_1809_CAN_T_BUILD_TRUCK_STATION :{WHITE}Get ekki byggt flutningabílastöð...
|
||||
STR_CAN_T_BUILD_PASSENGER_TRAM_STATION :{WHITE}Get ekki reist sporvagnastöð fyrir farþega...
|
||||
STR_CAN_T_BUILD_CARGO_TRAM_STATION :{WHITE}Get ekki reist sporvagnastöð fyrir farm...
|
||||
STR_180A_ROAD_CONSTRUCTION :Vegagerð
|
||||
STR_TRAMWAY_CONSTRUCTION :Sporvagnaframkvæmdir
|
||||
STR_180B_BUILD_ROAD_SECTION :{BLACK}Leggja veg
|
||||
STR_BUILD_AUTOROAD_TIP :{BLACK}Leggja veghluta í sjálfvirkum vegaham
|
||||
STR_BUILD_TRAMWAY_SECTION :{BLACK}Leggja sporvagnaspor
|
||||
STR_BUILD_AUTOTRAM_TIP :{BLACK}Leggja sporvagnaspor í sjálfvirkum sporvagnsham
|
||||
STR_180C_BUILD_ROAD_VEHICLE_DEPOT :{BLACK}Byggja bifreiðaskýli (til að byggja og gera við bifreiðir)
|
||||
STR_BUILD_TRAM_VEHICLE_DEPOT :{BLACK}Reisa sporvagnaskýli (til að smíða og þjónusta vagna)
|
||||
STR_180D_BUILD_BUS_STATION :{BLACK}Byggja strætóstoppistöð
|
||||
STR_180E_BUILD_TRUCK_LOADING_BAY :{BLACK}Byggja flutningabílastöð
|
||||
STR_BUILD_PASSENGER_TRAM_STATION :{BLACK}Reisa sporvagnastöð fyrir farþega
|
||||
STR_BUILD_CARGO_TRAM_STATION :{BLACK}Reisa sporvagnastöð fyrir farm
|
||||
STR_180F_BUILD_ROAD_BRIDGE :{BLACK}Byggja vegabrú
|
||||
STR_BUILD_TRAMWAY_BRIDGE :{BLACK}Byggja sporvagnabrú
|
||||
STR_1810_BUILD_ROAD_TUNNEL :{BLACK}Byggja göng
|
||||
STR_BUILD_TRAMWAY_TUNNEL :{BLACK}Grafa sporvagnagöng
|
||||
STR_TOGGLE_ONE_WAY_ROAD :{BLACK}Virkja/afvirkja einstefnugötur
|
||||
STR_1811_TOGGLE_BUILD_REMOVE_FOR :{BLACK}Skipta á milli byggja/fjarlægja fyrir vegagerð
|
||||
STR_TOGGLE_BUILD_REMOVE_FOR_TRAMWAYS :{BLACK}Skipta á milli þess að leggja leggja og fjarlægja sporvagnaspor
|
||||
STR_1813_SELECT_ROAD_VEHICLE_DEPOT :{BLACK}Veldu legu bifreiðaskýlis
|
||||
STR_SELECT_TRAM_VEHICLE_DEPOT :{BLACK}Veldu stöðu sporvagnaskýlis
|
||||
STR_1814_ROAD :Vegur
|
||||
STR_1815_ROAD_WITH_STREETLIGHTS :Vegur með umferðarljósum
|
||||
STR_1816_TREE_LINED_ROAD :Trjáskreyttur vegur
|
||||
@@ -1696,8 +1554,6 @@ STR_1817_ROAD_VEHICLE_DEPOT :Bifreiðaskýli
|
||||
STR_1818_ROAD_RAIL_LEVEL_CROSSING :Vega/lestar gatnamót
|
||||
STR_CAN_T_REMOVE_BUS_STATION :{WHITE}Get ekki fjarlægt strætóstoppistöð...
|
||||
STR_CAN_T_REMOVE_TRUCK_STATION :{WHITE}Get ekki flutt vörubílastöð...
|
||||
STR_CAN_T_REMOVE_PASSENGER_TRAM_STATION :{WHITE}Get ekki fjarlægt farþegasporvagnastöð...
|
||||
STR_CAN_T_REMOVE_CARGO_TRAM_STATION :{WHITE}Get ekki fjarlægt farmsporvagnastöð...
|
||||
|
||||
##id 0x2000
|
||||
STR_2000_TOWNS :{WHITE}Bæir
|
||||
@@ -1706,7 +1562,6 @@ STR_TOWN_LABEL :{WHITE}{TOWN}
|
||||
STR_TOWN_LABEL_TINY_BLACK :{TINYFONT}{BLACK}{TOWN}
|
||||
STR_TOWN_LABEL_TINY_WHITE :{TINYFONT}{WHITE}{TOWN}
|
||||
STR_2002 :{TINYFONT}{BLACK}{SIGN}
|
||||
STR_2002_WHITE :{TINYFONT}{WHITE}{SIGN}
|
||||
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Verður að eyða byggingu fyrst
|
||||
STR_2005 :{WHITE}{TOWN}
|
||||
STR_2006_POPULATION :{BLACK}Íbúafjöldi: {ORANGE}{COMMA}{BLACK} Hús: {ORANGE}{COMMA}
|
||||
@@ -1863,12 +1718,8 @@ STR_3040_NOW_ACCEPTS :{WHITE}{STATION
|
||||
STR_3041_NOW_ACCEPTS_AND :{WHITE}{STATION} tekur nú við {STRING} og {STRING}
|
||||
STR_3042_BUS_STATION_ORIENTATION :{WHITE}Staða strætisvagnastöðvar
|
||||
STR_3043_TRUCK_STATION_ORIENT :{WHITE}Staða póstvagnsstöðvar
|
||||
STR_PASSENGER_TRAM_STATION_ORIENTATION :{WHITE}Staða sporvagnafarþegastöðvar
|
||||
STR_CARGO_TRAM_STATION_ORIENT :{WHITE}Staða farmsporvagnastöðvar
|
||||
STR_3046_MUST_DEMOLISH_BUS_STATION :{WHITE}Verður að eyða strætisvagnastöðinni fyrst
|
||||
STR_3047_MUST_DEMOLISH_TRUCK_STATION :{WHITE}Verður að eyða póstvagnsstöðinni fyrst
|
||||
STR_MUST_DEMOLISH_PASSENGER_TRAM_STATION :{WHITE}Verður að rífa farþegasporvagnastöð fyrst
|
||||
STR_MUST_DEMOLISH_CARGO_TRAM_STATION :{WHITE}Verður að rífa farmsporvagnastöð fyrst
|
||||
STR_3048_STATIONS :{WHITE}{COMPANY} - {COMMA} Stöðvar
|
||||
STR_3049_0 :{YELLOW}{STATION} {STATIONFEATURES}
|
||||
STR_304A_NONE :{YELLOW}- Ekkert -
|
||||
@@ -1880,8 +1731,6 @@ STR_304F_SELECT_NUMBER_OF_PLATFORMS :{BLACK}Veldu fj
|
||||
STR_3050_SELECT_LENGTH_OF_RAILROAD :{BLACK}Veldu lengd lestarstöðvar
|
||||
STR_3051_SELECT_BUS_STATION_ORIENTATION :{BLACK}Veldu stöðu strætisvagnastöðvar
|
||||
STR_3052_SELECT_TRUCK_LOADING_BAY :{BLACK}Veldu stöðu póstvagnsstöðvar
|
||||
STR_SELECT_PASSENGER_TRAM_STATION_ORIENTATION :{BLACK}Velja stöðu farþegasporvagnastöðvar
|
||||
STR_SELECT_CARGO_TRAM_STATION_ORIENTATION :{BLACK}Velja stöðu farmsporvagnastöðvar
|
||||
STR_3053_CENTER_MAIN_VIEW_ON_STATION :{BLACK}Færa miðju sýnishorns á staðsetningu stöðvar
|
||||
STR_3054_SHOW_STATION_RATINGS :{BLACK}Sýna einkunn stöðvar
|
||||
STR_3055_CHANGE_NAME_OF_STATION :{BLACK}Breyta nafni stöðvar
|
||||
@@ -1919,7 +1768,6 @@ STR_3804_WATER :Vatn
|
||||
STR_3805_COAST_OR_RIVERBANK :Strönd
|
||||
STR_3806_SHIP_DEPOT :Slippur
|
||||
STR_3807_CAN_T_BUILD_ON_WATER :{WHITE}...Get ekki byggt á vatni
|
||||
STR_MUST_DEMOLISH_CANAL_FIRST :{WHITE}Verður að fylla upp í skipaskurð fyrst
|
||||
|
||||
##id 0x4000
|
||||
STR_4000_SAVE_GAME :{WHITE}Vista leik
|
||||
@@ -1932,11 +1780,6 @@ STR_4006_UNABLE_TO_READ_DRIVE :{BLACK}Get ekki
|
||||
STR_4007_GAME_SAVE_FAILED :{WHITE}Vistun leiks mistókst{}{STRING}
|
||||
STR_4008_UNABLE_TO_DELETE_FILE :{WHITE}Get ekki eytt skrá
|
||||
STR_4009_GAME_LOAD_FAILED :{WHITE}Mistókst að opna leik{}{STRING}
|
||||
STR_GAME_SAVELOAD_ERROR_BROKEN_INTERNAL_ERROR :Innri villa: {STRING}
|
||||
STR_GAME_SAVELOAD_ERROR_BROKEN_SAVEGAME :Bilun í vistuðum leik - {STRING}
|
||||
STR_GAME_SAVELOAD_ERROR_TOO_NEW_SAVEGAME :Leikur er vistaður í nýrri útgáfu
|
||||
STR_GAME_SAVELOAD_ERROR_FILE_NOT_READABLE :Skrá er ekki lesanleg
|
||||
STR_GAME_SAVELOAD_ERROR_FILE_NOT_WRITEABLE :Skrá er ekki skrifanleg
|
||||
STR_400A_LIST_OF_DRIVES_DIRECTORIES :{BLACK}Listi yfir drif, möppur og vistaða leiki
|
||||
STR_400B_CURRENTLY_SELECTED_NAME :{BLACK}Nafn fyrir vistun leiks
|
||||
STR_400C_DELETE_THE_CURRENTLY_SELECTED :{BLACK}Eyða nafninu
|
||||
@@ -1993,13 +1836,6 @@ STR_4828_REQUIRES :{BLACK}Tekur vi
|
||||
STR_4829_REQUIRES :{BLACK}Tekur við: {YELLOW}{STRING}, {STRING}, {STRING}
|
||||
############ range for requires ends
|
||||
|
||||
############ range for produces starts
|
||||
STR_INDUSTRY_WINDOW_WAITING_FOR_PROCESSING :{BLACK}Farmur sem bíður verkunar:
|
||||
STR_INDUSTRY_WINDOW_WAITING_STOCKPILE_CARGO :{YELLOW}{CARGO}{BLACK}
|
||||
STR_4827_PRODUCES :{BLACK}Framleiðir: {YELLOW}{STRING}
|
||||
STR_4828_PRODUCES :{BLACK}Framleiðir: {YELLOW}{STRING}, {STRING}
|
||||
############ range for produces ends
|
||||
|
||||
STR_482A_PRODUCTION_LAST_MONTH :{BLACK}Framleiðsla síðasta mánaðar:
|
||||
STR_482B_TRANSPORTED :{YELLOW}{CARGO}{BLACK} ({COMMA}% flutt)
|
||||
STR_482C_CENTER_THE_MAIN_VIEW_ON :{BLACK}Miðja aðalsjónarhorn á iðnað
|
||||
@@ -2029,8 +1865,6 @@ STR_5005_UNABLE_TO_EXCAVATE_LAND :{WHITE}Get ekki
|
||||
STR_5006_MUST_DEMOLISH_TUNNEL_FIRST :{WHITE}Verður að eyða göngum fyrst
|
||||
STR_5007_MUST_DEMOLISH_BRIDGE_FIRST :{WHITE}Verður að eyða brú fyrst
|
||||
STR_5008_CANNOT_START_AND_END_ON :{WHITE}Getur ekki byrjað og endað á sama stað
|
||||
STR_BRIDGEHEADS_NOT_SAME_HEIGHT :{WHITE}Brúarendar ekki í sömu hæð
|
||||
STR_BRIDGE_TOO_LOW_FOR_TERRAIN :{WHITE}Brú er of lág fyrir umhverfið
|
||||
STR_500A_START_AND_END_MUST_BE_IN :{WHITE}Verður að byrja og enda í sömu línu
|
||||
STR_500B_SITE_UNSUITABLE_FOR_TUNNEL :{WHITE}Óhentug staðsetning fyrir enda gangnanna
|
||||
STR_500D :{GOLD}{STRING},{} {VELOCITY} {WHITE}{CURRENCY}
|
||||
@@ -2063,7 +1897,7 @@ STR_5028_TUBULAR_ROAD_BRIDGE :Rörabrú, vegu
|
||||
|
||||
##id 0x5800
|
||||
STR_5800_OBJECT_IN_THE_WAY :{WHITE}Hluturinn er fyrir
|
||||
STR_5801_TRANSMITTER :Mastur
|
||||
STR_5801_TRANSMITTER :Sendir
|
||||
STR_5802_LIGHTHOUSE :Viti
|
||||
STR_5803_COMPANY_HEADQUARTERS :Höfuðstöðvar fyritækis
|
||||
STR_5804_COMPANY_HEADQUARTERS_IN :{WHITE}...höfuðstöðvar fyrirtækis eru fyrir
|
||||
@@ -2115,7 +1949,6 @@ STR_SV_STNAME_UPPER :Efri {STRING}
|
||||
STR_SV_STNAME_LOWER :Neðri {STRING}
|
||||
STR_SV_STNAME_HELIPORT :{STRING} Þyrlupallur
|
||||
STR_SV_STNAME_FOREST :{STRING} Skógur
|
||||
STR_SV_STNAME_FALLBACK :{STRING} Stöð #{NUM}
|
||||
|
||||
############ end of savegame specific region!
|
||||
|
||||
@@ -2152,7 +1985,6 @@ STR_CITY_APPROVAL :{LTBLUE}Afstað
|
||||
############ range for difficulty settings ends
|
||||
|
||||
STR_NONE :Engin
|
||||
STR_NUM_VERY_LOW :Mjög lág
|
||||
STR_6816_LOW :Fáir
|
||||
STR_6817_NORMAL :Miðlungs
|
||||
STR_6818_HIGH :Margir
|
||||
@@ -2311,11 +2143,6 @@ STR_RELOCATE_HQ :{BLACK}Flytja H
|
||||
STR_COMPANY_PASSWORD :{BLACK}Lykilorð
|
||||
STR_COMPANY_PASSWORD_TOOLTIP :{BLACK}Til að vernda fyrirtæki þitt frá óboðnum notendum geturðu sett lykilorð á það
|
||||
STR_SET_COMPANY_PASSWORD :{BLACK}Setja lykilorð á fyrirtæki
|
||||
STR_COMPANY_PASSWORD_CANCEL :{BLACK}Ekki vista innslegið lykilorð
|
||||
STR_COMPANY_PASSWORD_OK :{BLACK}Læsa fyrirtækinu með nýja lykilorðinu
|
||||
STR_COMPANY_PASSWORD_CAPTION :{WHITE}Lykilorð fyrirtækis
|
||||
STR_MAKE_DEFAULT_COMPANY_PASSWORD :{BLACK}Sjálfgefið lykilorð fyrirtækis
|
||||
STR_MAKE_DEFAULT_COMPANY_PASSWORD_TIP :{BLACK}Nota lykilorð þessa fyrirtækis sem sjálfgefið fyrir ný fyrirtæki
|
||||
STR_7073_WORLD_RECESSION_FINANCIAL :{BIGFONT}{BLACK}Heimssamdráttur!{}{}Hagfræðingar hræddir um efnahagshrun!
|
||||
STR_7074_RECESSION_OVER_UPTURN_IN :{BIGFONT}{BLACK}Samdráttur!{}{}Uppslag í viðskiptum gefur bjartari von um betri efnahag!
|
||||
STR_7075_TOGGLE_LARGE_SMALL_WINDOW :{BLACK}Stækka/smækka gluggastærð
|
||||
@@ -2341,8 +2168,6 @@ STR_LIVERY_EMU :Fjölvagna rafm
|
||||
STR_LIVERY_PASSENGER_WAGON_STEAM :Farþegavagn (Gufu)
|
||||
STR_LIVERY_PASSENGER_WAGON_DIESEL :Farþegavagn (Dísel)
|
||||
STR_LIVERY_PASSENGER_WAGON_ELECTRIC :Farþegavagn (Rafmagns)
|
||||
STR_LIVERY_PASSENGER_WAGON_MONORAIL :Farþegavagn (einteinungslest)
|
||||
STR_LIVERY_PASSENGER_WAGON_MAGLEV :Farþegavagn (segulsviflest)
|
||||
STR_LIVERY_FREIGHT_WAGON :Flutningsvagnar
|
||||
STR_LIVERY_BUS :Strætó
|
||||
STR_LIVERY_TRUCK :Flutningabílar
|
||||
@@ -2351,8 +2176,6 @@ STR_LIVERY_FREIGHT_SHIP :Flutningsskip
|
||||
STR_LIVERY_HELICOPTER :Þyrlur
|
||||
STR_LIVERY_SMALL_PLANE :Flugvélar
|
||||
STR_LIVERY_LARGE_PLANE :Þotur
|
||||
STR_LIVERY_PASSENGER_TRAM :Farþegasporvagn
|
||||
STR_LIVERY_FREIGHT_TRAM :Farmsporvagn
|
||||
|
||||
STR_LIVERY_GENERAL_TIP :{BLACK}Grunnlitur fyrirtækis
|
||||
STR_LIVERY_TRAIN_TIP :{BLACK}Litaskema lesta
|
||||
@@ -2653,13 +2476,6 @@ STR_SERVICE_AT_TRAIN_DEPOT :Viðgerð í {T
|
||||
STR_880F_GO_NON_STOP_TO_TRAIN_DEPOT :Fer viðstöðulaust til {TOWN} Lestar Byggingar
|
||||
STR_SERVICE_NON_STOP_AT_TRAIN_DEPOT :Viðgerð viðstöðulaust í {TOWN} Lestar Byggingu
|
||||
|
||||
STR_TIMETABLE_GO_TO :{STRING} {STRING}
|
||||
STR_TIMETABLE_TRAVEL_NOT_TIMETABLED :Ferðalag (ekki sett í áætlun)
|
||||
STR_TIMETABLE_TRAVEL_FOR :Ferðast í {STRING}
|
||||
STR_TIMETABLE_STAY_FOR :og bíða í {STRING}
|
||||
STR_TIMETABLE_DAYS :{COMMA} dag{P "" a}
|
||||
STR_TIMETABLE_TICKS :{COMMA} sl{P ag ög}
|
||||
|
||||
STR_HEADING_FOR_TRAIN_DEPOT :{ORANGE}Á leið í {TOWN} Lestar Byggingu
|
||||
STR_HEADING_FOR_TRAIN_DEPOT_VEL :{ORANGE}Á leið í {TOWN} Lestar Byggingu, {VELOCITY}
|
||||
STR_HEADING_FOR_TRAIN_DEPOT_SERVICE :{LTBLUE}Viðhald í {TOWN} lestaskýli
|
||||
@@ -2701,8 +2517,6 @@ STR_8828_UNLOAD :{BLACK} Afferma
|
||||
STR_REFIT :{BLACK}Breyta
|
||||
STR_REFIT_TIP :{BLACK}Veldu farm til að breyta í. CTRL smelltu til að fjarlægja breytiskipun
|
||||
STR_REFIT_ORDER :(Breyta í {STRING})
|
||||
STR_TIMETABLE_VIEW :{BLACK}Áætlun
|
||||
STR_TIMETABLE_VIEW_TOOLTIP :{BLACK}Skipta yfir í áætlanasýn
|
||||
STR_8829_ORDERS :{WHITE}{VEHICLE} (Skipanir)
|
||||
STR_882A_END_OF_ORDERS :{SETX 10}- - Endi skipana - -
|
||||
STR_FULLLOAD_OR_SERVICE :{SKIP}{SKIP}{STRING}
|
||||
@@ -2719,9 +2533,6 @@ STR_8832_TOO_MANY_ORDERS :{WHITE}Of marga
|
||||
STR_8833_CAN_T_INSERT_NEW_ORDER :{WHITE}Get ekki bætt við nýrri skipun...
|
||||
STR_8834_CAN_T_DELETE_THIS_ORDER :{WHITE}Get ekki eytt þessari skipun...
|
||||
STR_8835_CAN_T_MODIFY_THIS_ORDER :{WHITE}Get ekki breytt þessari skipun...
|
||||
STR_CAN_T_MOVE_THIS_ORDER :{WHITE}Get ekki fært þessa skipun...
|
||||
STR_CAN_T_SKIP_ORDER :{WHITE}Get ekki sleppt núverandi skipun...
|
||||
STR_CAN_T_SKIP_TO_ORDER :{WHITE}Get ekki hoppað í valda skipun...
|
||||
STR_8837_CAN_T_MOVE_VEHICLE :{WHITE}Get ekki fært farartæki...
|
||||
STR_REAR_ENGINE_FOLLOW_FRONT_ERROR :{WHITE}Aftari dráttarvagn fylgir alltaf fremri hluta
|
||||
STR_8838_N_A :N/A{SKIP}
|
||||
@@ -2753,16 +2564,11 @@ STR_8850_SHOW_DETAILS_OF_TRAIN_VEHICLES :{BLACK}Sýna n
|
||||
STR_8851_SHOW_CAPACITIES_OF_EACH :{BLACK}Sýna burðargetu hvers farartækis
|
||||
STR_SHOW_TOTAL_CARGO :{BLACK}Sýna heildar burðargetu lestar, raðar eftir tegund farms
|
||||
STR_8852_ORDERS_LIST_CLICK_ON_ORDER :{BLACK}Áætlun - smelltu til að velja stöð. CTRL + músartakki færir sjónarhorn að stöðinni
|
||||
STR_8853_SKIP_THE_CURRENT_ORDER :{BLACK}Sleppa núverandi skipun og fara í þá næstu. CTRL + smella sleppir valdri skipun
|
||||
STR_8854_DELETE_THE_HIGHLIGHTED :{BLACK}Eyða valdri skipun
|
||||
STR_8855_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Gera valda skipun viðstöðulausa
|
||||
STR_8856_INSERT_A_NEW_ORDER_BEFORE :{BLACK}Skeyta inn nýrri skipun á undan valdri skipun, eða bæta við á enda listans
|
||||
STR_8857_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Neyða lest til að bíða eftir fullum farmi í valdri skipun
|
||||
STR_8858_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Neyða lest til að afferma sig í valdri skipun
|
||||
STR_TIMETABLE_TOOLTIP :{BLACK}Áætlun - smelltu á skipun til að velja hana.
|
||||
STR_TIMETABLE_WAIT_TIME_TOOLTIP :{BLACK}Breyta tímanum sem valin skipun ætti að taka
|
||||
STR_TIMETABLE_CLEAR_TIME_TOOLTIP :{BLACK}Hreinsa tímann fyrir valda skipun
|
||||
STR_TIMETABLE_RESET_LATENESS_TOOLTIP :{BLACK}Endurstilla seinkunarteljara, svo farartækið verði á réttum tíma
|
||||
STR_SERVICE_HINT :{BLACK}Sleppa þessarri skipun nema þörf sé á viðgerð
|
||||
STR_VEHICLE_INFO_COST_WEIGHT_SPEED_POWER :{BLACK}Verð: {CURRENCY} Þyngd: {WEIGHT_S}{}Hraði: {VELOCITY} Afl: {POWER}{}Rekstrarkostnaður: {CURRENCY} á ári{}Burðargeta: {CARGO}
|
||||
STR_885C_BROKEN_DOWN :{RED}Bilaður
|
||||
@@ -2784,8 +2590,6 @@ STR_886A_RENAME_TRAIN_VEHICLE_TYPE :{WHITE}Endursk
|
||||
STR_886B_CAN_T_RENAME_TRAIN_VEHICLE :{WHITE}Get ekki endurskírt lestargerð...
|
||||
STR_MAKE_THE_HIGHLIGHTED_ORDER :{BLACK}Lætur lestina losa farminn á valinni skipun
|
||||
STR_TRANSFER :{BLACK}Yfirfæra
|
||||
STR_CLEAR_TIME :{BLACK}Hreinsa tíma
|
||||
STR_RESET_LATENESS :{BLACK}Endurstilla seinkunnarteljara
|
||||
|
||||
STR_TRAIN_STOPPING :{RED}Stöðva
|
||||
STR_TRAIN_STOPPING_VEL :{RED}Stöðva, {VELOCITY}
|
||||
@@ -2793,25 +2597,6 @@ STR_INCOMPATIBLE_RAIL_TYPES :Ósamstæðir l
|
||||
STR_TRAIN_NO_POWER :{RED}Ekkert afl
|
||||
STR_TRAIN_START_NO_CATENARY :Á þetta lestarspor vantar rafmagnsvíra, lestin kemst ekki af stað
|
||||
|
||||
STR_NEW_VEHICLE_NOW_AVAILABLE :{BLACK}{BIGFONT}Ný {STRING} er nú fáanleg!
|
||||
STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT}{ENGINE}
|
||||
STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}Ný {STRING} er nú fáanleg! - {ENGINE}
|
||||
|
||||
STR_CAN_T_SELL_DESTROYED_VEHICLE :{WHITE}Get ekki selt ónýtt farartæki...
|
||||
STR_CAN_T_REFIT_DESTROYED_VEHICLE :{WHITE}Get ekki breytt ónýtu farartæki...
|
||||
|
||||
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Get ekki stillt áætlun farartækis...
|
||||
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Farartæki getur aðeins beðið við stöð.
|
||||
STR_TIMETABLE_NOT_STOPPING_HERE :{WHITE}Þetta farartæki mun ekki stoppa við þessa stöð.
|
||||
STR_TIMETABLE_CHANGE_TIME :{BLACK}Breyta tíma
|
||||
STR_TIMETABLE_STATUS_ON_TIME :Þetta farartæki er nú þegar á réttum tíma
|
||||
STR_TIMETABLE_STATUS_LATE :Þetta farartæki er {STRING} of seint
|
||||
STR_TIMETABLE_STATUS_EARLY :Þetta farartæki er {STRING} of fljótt
|
||||
STR_TIMETABLE_TOTAL_TIME :Það mun taka {STRING} að ljúka við þessa áætlun
|
||||
STR_TIMETABLE_TOTAL_TIME_INCOMPLETE :Það mun að minnsta kosti taka {STRING} að ljúka við þessa áætlun (ekki allar skipanir á áætlun)
|
||||
STR_TIMETABLE_AUTOFILL :{BLACK}Skrifa sjálfvirkt
|
||||
STR_TIMETABLE_AUTOFILL_TOOLTIP :{BLACK}Skrifa áætlunina sjálfvirkt með gildum úr fyrstu ferð
|
||||
|
||||
##id 0x9000
|
||||
STR_9000_ROAD_VEHICLE_IN_THE_WAY :{WHITE}Bíll fyrir
|
||||
STR_9001_ROAD_VEHICLES :{WHITE}{COMPANY} - {COMMA} Bílar
|
||||
@@ -2853,16 +2638,12 @@ STR_9025_CENTER_MAIN_VIEW_ON_ROAD :{BLACK}Miðja a
|
||||
STR_9026_ROAD_VEHICLE_SELECTION :{BLACK}Bifreiðalisti - ýttu á bifreið fyrir nánari upplýsingar
|
||||
STR_9027_BUILD_THE_HIGHLIGHTED_ROAD :{BLACK}Smíða valda bifreið
|
||||
STR_902A_COST_SPEED_RUNNING_COST :{BLACK}Verð: {CURRENCY}{}Hraði: {VELOCITY}{}Rekstrarkostnaður: {CURRENCY} á ári{}Burðargeta: {CARGO}
|
||||
STR_ARTICULATED_RV_CAPACITY :{BLACK}Rými: {LTBLUE}
|
||||
STR_BARE_CARGO :{CARGO}
|
||||
|
||||
STR_902C_NAME_ROAD_VEHICLE :{WHITE}Nefna bifreið
|
||||
STR_902D_CAN_T_NAME_ROAD_VEHICLE :{WHITE}Get ekki nefnt bifreið...
|
||||
STR_902E_NAME_ROAD_VEHICLE :{BLACK}Nefna bifreið
|
||||
STR_902F_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Bæjarbúar fagna . . .{}Fyrsti strætisvagn kemur við á {STATION}!
|
||||
STR_9030_CITIZENS_CELEBRATE_FIRST :{BLACK}{BIGFONT}Bæjarbúar fagna . . .{}Fyrsti vörubíll kemur við á {STATION}!
|
||||
STR_CITIZENS_CELEBRATE_FIRST_PASSENGER_TRAM :{BLACK}{BIGFONT}Bæjarbúar fagna . . .{}Fyrsti farþegasporvagn kemur við á {STATION}!
|
||||
STR_CITIZENS_CELEBRATE_FIRST_CARGO_TRAM :{BLACK}{BIGFONT}Bæjarbúar fagna . . .{}Fyrsti farmsporvagn kemur við á {STATION}!
|
||||
STR_9031_ROAD_VEHICLE_CRASH_DRIVER :{BLACK}{BIGFONT}Bílslys!{}Bílstjóri deyr í sprengingu eftir árekstur við lest
|
||||
STR_9032_ROAD_VEHICLE_CRASH_DIE :{BLACK}{BIGFONT}Bílslys!{}{COMMA} deyja í sprengingu eftir árekstur við lest
|
||||
STR_9033_CAN_T_MAKE_VEHICLE_TURN :{WHITE}Get ekki snúið bifreið við...
|
||||
@@ -3023,8 +2804,6 @@ STR_A042_CAN_T_REFIT_AIRCRAFT :{WHITE}Get ekki
|
||||
STR_GO_TO_AIRPORT_HANGAR :Fara í {STATION} flugskýli
|
||||
SERVICE_AT_AIRPORT_HANGAR :Skoða í {STATION} flugskýli
|
||||
|
||||
STR_TIMETABLE_TITLE :{WHITE}{VEHICLE} (Áætlun)
|
||||
|
||||
##id 0xB000
|
||||
STR_B000_ZEPPELIN_DISASTER_AT :{BLACK}{BIGFONT}Loftskipaslys á {STATION}!
|
||||
STR_B001_ROAD_VEHICLE_DESTROYED :{BLACK}{BIGFONT}Bifreið eyðilagðist í árekstri við FFH
|
||||
@@ -3078,19 +2857,6 @@ STR_NEWGRF_GRF_ID :{BLACK}GRF eink
|
||||
STR_NEWGRF_MD5SUM :{BLACK}MD5 summa: {SILVER}{STRING}
|
||||
STR_NEWGRF_CONFIRMATION_TEXT :{YELLOW}Þú ert í þann mund að eiga við leik í gangi, við það gæti OpenTTD hrunið.{}Ertu viss um að þú viljir halda áfram?
|
||||
|
||||
STR_NEWGRF_ERROR_MSG_INFO :{SILVER}{STRING}
|
||||
STR_NEWGRF_ERROR_MSG_WARNING :{RED}Aðvörun: {SILVER}{STRING}
|
||||
STR_NEWGRF_ERROR_MSG_ERROR :{RED}Villa: {SILVER}{STRING}
|
||||
STR_NEWGRF_ERROR_MSG_FATAL :{RED}Banvænt: {SILVER}{STRING}
|
||||
STR_NEWGRF_ERROR_VERSION_NUMBER :{STRING} Mun ekki virka með útgáfu TTDPatch sem OpenTTD gefur til kynna.
|
||||
STR_NEWGRF_ERROR_DOS_OR_WINDOWS :{STRING} er fyrir {STRING} útgáfu af TTD.
|
||||
STR_NEWGRF_ERROR_UNSET_SWITCH :{STRING} er hannað til að notast með {STRING}
|
||||
STR_NEWGRF_ERROR_INVALID_PARAMETER :Ógild færibreyta {STRING}: færibreyta {STRING} ({NUM})
|
||||
STR_NEWGRF_ERROR_LOAD_BEFORE :{STRING} verður að hlaðast á undan {STRING}.
|
||||
STR_NEWGRF_ERROR_LOAD_AFTER :{STRING} verður að hlaðast eftir {STRING}.
|
||||
STR_NEWGRF_ERROR_OTTD_VERSION_NUMBER :{STRING} þarf OpenTTD útgáfu {STRING} eða nýrri.
|
||||
STR_NEWGRF_ERROR_AFTER_TRANSLATED_FILE :GRF skránni sem það var hannað til að þýða
|
||||
STR_NEWGRF_ERROR_TOO_MANY_NEWGRFS_LOADED :Of mörg NewGRF eru hlaðin.
|
||||
|
||||
STR_NEWGRF_ADD :{BLACK}Bæta við
|
||||
STR_NEWGRF_ADD_TIP :{BLACK}Bæta NewGRF skrá við listann
|
||||
@@ -3119,8 +2885,6 @@ STR_NEWGRF_COMPATIBLE_LOADED :{ORANGE}Viðeig
|
||||
STR_NEWGRF_COMPATIBLE_LOAD_WARNING :{WHITE}Samsvarandi GRF hlaðið í staðin týndrar skrár
|
||||
STR_NEWGRF_DISABLED_WARNING :{WHITE}Týndar GRF skrár hafa verið gerðar óvirkar
|
||||
STR_NEWGRF_NOT_FOUND_WARNING :{WHITE}Vantar GRF skrár til að hægt sé að hlaða leik
|
||||
STR_NEWGRF_UNPAUSE_WARNING_TITLE :{YELLOW}Vantar GRF skrá(r)
|
||||
STR_NEWGRF_UNPAUSE_WARNING :{WHITE}OpenTTD getur hrunið ef leikur er settur af stað. Ekki skrá villufærslur fyrir eftirfarandi hrun.{}Ertu viss um að þú viljir setja leikinn af stað?
|
||||
|
||||
STR_CURRENCY_WINDOW :{WHITE}Sérvalinn gjaldeyrir
|
||||
STR_CURRENCY_EXCHANGE_RATE :{LTBLUE}Gengi: {ORANGE}{CURRENCY} = £ {COMMA}
|
||||
@@ -3153,7 +2917,6 @@ STR_VEH_WITH_SHARED_ORDERS_LIST_TIP :{BLACK}Sýna ö
|
||||
|
||||
### depot strings
|
||||
STR_DEPOT_SELL_CONFIRMATION_TEXT :{YELLOW}Þú ert í þann mund að selja öll farartækin. Viltu halda áfram?
|
||||
STR_DEPOT_WRONG_DEPOT_TYPE :Röng tegund skýlis
|
||||
|
||||
STR_DEPOT_SELL_ALL_BUTTON_TRAIN_TIP :{BLACK}Selja allar lestir í skýli
|
||||
STR_DEPOT_SELL_ALL_BUTTON_ROADVEH_TIP :{BLACK}Selja allar bifreiðar í skýli
|
||||
@@ -3191,10 +2954,6 @@ STR_REPLACE_REMOVE_WAGON :{BLACK}Selja le
|
||||
STR_REPLACE_REMOVE_WAGON_HELP :{BLACK}Heldur lengd lestar með því að fjarlægja vagna (framan frá) ef útskipting dráttarvagna myndi lengja hana.
|
||||
STR_REPLACE_ENGINE_WAGON_SELECT :{BLACK}Skipti út: {ORANGE}{SKIP}{SKIP}{STRING}
|
||||
STR_REPLACE_ENGINE_WAGON_SELECT_HELP :{BLACK} TILRAUNAEIGINLEIKI {}Skipta á milli útskiptiglugga dráttar- og flutningavagna.{}Útskipting vagna fer aðeins fram ef hægt er að breyta nýju vögnunum til að flytja sama farm og þeir gömlu. Það er kannað fyrir hvern vagn þegar útskipting á honum fer fram.
|
||||
STR_RAIL_VEHICLE_NOT_AVAILABLE :{WHITE}Lestarvagn er ekki fáanlegur
|
||||
STR_ROAD_VEHICLE_NOT_AVAILABLE :{WHITE}Bifreið er ekki fáanleg
|
||||
STR_SHIP_NOT_AVAILABLE :{WHITE}Skip er ekki fáanlegt
|
||||
STR_AIRCRAFT_NOT_AVAILABLE :{WHITE}Flugvél er ekki fáanleg
|
||||
|
||||
STR_ENGINES :Dráttarvagnar
|
||||
STR_WAGONS :Vagnar
|
||||
@@ -3245,12 +3004,6 @@ STR_PURCHASE_INFO_ALL_TYPES :Allar tegundir
|
||||
STR_PURCHASE_INFO_ALL_BUT :Allt nema {GOLD}
|
||||
STR_PURCHASE_INFO_MAX_TE :{BLACK}Hámarks : {GOLD}{FORCE}
|
||||
|
||||
########### For showing numbers in widgets
|
||||
|
||||
STR_NUM_1 :{BLACK}{SKIP}{NUM}
|
||||
STR_NUM_2 :{BLACK}{SKIP}{SKIP}{NUM}
|
||||
STR_NUM_3 :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}
|
||||
|
||||
########### String for New Landscape Generator
|
||||
|
||||
STR_GENERATE :{WHITE}Mynda land
|
||||
@@ -3276,8 +3029,6 @@ STR_SNOW_LINE_QUERY_CAPT :{WHITE}Breyta h
|
||||
STR_START_DATE_QUERY_CAPT :{WHITE}Breyta upphafsári
|
||||
STR_HEIGHTMAP_SCALE_WARNING_CAPTION :{WHITE}Stærð hæðarlínukorts
|
||||
STR_HEIGHTMAP_SCALE_WARNING_MESSAGE :{YELLOW}Ekki er mælt með því að breyta stærð grunnkorts of mikið. Viltu halda áfram?
|
||||
STR_TOWN_LAYOUT_WARNING_CAPTION :{WHITE}Vegaskipulagsaðvörun
|
||||
STR_TOWN_LAYOUT_WARNING_MESSAGE :{YELLOW}Vegaskipulagið „ekki fleiri vegi“ er óráðlegt. Halda myndun áfram?
|
||||
STR_HEIGHTMAP_NAME :{BLACK}Nafn hæðarlínukorts:
|
||||
STR_HEIGHTMAP_SIZE :{BLACK}Stærð: {ORANGE}{NUM} x {NUM}
|
||||
STR_GENERATION_WORLD :{WHITE}Skapa heim...
|
||||
@@ -3305,7 +3056,6 @@ STR_FLAT_WORLD_HEIGHT_QUERY_CAPT :{WHITE}Breyta h
|
||||
STR_FLAT_WORLD_HEIGHT :{BLACK}Hæð slétts lands yfir sjávarmáli
|
||||
|
||||
STR_SMALLMAP_CENTER :{BLACK}Miðja heimskort á núverandi staðsetningu
|
||||
STR_SMALLMAP_INDUSTRY :{TINYFONT}{STRING} ({NUM})
|
||||
|
||||
########### String for new airports
|
||||
STR_SMALL_AIRPORT :{BLACK}Lítill flugvöllur
|
||||
@@ -3331,149 +3081,5 @@ STR_MEASURE_LENGTH_HEIGHTDIFF :{BLACK}Lengd: {
|
||||
STR_MEASURE_AREA_HEIGHTDIFF :{BLACK}Svæði: {NUM} x {NUM}{}Hæðarmunur: {NUM} m
|
||||
|
||||
############ Date formatting
|
||||
STR_DATE_TINY :{STRING}-{STRING}-{NUM}
|
||||
STR_DATE_SHORT :{STRING} {NUM}
|
||||
STR_DATE_LONG :{STRING} {STRING} {NUM}
|
||||
|
||||
########
|
||||
|
||||
STR_DRIVE_THROUGH_ERROR_ON_TOWN_ROAD :{WHITE}...vegurinn er í eigu bæjar
|
||||
STR_DRIVE_THROUGH_ERROR_DIRECTION :{WHITE}...vegurinn snýr í ranga átt
|
||||
|
||||
STR_TRANSPARENCY_TOOLB :{WHITE}Stilling gegnsæjis
|
||||
STR_TRANSPARENT_SIGNS_DESC :{BLACK}Virkja/afvirkja gegnsæji stöðvaskiltia. CTRL+smella til að læsa.
|
||||
STR_TRANSPARENT_TREES_DESC :{BLACK}Virkja/afvirkja gegnsæji trjáa. CTRL+smella til að læsa.
|
||||
STR_TRANSPARENT_HOUSES_DESC :{BLACK}Virkja/afvirkja gegnsæji húsa. CTRL+smella til að læsa.
|
||||
STR_TRANSPARENT_INDUSTRIES_DESC :{BLACK}Virkja/afvirkja gegnsæji iðnaða. CTRL+smella til að læsa.
|
||||
STR_TRANSPARENT_BUILDINGS_DESC :{BLACK}Virkja/afvirkja gegnsæji bygginga á borð við stöðvar, skýli og veghlið. CTRL+smella til að læsa.
|
||||
STR_TRANSPARENT_BRIDGES_DESC :{BLACK}Virkja/afvirkja gegnsæji brúa. CTRL+smella til að læsa.
|
||||
STR_TRANSPARENT_STRUCTURES_DESC :{BLACK}Virkja/afvirkja gegnsæji bygginga á borð við vita og möstur. CTRL+smella til að læsa.
|
||||
STR_TRANSPARENT_CATENARY_DESC :{BLACK}Virkja/afvirkja gegnsæji raflína. CTRL+smella til að læsa.
|
||||
STR_TRANSPARENT_LOADING_DESC :{BLACK}Virkja/afvirkja gegnsæji hleðslumæla. CTRL+smella til að læsa.
|
||||
|
||||
STR_PERCENT_UP_SMALL :{TINYFONT}{WHITE}{NUM}%{UPARROW}
|
||||
STR_PERCENT_UP :{WHITE}{NUM}%{UPARROW}
|
||||
STR_PERCENT_DOWN_SMALL :{TINYFONT}{WHITE}{NUM}%{DOWNARROW}
|
||||
STR_PERCENT_DOWN :{WHITE}{NUM}%{DOWNARROW}
|
||||
STR_PERCENT_UP_DOWN_SMALL :{TINYFONT}{WHITE}{NUM}%{UPARROW}{DOWNARROW}
|
||||
STR_PERCENT_UP_DOWN :{WHITE}{NUM}%{UPARROW}{DOWNARROW}
|
||||
|
||||
##### Mass Order
|
||||
STR_GROUP_NAME_FORMAT :Hópur {COMMA}
|
||||
STR_GROUP_TINY_NAME :{TINYFONT}{GROUP}
|
||||
STR_GROUP_ALL_TRAINS :Allar lestir
|
||||
STR_GROUP_ALL_ROADS :Allar bifreiðir
|
||||
STR_GROUP_ALL_SHIPS :Öll skip
|
||||
STR_GROUP_ALL_AIRCRAFTS :Allar flugvélar
|
||||
STR_GROUP_DEFAULT_TRAINS :Hóplausar lestir
|
||||
STR_GROUP_DEFAULT_ROADS :Hóplausar bifreiðir
|
||||
STR_GROUP_DEFAULT_SHIPS :Hóplaus skip
|
||||
STR_GROUP_DEFAULT_AIRCRAFTS :Hóplausar flugvélar
|
||||
STR_GROUP_TINY_NUM :{TINYFONT}{COMMA}
|
||||
STR_GROUP_ADD_SHARED_VEHICLE :Bæta við deildu farartæki
|
||||
STR_GROUP_REMOVE_ALL_VEHICLES :Fjarlægja öll farartæki
|
||||
|
||||
STR_GROUP_TRAINS_CAPTION :{WHITE}{GROUP} - {COMMA} Lest{P "" ir}
|
||||
STR_GROUP_ROADVEH_CAPTION :{WHITE}{GROUP} - {COMMA} Bifreið{P "" ar}
|
||||
STR_GROUP_SHIPS_CAPTION :{WHITE}{GROUP} - {COMMA} Skip
|
||||
STR_GROUP_AIRCRAFTS_CAPTION :{WHITE}{GROUP} - {COMMA} Flugvél{P "" ar}
|
||||
STR_GROUP_RENAME_CAPTION :{BLACK}Endurnefna hóp
|
||||
STR_GROUP_REPLACE_CAPTION :{WHITE}Skipta út farartækjum í „{GROUP}“
|
||||
|
||||
STR_GROUP_CAN_T_CREATE :{WHITE}Get ekki búið til hóp...
|
||||
STR_GROUP_CAN_T_DELETE :{WHITE}Get ekki eytt þessum hópi...
|
||||
STR_GROUP_CAN_T_RENAME :{WHITE}Get ekki endurnefnt hóp...
|
||||
STR_GROUP_CAN_T_REMOVE_ALL_VEHICLES :{WHITE}Get ekki fjarlægt öll farartæki úr þessum hóp...
|
||||
STR_GROUP_CAN_T_ADD_VEHICLE :{WHITE}Get ekki bætt farartækinu við þennan hóp...
|
||||
STR_GROUP_CAN_T_ADD_SHARED_VEHICLE :{WHITE}Get ekki bætt við deildu farartæki við hóp...
|
||||
|
||||
STR_GROUPS_CLICK_ON_GROUP_FOR_TIP :{BLACK}Hópar - Smelltu á hóp til að skrifa öll farartæki í þessum hóp
|
||||
STR_GROUP_CREATE_TIP :{BLACK}Smelltu til að búa til hóp
|
||||
STR_GROUP_DELETE_TIP :{BLACK}Eyða völdum hóp
|
||||
STR_GROUP_RENAME_TIP :{BLACK}Endurnefna valdan hóp
|
||||
STR_GROUP_REPLACE_PROTECTION_TIP :{BLACK}Smelltu til að halda þessum hóp frá sjálfvirkri uppfærslu
|
||||
|
||||
STR_COMPANY_NAME :{COMPANY}
|
||||
STR_ENGINE_NAME :{ENGINE}
|
||||
STR_GROUP_NAME :{GROUP}
|
||||
STR_PLAYER_NAME :{PLAYERNAME}
|
||||
STR_SIGN_NAME :{SIGN}
|
||||
STR_VEHICLE_NAME :{VEHICLE}
|
||||
|
||||
STR_NAME_MUST_BE_UNIQUE :{WHITE}Nafnið verður að vera sérstætt
|
||||
|
||||
#### Improved sign GUI
|
||||
STR_NEXT_SIGN_TOOLTIP :{BLACK}Fara að næsta skilti
|
||||
STR_PREVIOUS_SIGN_TOOLTIP :{BLACK}Fara að fyrra skilti
|
||||
|
||||
########
|
||||
|
||||
STR_FUND_NEW_INDUSTRY :{BLACK}Fjármagna
|
||||
STR_PROSPECT_NEW_INDUSTRY :{BLACK}Horfur
|
||||
STR_BUILD_NEW_INDUSTRY :{BLACK}Reisa
|
||||
STR_INDUSTRY_SELECTION_HINT :{BLACK}Veldu viðeigandi iðnað úr listanum
|
||||
|
||||
############ Face formatting
|
||||
STR_FACE_ADVANCED :{BLACK}Ítarlegt
|
||||
STR_FACE_ADVANCED_TIP :{BLACK}Ítarleg breyting andlits
|
||||
STR_FACE_SIMPLE :{BLACK}Einfalt
|
||||
STR_FACE_SIMPLE_TIP :{BLACK}Einföld breyting andlits
|
||||
STR_FACE_LOAD :{BLACK}Hlaða
|
||||
STR_FACE_LOAD_TIP :{BLACK}Hlaða uppáhalds andliti
|
||||
STR_FACE_LOAD_DONE :{WHITE}Uppáhalds andlitinu þínu hefur verið hlaðið úr stilliskrá OpenTTD.
|
||||
STR_FACE_FACECODE :{BLACK}Andlit nr.
|
||||
STR_FACE_FACECODE_TIP :{BLACK}Skoða og/eða stilla andlitsnúmer
|
||||
STR_FACE_FACECODE_CAPTION :{WHITE}Skoða og/eða stilla andlitsnúmer
|
||||
STR_FACE_FACECODE_SET :{WHITE}Nýtt andlitsnúmer hefur verið stillt.
|
||||
STR_FACE_FACECODE_ERR :{WHITE}Gat ekki stillt andlitsnúmer - verður að vera tala á bilinu 0 og upp í 4.294.967.295!
|
||||
STR_FACE_SAVE :{BLACK}Vista
|
||||
STR_FACE_SAVE_TIP :{BLACK}Vista uppáhalds andlit
|
||||
STR_FACE_SAVE_DONE :{WHITE}Þetta andlit verður vistað sem þitt uppáhalds í stilliskrá OpenTTD.
|
||||
STR_FACE_EUROPEAN :{BLACK}Evrópskt
|
||||
STR_FACE_SELECT_EUROPEAN :{BLACK}Velur evrópskt útlit
|
||||
STR_FACE_AFRICAN :{BLACK}Afrískt
|
||||
STR_FACE_SELECT_AFRICAN :{BLACK}Velur afrískt útlit
|
||||
STR_FACE_YES :Já
|
||||
STR_FACE_NO :Nei
|
||||
STR_FACE_MOUSTACHE_EARRING_TIP :{BLACK}Virkja yfirvaraskegg eða eyrnalokk
|
||||
STR_FACE_HAIR :Hár:
|
||||
STR_FACE_HAIR_TIP :{BLACK}Breyta hári
|
||||
STR_FACE_EYEBROWS :Augabrúnir:
|
||||
STR_FACE_EYEBROWS_TIP :{BLACK}Breyta augabrúnum
|
||||
STR_FACE_EYECOLOUR :Augnlitur:
|
||||
STR_FACE_EYECOLOUR_TIP :{BLACK}Breyta augnlit
|
||||
STR_FACE_GLASSES :Gleraugu:
|
||||
STR_FACE_GLASSES_TIP :{BLACK}Velja/afvelja gleraugu
|
||||
STR_FACE_GLASSES_TIP_2 :{BLACK}Breyta gleraugum
|
||||
STR_FACE_NOSE :Nef:
|
||||
STR_FACE_NOSE_TIP :{BLACK}Breyta nefi
|
||||
STR_FACE_LIPS :Varir:
|
||||
STR_FACE_MOUSTACHE :Yfirvaraskegg:
|
||||
STR_FACE_LIPS_MOUSTACHE_TIP :{BLACK}Breyta vörum eða yfirvaraskeggi
|
||||
STR_FACE_CHIN :Vangar:
|
||||
STR_FACE_CHIN_TIP :{BLACK}Breyta vöngum
|
||||
STR_FACE_JACKET :Jakki:
|
||||
STR_FACE_JACKET_TIP :{BLACK}Breyta jakka
|
||||
STR_FACE_COLLAR :Kragi:
|
||||
STR_FACE_COLLAR_TIP :{BLACK}Breyta kraga
|
||||
STR_FACE_TIE :Bindi:
|
||||
STR_FACE_EARRING :Eyrnalokkur:
|
||||
STR_FACE_TIE_EARRING_TIP :{BLACK}Breyta bindi eða eyrnalokk
|
||||
########
|
||||
|
||||
############ signal GUI
|
||||
STR_SIGNAL_SELECTION :{WHITE}Lestaljós
|
||||
STR_SIGNAL_CAN_T_CONVERT_SIGNALS_HERE :{WHITE}Get ekki breytt ljósum hér...
|
||||
STR_BUILD_SIGNAL_SEMAPHORE_NORM_TIP :{BLACK}Hefðbundin merki{}Merki eru nauðsynleg til að koma í veg fyrir að lestir lendi í árekstri.
|
||||
STR_BUILD_SIGNAL_SEMAPHORE_ENTRY_TIP :{BLACK}Komumerki{}Hleypir í gegn uns ekkert frámerki er eftir opið.
|
||||
STR_BUILD_SIGNAL_SEMAPHORE_EXIT_TIP :{BLACK}Frámerki{}Virkar eins og hefðbundið merki en er nauðsynlegt til að fá rétta virkni fyrir komu- og fjölmerki.
|
||||
STR_BUILD_SIGNAL_SEMAPHORE_COMBO_TIP :{BLACK}Fjölmerki{}Fjölmerkin virka bæði sem komu- og frámerki sem gerir þér kleyft að hanna stór „tré“ af formerkjum.
|
||||
STR_BUILD_SIGNAL_ELECTRIC_NORM_TIP :{BLACK}Hefðbundin ljós{}Ljós eru nauðsynleg til að koma í veg fyrir að lestir lendi í árekstri.
|
||||
STR_BUILD_SIGNAL_ELECTRIC_ENTRY_TIP :{BLACK}Komuljós{}Hleypir í gegn uns ekkert fráljós er lengur grænt.
|
||||
STR_BUILD_SIGNAL_ELECTRIC_EXIT_TIP :{BLACK}Fráljós{}Virkar eins og hefðbundið ljós en er naðusynlegt til að fá rétta virkni fyrir komu- og fjölljós.
|
||||
STR_BUILD_SIGNAL_ELECTRIC_COMBO_TIP :{BLACK}Fjölljós{}Fjölljósið virkar bæði sem komu- og fráljós sem gerir þér kleyft að hanna stór „tré“ af forljósum.
|
||||
STR_SIGNAL_CONVERT_TIP :{BLACK}Breyting ljósa{}Þegar valið þá breytist merki sem til er fyrir í valda gerð og tegund. CTRL-smellur mun rúlla í gegnum núverandi tegund.
|
||||
STR_DRAG_SIGNALS_DENSITY_TIP :{BLACK}Þéttleiki dreginna ljósa
|
||||
STR_DRAG_SIGNALS_DENSITY_DECREASE_TIP :{BLACK}Minnka þéttleika dreginna ljósa
|
||||
STR_DRAG_SIGNALS_DENSITY_INCREASE_TIP :{BLACK}Auka þéttleika dreginna ljósa
|
||||
########
|
||||
|
||||
@@ -1052,7 +1052,6 @@ STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE :{LTBLUE}Consent
|
||||
STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY :{LTBLUE}Consenti l'invio di denaro ad altre compagnie: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}Stazioni non uniformi: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}Moltiplicatore di peso per simulare treni merci pesanti: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PLANE_SPEED :{LTBLUE}Fattore di velocità degli aeromobili: {ORANGE}1 / {STRING}
|
||||
STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD :{LTBLUE}Consenti fermate passanti sulle strade delle città: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ADJACENT_STATIONS :{LTBLUE}Consenti la costruzione di stazioni adiacenti: {ORANGE}{STRING}
|
||||
|
||||
@@ -1614,7 +1613,6 @@ STR_1004_TOO_HIGH :{WHITE}Troppo a
|
||||
STR_1005_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Tipo di binari non adatti
|
||||
STR_1007_ALREADY_BUILT :{WHITE}...già costruito
|
||||
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Bisogna demolire i binari prima
|
||||
STR_ERR_CROSSING_ON_ONEWAY_ROAD :{WHITE}La strada è bloccata o a senso unico
|
||||
STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Costruzione ferrovie
|
||||
STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Costruzione ferrovie elettrificate
|
||||
STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Costruzione monorotaia
|
||||
@@ -1717,7 +1715,6 @@ STR_2002 :{TINYFONT}{BLAC
|
||||
STR_2002_WHITE :{TINYFONT}{WHITE}{SIGN}
|
||||
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}L'edificio deve essere demolito prima
|
||||
STR_2005 :{WHITE}{TOWN}
|
||||
STR_CITY :{WHITE}{TOWN} (Metropoli)
|
||||
STR_2006_POPULATION :{BLACK}Popolazione: {ORANGE}{COMMA}{BLACK} Case: {ORANGE}{COMMA}
|
||||
STR_2007_RENAME_TOWN :Rinomina città
|
||||
STR_2008_CAN_T_RENAME_TOWN :{WHITE}Impossibile rinominare la città...
|
||||
|
||||
@@ -1051,7 +1051,6 @@ STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE :{LTBLUE}독점
|
||||
STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY :{LTBLUE}다른 회사에게 돈을 송금하는 것을 허용: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}이미 지어진 역에 추가로 역을 증축하는 것을 허용 : {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}무거운 열차를 운행하기 위해 화물에 무게를 가함 : {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PLANE_SPEED :{LTBLUE}비행기 속도 인수: {ORANGE}1 / {STRING}
|
||||
STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD :{LTBLUE}마을이 소유중인 도로를 통과하는 버스 정류장 건설 허용: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ADJACENT_STATIONS :{LTBLUE}정거장 근처에 건물 짓기 허용: {ORANGE}{STRING}
|
||||
|
||||
@@ -1613,7 +1612,6 @@ STR_1004_TOO_HIGH :{WHITE}너무
|
||||
STR_1005_NO_SUITABLE_RAILROAD_TRACK :{WHITE}알맞지 않은 철로입니다.
|
||||
STR_1007_ALREADY_BUILT :{WHITE}...이미 지어져있습니다
|
||||
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}철로를 먼저 제거하십시오
|
||||
STR_ERR_CROSSING_ON_ONEWAY_ROAD :{WHITE}도로가 일방통행이거나 막혔습니다
|
||||
STR_100A_RAILROAD_CONSTRUCTION :{WHITE}철도 건설
|
||||
STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}전기철도 건설
|
||||
STR_100B_MONORAIL_CONSTRUCTION :{WHITE}모노레일 건설
|
||||
@@ -1716,7 +1714,6 @@ STR_2002 :{TINYFONT}{BLAC
|
||||
STR_2002_WHITE :{TINYFONT}{WHITE}{SIGN}
|
||||
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}건물을 먼저 제거하십시오!
|
||||
STR_2005 :{WHITE}{TOWN}
|
||||
STR_CITY :{WHITE}{TOWN} (도시)
|
||||
STR_2006_POPULATION :{BLACK}인구: {ORANGE}{COMMA}{BLACK} 가구수: {ORANGE}{COMMA}
|
||||
STR_2007_RENAME_TOWN :도시 이름 변경
|
||||
STR_2008_CAN_T_RENAME_TOWN :{WHITE}도시 이름을 바꿀 수 없습니다...
|
||||
|
||||
+6
-21
@@ -1019,7 +1019,7 @@ STR_CONFIG_PATCHES_OFF :Desligado
|
||||
STR_CONFIG_PATCHES_ON :Ligado
|
||||
STR_CONFIG_PATCHES_VEHICLESPEED :{LTBLUE}Mostrar velocidade do veículo na barra de estado: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_BUILDONSLOPES :{LTBLUE}Permitir a construção em declives e encostas: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_AUTOSLOPE :{LTBLUE}Permitir formação de terra em construções (auto-declive): {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_AUTOSLOPE :{LTBLUE}Permitir formação de terra em construções, linhas, etc. (auto-declive): {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_CATCHMENT :{LTBLUE}Dimensionamento mais realista de áreas de abrangência: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_EXTRADYNAMITE :{LTBLUE}Permitir remoção de mais estradas, pontes, etc: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_MAMMOTHTRAINS :{LTBLUE}Permitir a construção de comboios muito longos: {ORANGE}{STRING}
|
||||
@@ -1050,7 +1050,6 @@ STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE :{LTBLUE}Permiti
|
||||
STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY :{LTBLUE}Permitir enviar dinheiro para outras empresas: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}Estações não uniformes: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}Multiplicador de peso para simular comboios pesados: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PLANE_SPEED :{LTBLUE}Factor de velocidade de aviões: {ORANGE}1 / {STRING}
|
||||
STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD :{LTBLUE}Permitir estações de passagem em estradas das cidades: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ADJACENT_STATIONS :{LTBLUE}Permitir construção de estações adjacentes: {ORANGE}{STRING}
|
||||
|
||||
@@ -1094,7 +1093,7 @@ STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}Manuten
|
||||
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Ligar ferramentas de paisagem com as de construção: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_REVERSE_SCROLLING :{LTBLUE}Ao deslizar com o rato, mover a vista na direcção oposta: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_SMOOTH_SCROLLING :{LTBLUE}Suavizar deslocamento da navegação no mapa: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_MEASURE_TOOLTIP :{LTBLUE}Mostrar medidas nas várias ferramentas de construção: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_MEASURE_TOOLTIP :{LTBLUE}Mostrar as medidas nas várias ferramentas de construção: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_LIVERIES :{LTBLUE}Mostrar estampagens da companhia: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_LIVERIES_NONE :Nenhum
|
||||
STR_CONFIG_PATCHES_LIVERIES_OWN :Própria companhia
|
||||
@@ -1122,7 +1121,7 @@ STR_CONFIG_PATCHES_LOADING_INDICATORS_OWN :Própria empres
|
||||
STR_CONFIG_PATCHES_LOADING_INDICATORS_ALL :Todas as empresas
|
||||
STR_CONFIG_PATCHES_TIMETABLE_ALLOW :{LTBLUE}Activar plano de horários para veículos: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_TIMETABLE_IN_TICKS :{LTBLUE}Mostrar horário em tics em vez dias: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE :{LTBLUE}Tipo padrão de ferrovia (ao criar ou carregar): {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE :{LTBLUE}Tipo padrão de ferrovia (ao criar ou carregar jogo): {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_RAIL :Linha Normal
|
||||
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_ELRAIL :Linha Electrificada
|
||||
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MONORAIL :Monorail
|
||||
@@ -1131,7 +1130,7 @@ STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_FIRST :Primeiro dispon
|
||||
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_LAST :Último disponível
|
||||
STR_CONFIG_PATCHES_DEFAULT_RAIL_TYPE_MOST_USED :Mais utilizado
|
||||
|
||||
STR_CONFIG_PATCHES_ALWAYS_BUILD_INFRASTRUCTURE :{LTBLUE}Mostrar ferram. de construção se não houver veículos adequados: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ALWAYS_BUILD_INFRASTRUCTURE :{LTBLUE}Mostrar ferramentas de construção quando não existirem veículos adequeados: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_MAX_TRAINS :{LTBLUE}Máximo de comboios por jogador: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_MAX_ROADVEH :{LTBLUE}Máximo de veículos de estrada por jogador: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_MAX_AIRCRAFT :{LTBLUE}Máximo de aeronaves por jogador: {ORANGE}{STRING}
|
||||
@@ -1205,18 +1204,6 @@ STR_CONFIG_PATCHES_CURRENCY :{CURRENCY}
|
||||
STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Alterar valor
|
||||
STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Alguns ou todos os intervalo(s) de serviço predefinidos abaixo são incompatíveis com o valor escolhido! São válidos 5-90% e 30-800 dias
|
||||
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Sistema de encontrar caminho para comboios: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Não recomendado)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NPF :NPF
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_YAPF :YAPF {BLUE}(Recomendado)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH :{LTBLUE}Sistema de encontrar caminho para veículos: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_OPF :Original {RED}(Não recomendado)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_NPF :NPF
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_YAPF :YAPF {BLUE}(Recomendado)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS :{LTBLUE}Sistema de encontrar caminho para barcos: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_OPF :Original {BLUE}(Recomendado)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_NPF :NPF
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_YAPF :YAPF {RED}(Não recomendado)
|
||||
|
||||
STR_TEMPERATE_LANDSCAPE :Terreno temperado
|
||||
STR_SUB_ARCTIC_LANDSCAPE :terreno subárctico
|
||||
@@ -1612,7 +1599,6 @@ STR_1004_TOO_HIGH :{WHITE}Demasiad
|
||||
STR_1005_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Tipo de linha não apropriado
|
||||
STR_1007_ALREADY_BUILT :{WHITE}...já construído
|
||||
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Deverá remover a linha férrea primeiro
|
||||
STR_ERR_CROSSING_ON_ONEWAY_ROAD :{WHITE}Estrada de sentido único ou bloqueada
|
||||
STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Construir caminhos-de-ferro
|
||||
STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Construir caminhos-de-ferro electrificados
|
||||
STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Construir monocarril
|
||||
@@ -2881,7 +2867,7 @@ STR_GO_TO_ROADVEH_DEPOT :Ir para o depó
|
||||
STR_SERVICE_AT_ROADVEH_DEPOT :Manutenção no depósito de {TOWN}
|
||||
|
||||
STR_REFIT_ROAD_VEHICLE_TO_CARRY :{BLACK}Reconverter veículo para transportar outro tipo de carga
|
||||
STR_REFIT_ROAD_VEHICLE :{BLACK}Reconverter veículo
|
||||
STR_REFIT_ROAD_VEHICLE :{BLACK}Reconverter veiculo
|
||||
STR_REFIT_ROAD_VEHICLE_TO_CARRY_HIGHLIGHTED :{BLACK}Reconverter veículo para transportar o tipo de carga seleccionado
|
||||
STR_REFIT_ROAD_VEHICLE_CAN_T :{WHITE}Não é possível reconverter veículo
|
||||
STR_ROAD_SELECT_TYPE_OF_CARGO_FOR :{BLACK}Seleccione o tipo de carga para o veículo
|
||||
@@ -3150,7 +3136,7 @@ STR_SCHEDULED_AIRCRAFT :{WHITE}{STATION
|
||||
STR_SCHEDULED_SHIPS :{WHITE}{STATION} - {COMMA} Barcos
|
||||
|
||||
STR_SCHEDULED_TRAINS_TIP :{BLACK}Mostrar todos os comboios que têm esta estação nas ordens de serviço
|
||||
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Mostrar todos os veículos de estrada que têm esta estação nas ordens de serviço
|
||||
STR_SCHEDULED_ROAD_VEHICLES_TIP :{BLACK}Mostrar todos os veiculos de estrada que têm esta estação nas ordens de serviço
|
||||
STR_SCHEDULED_AIRCRAFT_TIP :{BLACK}Mostrar todos os aviões que têm esta estação nas ordens de serviço
|
||||
STR_SCHEDULED_SHIPS_TIP :{BLACK}Mostrar todos os navios de cujo itinerário esta estação faz parte
|
||||
|
||||
@@ -3355,7 +3341,6 @@ STR_TRANSPARENT_INDUSTRIES_DESC :{BLACK}Comutar
|
||||
STR_TRANSPARENT_BUILDINGS_DESC :{BLACK}Comutar transparência para edificações como estações, depósitos, pontos-de-passagem e catenárias
|
||||
STR_TRANSPARENT_BRIDGES_DESC :{BLACK}Comutar transparência para pontes
|
||||
STR_TRANSPARENT_STRUCTURES_DESC :{BLACK}Comutar transparência para estruturas como faróis-terrestres e antenas (talvez, no futuro, para embelezamentos)
|
||||
STR_TRANSPARENT_CATENARY_DESC :{BLACK}Comutar transparência para catenária. CTRL+clique para fechar.
|
||||
STR_TRANSPARENT_LOADING_DESC :{BLACK}Alterar transparência para indicadores de carga
|
||||
|
||||
STR_PERCENT_UP_SMALL :{TINYFONT}{WHITE}{NUM}%{UPARROW}
|
||||
|
||||
@@ -1052,7 +1052,6 @@ STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE :{LTBLUE}Раз
|
||||
STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY :{LTBLUE}Разрешить передачу денег другим компаниям: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}Станции могут быть произвольной формы: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}Множитель увеличения веса груза для товарных поездов: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PLANE_SPEED :{LTBLUE}Коэффициент скорости авиатранспорта: {ORANGE}1 / {STRING}
|
||||
STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD :{LTBLUE}Позволять строить остановки на городских дорогах: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ADJACENT_STATIONS :{LTBLUE}Разрешить строительство смежных станций: {ORANGE}{STRING}
|
||||
|
||||
@@ -1207,19 +1206,6 @@ STR_CONFIG_PATCHES_CURRENCY :{CURRENCY}
|
||||
STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Изменить значение
|
||||
STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Некоторые интервалы не совместимы с выбранной установкой. Допускаются значения 5-90% или 30-800 дней
|
||||
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Алгоритм поиска пути для поездов: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Не рекоменд.)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NPF :NPF
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_YAPF :YAPF {BLUE}(Рекоменд.)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH :{LTBLUE}Алгоритм поиска пути для автотранспорта: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_OPF :Оригин. {RED}(Не рекоменд.)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_NPF :NPF
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_YAPF :YAPF {BLUE}(Рекоменд.)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS :{LTBLUE}Алгоритм поиска путей для кораблей: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_OPF :Оригин. {BLUE}(Рекоменд.)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_NPF :NPF
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_YAPF :YAPF {RED}(Не рекоменд.)
|
||||
|
||||
STR_TEMPERATE_LANDSCAPE :Умеренный ландшафт
|
||||
STR_SUB_ARCTIC_LANDSCAPE :Субарктический ландшафт
|
||||
STR_SUB_TROPICAL_LANDSCAPE :Субтропический ландшафт
|
||||
@@ -1614,7 +1600,6 @@ STR_1004_TOO_HIGH :{WHITE}Слиш
|
||||
STR_1005_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Нет подходящих рельсов
|
||||
STR_1007_ALREADY_BUILT :{WHITE}...уже построено
|
||||
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Сначала надо удалить рельсы
|
||||
STR_ERR_CROSSING_ON_ONEWAY_ROAD :{WHITE}Дорога односторонняя или блокирована
|
||||
STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Железные дороги
|
||||
STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Электрифицированные ж/д
|
||||
STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Монорельс
|
||||
@@ -1717,7 +1702,6 @@ STR_2002 :{TINYFONT}{BLAC
|
||||
STR_2002_WHITE :{TINYFONT}{WHITE}{SIGN}
|
||||
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Сначала надо уничтожить здания
|
||||
STR_2005 :{WHITE}{TOWN}
|
||||
STR_CITY :{WHITE}{TOWN} (Город)
|
||||
STR_2006_POPULATION :{BLACK}Население: {ORANGE}{COMMA}{BLACK} Зданий: {ORANGE}{COMMA}
|
||||
STR_2007_RENAME_TOWN :Переименовать город
|
||||
STR_2008_CAN_T_RENAME_TOWN :{WHITE}Не могу переименовать город...
|
||||
@@ -3369,7 +3353,6 @@ STR_TRANSPARENT_INDUSTRIES_DESC :{BLACK}Пере
|
||||
STR_TRANSPARENT_BUILDINGS_DESC :{BLACK}Переключить прозрачность зданий, которые можно строить игроком. Например -- станции, депо, точки пути и столбы для электричества.
|
||||
STR_TRANSPARENT_BRIDGES_DESC :{BLACK}Переключить прозрачность мостов
|
||||
STR_TRANSPARENT_STRUCTURES_DESC :{BLACK}Переключить прозрачность зданий, вроде антенн и маяков.
|
||||
STR_TRANSPARENT_CATENARY_DESC :{BLACK}Переключить прозрачность контактной сети. Ctrl-щелчок - запрет изменений.
|
||||
STR_TRANSPARENT_LOADING_DESC :{BLACK}Переключить прозрачность для индикаторов загрузки
|
||||
|
||||
STR_PERCENT_UP_SMALL :{TINYFONT}{WHITE}{NUM}%{UPARROW}
|
||||
|
||||
@@ -1114,7 +1114,6 @@ STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE :{LTBLUE}Povolit
|
||||
STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY :{LTBLUE}Umožnit posielanie penazí ostatným spolocnostiam: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}Roznorode stanice: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}Váhový násobok pre nákladné vlaky: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PLANE_SPEED :{LTBLUE}Faktor rýchlosti lietadiel: {ORANGE}1 / {STRING}
|
||||
STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD :{LTBLUE}Povolit prejazdné zastávky na mestských cestách: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ADJACENT_STATIONS :{LTBLUE}Povolit stavbu oddelených staníc: {ORANGE}{STRING}
|
||||
|
||||
@@ -1676,7 +1675,6 @@ STR_1004_TOO_HIGH :{WHITE}Prilis v
|
||||
STR_1005_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Ziadne pouzitelne zeleznicne kolaje
|
||||
STR_1007_ALREADY_BUILT :{WHITE}... uz bolo vytvorene
|
||||
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Najskor treba odstranit zeleznicne kolaje
|
||||
STR_ERR_CROSSING_ON_ONEWAY_ROAD :{WHITE}Cesta je jednosmerná alebo blokovaná.
|
||||
STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Zeleznica
|
||||
STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Elektrifikovana železnica
|
||||
STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Jednokolajka - Monorail
|
||||
|
||||
@@ -1092,7 +1092,6 @@ STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE :{LTBLUE}Dovoli
|
||||
STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY :{LTBLUE}Dovoli pošiljanje denarja drugim podjetjem: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}Neenake postaje: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}Koeficient teže tovora za simulacijo težkih vlakov: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PLANE_SPEED :{LTBLUE}Faktor hitrosti letal: {ORANGE}1 / {STRING}
|
||||
STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD :{LTBLUE}Dovoli prehodne postaje na cestah v lasti mest: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ADJACENT_STATIONS :{LTBLUE}Dovoli gradnjo združljivih postaj: {ORANGE}{STRING}
|
||||
|
||||
@@ -1247,18 +1246,6 @@ STR_CONFIG_PATCHES_CURRENCY :{CURRENCY}
|
||||
STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Spremeni vrednost
|
||||
STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Nekatera ali vsa privzeta obdobja servisiranja spodaj niso združljiva z izborom! 5-90% in 30-800 dni je veljavno
|
||||
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Iskalnik poti za vlake: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Ni priporočeno)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NPF :NPF
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_YAPF :YAPF {BLUE}(Priporočeno)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH :{LTBLUE}Iskalnik poti za vozila: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_OPF :Original {RED}(Ni priporočeno)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_NPF :NPF
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_YAPF :YAPF {BLUE}(Priporočeno)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS :{LTBLUE}Logaritem poti za ladje: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_OPF :Original {BLUE}(Priporočen)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_NPF :NPF
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_YAPF :YAPF {RED}(Ni priporočen)
|
||||
|
||||
STR_TEMPERATE_LANDSCAPE :Zmerno podnebje
|
||||
STR_SUB_ARCTIC_LANDSCAPE :Sub arktično podnebje
|
||||
@@ -1654,7 +1641,6 @@ STR_1004_TOO_HIGH :{WHITE}Previsok
|
||||
STR_1005_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Ni primernih tračnic
|
||||
STR_1007_ALREADY_BUILT :{WHITE} ... že zgrajeno
|
||||
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Najprej odstrani tračnice
|
||||
STR_ERR_CROSSING_ON_ONEWAY_ROAD :{WHITE}Cesta je enosmerna ali blokirana
|
||||
STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Gradnja železnice
|
||||
STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Elektrificirana Železnica
|
||||
STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Gradnja enotirne železnice
|
||||
@@ -3435,7 +3421,6 @@ STR_TRANSPARENT_INDUSTRIES_DESC :{BLACK}Prozoren
|
||||
STR_TRANSPARENT_BUILDINGS_DESC :{BLACK}Prozoren ali navaden pogled ostalih objektov kot so postaje, garaže...
|
||||
STR_TRANSPARENT_BRIDGES_DESC :{BLACK}Prozoren ali navaden pogled mostov
|
||||
STR_TRANSPARENT_STRUCTURES_DESC :{BLACK}Prozoren ali navaden pogled struktur kot so antene, svetilniki...
|
||||
STR_TRANSPARENT_CATENARY_DESC :{BLACK}Preklop prosojnosti za pogone. CTRL+klik za zaklepanje.
|
||||
STR_TRANSPARENT_LOADING_DESC :{BLACK}Preklop na prosojnost za prikaz polnenja
|
||||
|
||||
STR_PERCENT_UP_SMALL :{TINYFONT}{WHITE}{NUM}%{UPARROW}
|
||||
|
||||
@@ -1051,7 +1051,6 @@ STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE :{LTBLUE}Permiti
|
||||
STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY :{LTBLUE}Permitir enviar dinero a otras empresas: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}Estaciones no uniformes: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}Carga el multiplicador de peso para simular trenes pesados: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PLANE_SPEED :{LTBLUE}Factor velocidad avión: {ORANGE}1 / {STRING}
|
||||
STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD :{LTBLUE}Permite conducir en paradas sobre carreteras de ciudades: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ADJACENT_STATIONS :{LTBLUE}Permitir construcción en estaciones contiguas : {ORANGE}{STRING}
|
||||
|
||||
@@ -1151,7 +1150,7 @@ STR_CONFIG_PATCHES_SERVINT_TRAINS_DISABLED :{LTBLUE}Interva
|
||||
STR_CONFIG_PATCHES_SERVINT_ROADVEH :{LTBLUE}Intervalo de despacho por defecto para veh. de carretera: {ORANGE}{STRING} días
|
||||
STR_CONFIG_PATCHES_SERVINT_ROADVEH_DISABLED :{LTBLUE}Intervalo de despacho por defecto para veh. de carretera: {ORANGE}no
|
||||
STR_CONFIG_PATCHES_SERVINT_AIRCRAFT :{LTBLUE}Intervalo de despacho por defecto para aeroplanos: {ORANGE}{STRING} días
|
||||
STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED :{LTBLUE}Intervalo de despacho por defecto para aeronaves: {ORANGE}no
|
||||
STR_CONFIG_PATCHES_SERVINT_AIRCRAFT_DISABLED :{LTBLUE}Intervalo de despacho por defecto para aviones: {ORANGE}no
|
||||
STR_CONFIG_PATCHES_SERVINT_SHIPS :{LTBLUE}Intervalo de despacho por defecto para barcos: {ORANGE}{STRING} días
|
||||
STR_CONFIG_PATCHES_SERVINT_SHIPS_DISABLED :{LTBLUE}Intervalo de despacho por defecto para barcos: {ORANGE}no
|
||||
STR_CONFIG_PATCHES_NOSERVICE :{LTBLUE}Desactivar servicio cuando las averías están desactivadas: {ORANGE}{STRING}
|
||||
@@ -1613,7 +1612,6 @@ STR_1004_TOO_HIGH :{WHITE}Demasiad
|
||||
STR_1005_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Tramo de vía no apropiado
|
||||
STR_1007_ALREADY_BUILT :{WHITE}...ya construído
|
||||
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Se debe retirar primero tramo de vía
|
||||
STR_ERR_CROSSING_ON_ONEWAY_ROAD :{WHITE}Carretera de un solo sentido o bloqueada
|
||||
STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Construcción de ferrocarril
|
||||
STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Construcciòn Línea Eléctrica de Ferrocarril
|
||||
STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Construcción de monorraíl
|
||||
@@ -2966,7 +2964,7 @@ STR_A003_NEW_AIRCRAFT :{BLACK}Nueva ae
|
||||
STR_CLONE_AIRCRAFT :{BLACK}Clonar aeronave
|
||||
STR_CLONE_AIRCRAFT_INFO :{BLACK}Esto copiará la aeronave. Control-click compartirá las ordenes
|
||||
STR_CLONE_AIRCRAFT_INFO_HANGAR_WINDOW :{BLACK}Esto construirá una copia de la aeronave. Pulsa este botón y después la aeronave dentro o fuera del hangar. Control-click compartirá las ordenes
|
||||
STR_A005_NEW_AIRCRAFT :{WHITE}Nueva Aeronave
|
||||
STR_A005_NEW_AIRCRAFT :{WHITE}Nuevo avilón
|
||||
STR_A006_BUILD_AIRCRAFT :{BLACK}Construir aeronave
|
||||
STR_A008_CAN_T_BUILD_AIRCRAFT :{WHITE}No se puede construir aeronave...
|
||||
STR_A009_AIRCRAFT :{WHITE}{COMPANY} - {COMMA} Aeronave
|
||||
|
||||
@@ -724,7 +724,6 @@ STR_028D_PLACE_LIGHTHOUSE :{BLACK}Deniz fe
|
||||
STR_028E_PLACE_TRANSMITTER :{BLACK}Verici koy
|
||||
STR_028F_DEFINE_DESERT_AREA :{BLACK}Çöl yap, kaldırmak için CTRL'ye basılı tut
|
||||
STR_CREATE_LAKE :{BLACK}Su alanını belirle.{}Deniz seviyesinde CTRL tuşu basılı olmadığı sürece kanal yapar, basılıysa etraftakileri su altında bırakır
|
||||
STR_CREATE_RIVER :{BLACK}Irmak oluştur.
|
||||
STR_0290_DELETE :{BLACK}Sil
|
||||
STR_0291_DELETE_THIS_TOWN_COMPLETELY :{BLACK}Sehri tamamen sil
|
||||
STR_0292_SAVE_SCENARIO :Kaydet
|
||||
@@ -934,7 +933,6 @@ STR_OPTIONS_LANG_TIP :{BLACK}Görüne
|
||||
|
||||
STR_OPTIONS_FULLSCREEN :{BLACK}Tam ekran
|
||||
STR_OPTIONS_FULLSCREEN_TIP :{BLACK}Tam ekran oynamak için bunu isaretleyin
|
||||
STR_FULLSCREEN_FAILED :{WHITE}Tam ekran modu başarısız
|
||||
|
||||
STR_OPTIONS_RES :{BLACK}Ekran Çözünürlüğü
|
||||
STR_OPTIONS_RES_CBO :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
|
||||
@@ -1202,19 +1200,6 @@ STR_CONFIG_PATCHES_CURRENCY :{CURRENCY}
|
||||
STR_CONFIG_PATCHES_QUERY_CAPT :{WHITE}Ayar değerini değiştir
|
||||
STR_CONFIG_PATCHES_SERVICE_INTERVAL_INCOMPATIBLE :{WHITE}Bazi servis gecikmeleri aralık dışında: %5-%90 veya 30-800 gün arasında olmalı
|
||||
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS :{LTBLUE}Trenler için yol bulucu: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NTP :NTP {RED}(Önerilmez)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_NPF :NPF
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_TRAINS_YAPF :YAPF {BLUE}(Önerilen)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH :{LTBLUE}Arabalar için yol bulucu: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_OPF :Öntanımlı {RED}(Önerilmez)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_NPF :NPF
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_ROADVEH_YAPF :YAPF {BLUE}(Önerilen)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS :{LTBLUE}Gemiler için yol bulucu: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_OPF :Öntanımlı {BLUE}(Önerilen)
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_NPF :NPF
|
||||
STR_CONFIG_PATCHES_PATHFINDER_FOR_SHIPS_YAPF :YAPF {RED}(Önerilmez)
|
||||
|
||||
STR_TEMPERATE_LANDSCAPE :Ilıman iklim
|
||||
STR_SUB_ARCTIC_LANDSCAPE :Soğuk iklim
|
||||
STR_SUB_TROPICAL_LANDSCAPE :Tropik iklim
|
||||
@@ -2343,8 +2328,6 @@ STR_LIVERY_EMU :EMU
|
||||
STR_LIVERY_PASSENGER_WAGON_STEAM :Tramvay (Buhar)
|
||||
STR_LIVERY_PASSENGER_WAGON_DIESEL :Tramvay (Dizel)
|
||||
STR_LIVERY_PASSENGER_WAGON_ELECTRIC :Tramvay (Elektrik)
|
||||
STR_LIVERY_PASSENGER_WAGON_MONORAIL :Yolcu Vagonu (Monoray)
|
||||
STR_LIVERY_PASSENGER_WAGON_MAGLEV :Yolcu Vagonu (Maglev)
|
||||
STR_LIVERY_FREIGHT_WAGON :Yük Vagonu
|
||||
STR_LIVERY_BUS :Otobüs
|
||||
STR_LIVERY_TRUCK :Kamyon
|
||||
@@ -2800,7 +2783,6 @@ STR_NEW_VEHICLE_TYPE :{BLACK}{BIGFONT
|
||||
STR_NEW_VEHICLE_NOW_AVAILABLE_WITH_TYPE :{BLACK}{STRING} artık kullanılabilir! - {ENGINE}
|
||||
|
||||
STR_CAN_T_SELL_DESTROYED_VEHICLE :{WHITE}Hurda araçlar satılamaz...
|
||||
STR_CAN_T_REFIT_DESTROYED_VEHICLE :{WHITE}Yok olmuş araç modifiye edilemez...
|
||||
|
||||
STR_CAN_T_TIMETABLE_VEHICLE :{WHITE}Aracın zaman çizelgesi oluşturulamıyor...
|
||||
STR_TIMETABLE_ONLY_WAIT_AT_STATIONS :{WHITE}Araçlar sadece istasyonlarda bekleyebilir.
|
||||
@@ -3245,12 +3227,6 @@ STR_PURCHASE_INFO_ALL_TYPES :Tüm kargo tür
|
||||
STR_PURCHASE_INFO_ALL_BUT :{GOLD} hariç hepsi
|
||||
STR_PURCHASE_INFO_MAX_TE :{BLACK}Mak. Çekim Gücü: {GOLD}{FORCE}
|
||||
|
||||
########### For showing numbers in widgets
|
||||
|
||||
STR_NUM_1 :{BLACK}{SKIP}{NUM}
|
||||
STR_NUM_2 :{BLACK}{SKIP}{SKIP}{NUM}
|
||||
STR_NUM_3 :{BLACK}{SKIP}{SKIP}{SKIP}{NUM}
|
||||
|
||||
########### String for New Landscape Generator
|
||||
|
||||
STR_GENERATE :{WHITE}Oluştur
|
||||
@@ -3419,8 +3395,6 @@ STR_FACE_LOAD :{BLACK}Yükle
|
||||
STR_FACE_LOAD_TIP :{BLACK}Tercih edilen yüzü yükle
|
||||
STR_FACE_LOAD_DONE :{WHITE}Tercih edilen yüz OpenTTD ayar dosyasından yüklendi.
|
||||
STR_FACE_FACECODE :{BLACK}Oyuncu yüzü no.
|
||||
STR_FACE_FACECODE_TIP :{BLACK}Oyuncu suratının numarasını göster/değiştir
|
||||
STR_FACE_FACECODE_CAPTION :{WHITE}Oyuncu suratının numarasını göster/değiştir
|
||||
STR_FACE_FACECODE_SET :{WHITE}Surat numarası ayarlandı.
|
||||
STR_FACE_FACECODE_ERR :{WHITE}Oyuncu surat numarası ayarlanamadı - 0 ve 4.294.967.295 arasında bir sayı olmalı!
|
||||
STR_FACE_SAVE :{BLACK}Kaydet
|
||||
|
||||
+18
-21
@@ -723,7 +723,7 @@ STR_020F_GENERAL_INFORMATION :{YELLOW}Заг
|
||||
STR_MESSAGES_ALL :{YELLOW}Відображати повідомлення: відкл. / коротко / повно
|
||||
STR_MESSAGE_SOUND :{YELLOW}Звукове сповіщення для підсумкових новин
|
||||
STR_0210_TOO_FAR_FROM_PREVIOUS_DESTINATIO :{WHITE}...дуже далеко від попереднього пункту призначення
|
||||
STR_0211_TOP_COMPANIES_WHO_REACHED :{BIGFONT}{BLACK}Кращі компанії, що досягли {NUM}{}({STRING} рівень)
|
||||
STR_0211_TOP_COMPANIES_WHO_REACHED :{BIGFONT}{BLACK}Кращі компанії, що досягли {NUM}{}(рівень {STRING})
|
||||
STR_TOP_COMPANIES_NETWORK_GAME :{BIGFONT}{BLACK}Таблиця компаній з {NUM}
|
||||
STR_0212 :{BIGFONT}{COMMA}.
|
||||
STR_0213_BUSINESSMAN :Бізнесмен
|
||||
@@ -940,7 +940,7 @@ STR_02E1 :{BLACK}{SKIP}{S
|
||||
STR_02E2_CURRENCY_UNITS_SELECTION :{BLACK}Виберіть грошову одиницю
|
||||
STR_MEASURING_UNITS :{BLACK}Система одиниць виміру
|
||||
STR_02E4 :{BLACK}{SKIP}{SKIP}{STRING}
|
||||
STR_MEASURING_UNITS_SELECTION :{BLACK}Виберіть систему одиниць виміру
|
||||
STR_MEASURING_UNITS_SELECTION :{BLACK}Вибір системи одиниць виміру
|
||||
STR_02E6_ROAD_VEHICLES :{BLACK}Транспорт
|
||||
STR_02E7 :{BLACK}{SKIP}{SKIP}{SKIP}{STRING}
|
||||
STR_02E8_SELECT_SIDE_OF_ROAD_FOR :{BLACK}Виберіть, по якій стороні їхатиме транспорт
|
||||
@@ -953,10 +953,10 @@ STR_02ED_SELECT_STYLE_OF_TOWN_NAMES :{BLACK}Вибе
|
||||
STR_02F4_AUTOSAVE :{BLACK}Автозбереження
|
||||
STR_02F5 :{BLACK}{SKIP}{SKIP}{SKIP}{SKIP}{SKIP}{STRING}
|
||||
STR_02F6_SELECT_INTERVAL_BETWEEN :{BLACK}Виберіть період автозбереження гри
|
||||
STR_02F7_OFF :вимкнено
|
||||
STR_02F8_EVERY_3_MONTHS :кожні три місяці
|
||||
STR_02F9_EVERY_6_MONTHS :кожні півроку
|
||||
STR_02FA_EVERY_12_MONTHS :щороку
|
||||
STR_02F7_OFF :Вимкнено
|
||||
STR_02F8_EVERY_3_MONTHS :Кожні три місяці
|
||||
STR_02F9_EVERY_6_MONTHS :Кожні півроку
|
||||
STR_02FA_EVERY_12_MONTHS :Щороку
|
||||
STR_02FB_START_A_NEW_GAME :{BLACK}Почати нову гру
|
||||
STR_02FC_LOAD_A_SAVED_GAME :{BLACK}Продовжити збережену гру
|
||||
STR_02FE_CREATE_A_CUSTOMIZED_GAME :{BLACK}Створити свій сценарій
|
||||
@@ -1175,30 +1175,29 @@ STR_CONFIG_PATCHES_ALLOW_EXCLUSIVE :{LTBLUE}Доз
|
||||
STR_CONFIG_PATCHES_ALLOW_GIVE_MONEY :{LTBLUE}Дозволити передавати гроші іншим компаніям: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_NONUNIFORM_STATIONS :{LTBLUE}Неоднорідні станції: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_FREIGHT_TRAINS :{LTBLUE}Множник ваги для імітації важких потягів: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_PLANE_SPEED :{LTBLUE}Фактор швидкості літаків: {ORANGE}1 / {STRING}
|
||||
STR_CONFIG_PATCHES_STOP_ON_TOWN_ROAD :{LTBLUE}Дозволити безпересадкові зупинки на муніципальних дорогах: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ADJACENT_STATIONS :{LTBLUE}Дозволити будувати суміжні станції: {ORANGE}{STRING}
|
||||
|
||||
STR_CONFIG_PATCHES_SMALL_AIRPORTS :{LTBLUE}Будувати малі аеропорти можна завжди: {ORANGE}{STRING}
|
||||
|
||||
STR_CONFIG_PATCHES_WARN_LOST_TRAIN :{LTBLUE}Повідомляти, якщо поїзд загубився {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_WARN_LOST_TRAIN :{LTBLUE}Повідомляти, коли поїзд загубився {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ORDER_REVIEW :{LTBLUE}Показ транспортних наказів: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ORDER_REVIEW_OFF :ні
|
||||
STR_CONFIG_PATCHES_ORDER_REVIEW_EXDEPOT :так, крім зупиненого транспорту
|
||||
STR_CONFIG_PATCHES_ORDER_REVIEW_ON :усього транспорту
|
||||
STR_CONFIG_PATCHES_WARN_INCOME_LESS :{LTBLUE}Повідомляти, якщо поїзд приносить збитки: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_WARN_INCOME_LESS :{LTBLUE}Попереджати якщо поїзд приносить збитки: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_NEVER_EXPIRE_VEHICLES :{LTBLUE}Транспорт не старіє: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_AUTORENEW_VEHICLE :{LTBLUE}Автооновлення старого транспорту
|
||||
STR_CONFIG_PATCHES_AUTORENEW_MONTHS :{LTBLUE}Автооновлення транспорту через {ORANGE}{STRING}{LTBLUE} міс. до/після макс.віку
|
||||
STR_CONFIG_PATCHES_AUTORENEW_MONEY :{LTBLUE}Сума, необхідна для автооновлення: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_AUTORENEW_MONEY :{LTBLUE}Необхідна сума для автооновлення: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ERRMSG_DURATION :{LTBLUE}Тривалість повідомлення про помилку: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_POPULATION_IN_LABEL :{LTBLUE}Показувати населення міста поруч з назвою: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_INVISIBLE_TREES :{LTBLUE}Прозорі дерева: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_INVISIBLE_TREES :{LTBLUE}Невидимі дерева і прозорі будівлі: {ORANGE}{STRING}
|
||||
|
||||
STR_CONFIG_PATCHES_LAND_GENERATOR :{LTBLUE}Генератор ландшафту: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_LAND_GENERATOR_ORIGINAL :Класичний
|
||||
STR_CONFIG_PATCHES_LAND_GENERATOR_TERRA_GENESIS :ТерраГен
|
||||
STR_CONFIG_PATCHES_OIL_REF_EDGE_DISTANCE :{LTBLUE}Макс. віддаленість від краю для нафтових свердловин {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_OIL_REF_EDGE_DISTANCE :{LTBLUE}Макс віддаленість від нафтової свердловини {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_SNOWLINE_HEIGHT :{LTBLUE}Висота рівня снігу: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN :{LTBLUE}Нерівність землі (лише для TerraGenesis) : {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_ROUGHNESS_OF_TERRAIN_VERY_SMOOTH :Дуже гладкий
|
||||
@@ -1216,7 +1215,7 @@ STR_CONFIG_PATCHES_SE_FLAT_WORLD_HEIGHT :{LTBLUE}Рів
|
||||
|
||||
STR_CONFIG_PATCHES_STATION_SPREAD :{LTBLUE}Макс. довжина станції: {ORANGE}{STRING} {RED}Велике значення гальмує гру
|
||||
STR_CONFIG_PATCHES_SERVICEATHELIPAD :{LTBLUE}Автоматичний техогляд гелікоптерів на площадках: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Приєднати меню рельєфу до меню будування: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_LINK_TERRAFORM_TOOLBAR :{LTBLUE}Включити меню рельєфу до меню будування: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_REVERSE_SCROLLING :{LTBLUE}Протилежний напрямок прокрутки: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_SMOOTH_SCROLLING :{LTBLUE}Плавна прокрутка у вікні: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_MEASURE_TOOLTIP :{LTBLUE}Показувати розміри будівництва в підказці: {ORANGE}{STRING}
|
||||
@@ -1267,7 +1266,7 @@ STR_CONFIG_PATCHES_AI_BUILDS_ROADVEH :{LTBLUE}Заб
|
||||
STR_CONFIG_PATCHES_AI_BUILDS_AIRCRAFT :{LTBLUE}Заборонити комп'ютеру будувати літаки: {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_AI_BUILDS_SHIPS :{LTBLUE}Заборонити комп'ютеру будувати кораблі: {ORANGE}{STRING}
|
||||
|
||||
STR_CONFIG_PATCHES_AINEW_ACTIVE :{LTBLUE}Новий тип інтелекту (альфа-версія): {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_AINEW_ACTIVE :{LTBLUE}Новий тип інтелекту (альфа): {ORANGE}{STRING}
|
||||
STR_CONFIG_PATCHES_AI_IN_MULTIPLAYER :{LTBLUE}Включити інтелект при грі в мережі(тестовий): {ORANGE}{STRING}
|
||||
|
||||
STR_CONFIG_PATCHES_SERVINT_TRAINS :{LTBLUE}Інтервал техогляду для поїздів: {ORANGE}{STRING} дн/%
|
||||
@@ -1737,7 +1736,6 @@ STR_1004_TOO_HIGH :{WHITE}Дуже
|
||||
STR_1005_NO_SUITABLE_RAILROAD_TRACK :{WHITE}Невідповідний тип колії
|
||||
STR_1007_ALREADY_BUILT :{WHITE}...вже побудовано
|
||||
STR_1008_MUST_REMOVE_RAILROAD_TRACK :{WHITE}Спочатку приберіть колію
|
||||
STR_ERR_CROSSING_ON_ONEWAY_ROAD :{WHITE}Дорога з одностороннім рухом або блокована
|
||||
STR_100A_RAILROAD_CONSTRUCTION :{WHITE}Будівництво залізниці
|
||||
STR_TITLE_ELRAIL_CONSTRUCTION :{WHITE}Будувати електрифіковану колію
|
||||
STR_100B_MONORAIL_CONSTRUCTION :{WHITE}Будівництво монорельса
|
||||
@@ -1840,7 +1838,6 @@ STR_2002 :{TINYFONT}{BLAC
|
||||
STR_2002_WHITE :{TINYFONT}{WHITE}{SIGN}
|
||||
STR_2004_BUILDING_MUST_BE_DEMOLISHED :{WHITE}Спочатку зруйнуйте споруду
|
||||
STR_2005 :{WHITE}{TOWN}
|
||||
STR_CITY :{WHITE}{TOWN} (місто)
|
||||
STR_2006_POPULATION :{BLACK}Населення: {ORANGE}{COMMA}{BLACK} Будинки: {ORANGE}{COMMA}
|
||||
STR_2007_RENAME_TOWN :Перейменувати
|
||||
STR_2008_CAN_T_RENAME_TOWN :{WHITE}Неможливо перейменувати...
|
||||
@@ -2349,14 +2346,14 @@ STR_682C_HILLY :Горбкув
|
||||
STR_682D_MOUNTAINOUS :Гористий
|
||||
STR_682E_STEADY :Стабільна
|
||||
STR_682F_FLUCTUATING :Нестійка
|
||||
STR_6830_IMMEDIATE :відразу
|
||||
STR_6830_IMMEDIATE :Відразу
|
||||
STR_6831_3_MONTHS_AFTER_PLAYER :3 місяці після гравця
|
||||
STR_6832_6_MONTHS_AFTER_PLAYER :6 місяців після гравця
|
||||
STR_6833_9_MONTHS_AFTER_PLAYER :9 місяців після гравця
|
||||
STR_6834_AT_END_OF_LINE_AND_AT_STATIONS :в кінці лінії, або на станціях
|
||||
STR_6835_AT_END_OF_LINE_ONLY :лише в кінці лінії
|
||||
STR_6836_OFF :відкл.
|
||||
STR_6837_ON :вкл.
|
||||
STR_6834_AT_END_OF_LINE_AND_AT_STATIONS :В кінці лінії, або на станціях
|
||||
STR_6835_AT_END_OF_LINE_ONLY :Лише в кінці лінії
|
||||
STR_6836_OFF :ВиКл
|
||||
STR_6837_ON :Вкл
|
||||
STR_6838_SHOW_HI_SCORE_CHART :{BLACK}Показати таблицю рекордів
|
||||
STR_PERMISSIVE :Допустиме
|
||||
STR_TOLERANT :Терпиме
|
||||
|
||||
+1
-1
@@ -349,7 +349,7 @@ CommandCost CmdMoneyCheat(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
|
||||
#ifndef _DEBUG
|
||||
if (_networking) return CMD_ERROR;
|
||||
#endif
|
||||
return CommandCost(EXPENSES_OTHER, -(int32)p1);
|
||||
return CommandCost(EXPENSES_OTHER, -(Money)p1);
|
||||
}
|
||||
|
||||
/** Transfer funds (money) from one player to another.
|
||||
|
||||
+113
-81
@@ -253,7 +253,6 @@ static const char *credits[] = {
|
||||
" Michael Blunck - Pre-Signals and Semaphores © 2003",
|
||||
" George - Canal/Lock graphics © 2003-2004",
|
||||
" David Dallaston - Tram tracks",
|
||||
" Zephyris - Trams",
|
||||
" Marcin Grzegorczyk - Foundations for Tracks on Slopes",
|
||||
" All Translators - Who made OpenTTD a truly international game",
|
||||
" Bug Reporters - Without whom OpenTTD would still be full of bugs!",
|
||||
@@ -1769,17 +1768,10 @@ void SetFiosType(const byte fiostype)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* The 'amount' to cheat with.
|
||||
* This variable is semantically a constant value, but because the cheat
|
||||
* code requires to be able to write to the variable it is not constified.
|
||||
*/
|
||||
static int32 _money_cheat_amount = 10000000;
|
||||
|
||||
static int32 ClickMoneyCheat(int32 p1, int32 p2)
|
||||
{
|
||||
DoCommandP(0, (uint32)(p2 * _money_cheat_amount), 0, NULL, CMD_MONEY_CHEAT);
|
||||
return _money_cheat_amount;
|
||||
DoCommandP(0, 10000000, 0, NULL, CMD_MONEY_CHEAT);
|
||||
return true;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -1835,24 +1827,38 @@ static int32 ClickChangeDateCheat(int32 p1, int32 p2)
|
||||
|
||||
typedef int32 CheckButtonClick(int32, int32);
|
||||
|
||||
enum ce_flags_long
|
||||
{
|
||||
CE_NONE = 0,
|
||||
CE_CLICK = 1 << 0,
|
||||
CE_END = 1 << 1,
|
||||
};
|
||||
|
||||
/** Define basic enum properties */
|
||||
template <> struct EnumPropsT<ce_flags_long> : MakeEnumPropsT<ce_flags_long, byte, CE_NONE, CE_END, CE_END> {};
|
||||
typedef TinyEnumT<ce_flags_long> ce_flags;
|
||||
|
||||
|
||||
struct CheatEntry {
|
||||
VarType type; ///< type of selector
|
||||
ce_flags flags; ///< selector flags
|
||||
StringID str; ///< string with descriptive text
|
||||
void *variable; ///< pointer to the variable
|
||||
bool *been_used; ///< has this cheat been used before?
|
||||
CheckButtonClick *proc;///< procedure
|
||||
int16 min, max; ///< range for spinbox setting
|
||||
};
|
||||
|
||||
static const CheatEntry _cheats_ui[] = {
|
||||
{SLE_INT32, STR_CHEAT_MONEY, &_money_cheat_amount, &_cheats.money.been_used, &ClickMoneyCheat },
|
||||
{SLE_UINT8, STR_CHEAT_CHANGE_PLAYER, &_local_player, &_cheats.switch_player.been_used, &ClickChangePlayerCheat },
|
||||
{SLE_BOOL, STR_CHEAT_EXTRA_DYNAMITE, &_cheats.magic_bulldozer.value, &_cheats.magic_bulldozer.been_used, NULL },
|
||||
{SLE_BOOL, STR_CHEAT_CROSSINGTUNNELS, &_cheats.crossing_tunnels.value, &_cheats.crossing_tunnels.been_used, NULL },
|
||||
{SLE_BOOL, STR_CHEAT_BUILD_IN_PAUSE, &_cheats.build_in_pause.value, &_cheats.build_in_pause.been_used, NULL },
|
||||
{SLE_BOOL, STR_CHEAT_NO_JETCRASH, &_cheats.no_jetcrash.value, &_cheats.no_jetcrash.been_used, NULL },
|
||||
{SLE_BOOL, STR_CHEAT_SETUP_PROD, &_cheats.setup_prod.value, &_cheats.setup_prod.been_used, NULL },
|
||||
{SLE_UINT8, STR_CHEAT_SWITCH_CLIMATE, &_opt.landscape, &_cheats.switch_climate.been_used, &ClickChangeClimateCheat},
|
||||
{SLE_INT32, STR_CHEAT_CHANGE_DATE, &_cur_year, &_cheats.change_date.been_used, &ClickChangeDateCheat },
|
||||
{SLE_BOOL, {CE_CLICK}, STR_CHEAT_MONEY, &_cheats.money.value, &_cheats.money.been_used, &ClickMoneyCheat, 0, 0},
|
||||
{SLE_UINT8, {CE_NONE}, STR_CHEAT_CHANGE_PLAYER, &_local_player, &_cheats.switch_player.been_used, &ClickChangePlayerCheat, 0, 11},
|
||||
{SLE_BOOL, {CE_NONE}, STR_CHEAT_EXTRA_DYNAMITE, &_cheats.magic_bulldozer.value, &_cheats.magic_bulldozer.been_used, NULL, 0, 0},
|
||||
{SLE_BOOL, {CE_NONE}, STR_CHEAT_CROSSINGTUNNELS,&_cheats.crossing_tunnels.value,&_cheats.crossing_tunnels.been_used,NULL, 0, 0},
|
||||
{SLE_BOOL, {CE_NONE}, STR_CHEAT_BUILD_IN_PAUSE, &_cheats.build_in_pause.value, &_cheats.build_in_pause.been_used, NULL, 0, 0},
|
||||
{SLE_BOOL, {CE_NONE}, STR_CHEAT_NO_JETCRASH, &_cheats.no_jetcrash.value, &_cheats.no_jetcrash.been_used, NULL, 0, 0},
|
||||
{SLE_BOOL, {CE_NONE}, STR_CHEAT_SETUP_PROD, &_cheats.setup_prod.value, &_cheats.setup_prod.been_used, NULL, 0, 0},
|
||||
{SLE_UINT8, {CE_NONE}, STR_CHEAT_SWITCH_CLIMATE, &_opt.landscape, &_cheats.switch_climate.been_used, &ClickChangeClimateCheat,-1, 4},
|
||||
{SLE_INT32, {CE_NONE}, STR_CHEAT_CHANGE_DATE, &_cur_year, &_cheats.change_date.been_used, &ClickChangeDateCheat, -1, 1},
|
||||
};
|
||||
|
||||
|
||||
@@ -1867,97 +1873,123 @@ static const Widget _cheat_widgets[] = {
|
||||
static void CheatsWndProc(Window *w, WindowEvent *e)
|
||||
{
|
||||
switch (e->event) {
|
||||
case WE_PAINT: {
|
||||
int clk = WP(w, def_d).data_1;
|
||||
case WE_PAINT: {
|
||||
int clk = WP(w, def_d).data_1;
|
||||
int x, y;
|
||||
int i;
|
||||
|
||||
DrawWindowWidgets(w);
|
||||
DrawStringMultiCenter(200, 25, STR_CHEATS_WARNING, w->width - 50);
|
||||
DrawWindowWidgets(w);
|
||||
|
||||
for (int i = 0, x = 0, y = 45; i != lengthof(_cheats_ui); i++) {
|
||||
const CheatEntry *ce = &_cheats_ui[i];
|
||||
DrawStringMultiCenter(200, 25, STR_CHEATS_WARNING, w->width - 50);
|
||||
|
||||
DrawSprite((*ce->been_used) ? SPR_BOX_CHECKED : SPR_BOX_EMPTY, PAL_NONE, x + 5, y + 2);
|
||||
x = 0;
|
||||
y = 45;
|
||||
|
||||
switch (ce->type) {
|
||||
case SLE_BOOL: {
|
||||
bool on = (*(bool*)ce->variable);
|
||||
for (i = 0; i != lengthof(_cheats_ui); i++) {
|
||||
const CheatEntry *ce = &_cheats_ui[i];
|
||||
|
||||
DrawFrameRect(x + 20, y + 1, x + 30 + 9, y + 9, on ? 6 : 4, on ? FR_LOWERED : FR_NONE);
|
||||
SetDParam(0, on ? STR_CONFIG_PATCHES_ON : STR_CONFIG_PATCHES_OFF);
|
||||
} break;
|
||||
DrawSprite((*ce->been_used) ? SPR_BOX_CHECKED : SPR_BOX_EMPTY, PAL_NONE, x + 5, y + 2);
|
||||
|
||||
default: {
|
||||
int32 val = (int32)ReadValue(ce->variable, ce->type);
|
||||
char buf[512];
|
||||
switch (ce->type) {
|
||||
case SLE_BOOL: {
|
||||
bool on = (*(bool*)ce->variable);
|
||||
|
||||
/* Draw [<][>] boxes for settings of an integer-type */
|
||||
DrawArrowButtons(x + 20, y, 3, clk - (i * 2), true, true);
|
||||
|
||||
switch (ce->str) {
|
||||
/* Display date for change date cheat */
|
||||
case STR_CHEAT_CHANGE_DATE: SetDParam(0, _date); break;
|
||||
|
||||
/* Draw colored flag for change player cheat */
|
||||
case STR_CHEAT_CHANGE_PLAYER:
|
||||
SetDParam(0, val);
|
||||
GetString(buf, STR_CHEAT_CHANGE_PLAYER, lastof(buf));
|
||||
DrawPlayerIcon(_current_player, 60 + GetStringBoundingBox(buf).width, y + 2);
|
||||
break;
|
||||
|
||||
/* Set correct string for switch climate cheat */
|
||||
case STR_CHEAT_SWITCH_CLIMATE: val += STR_TEMPERATE_LANDSCAPE;
|
||||
|
||||
/* Fallthrough */
|
||||
default: SetDParam(0, val);
|
||||
}
|
||||
} break;
|
||||
if (ce->flags & CE_CLICK) {
|
||||
DrawFrameRect(x + 20, y + 1, x + 30 + 9, y + 9, 0, (clk - (i * 2) == 1) ? FR_LOWERED : FR_NONE);
|
||||
if (i == 0) { // XXX - hack/hack for first element which is increase money. Told ya it's a mess
|
||||
SetDParam(0, 10000000);
|
||||
} else {
|
||||
SetDParam(0, false);
|
||||
}
|
||||
} else {
|
||||
DrawFrameRect(x + 20, y + 1, x + 30 + 9, y + 9, on ? 6 : 4, on ? FR_LOWERED : FR_NONE);
|
||||
SetDParam(0, on ? STR_CONFIG_PATCHES_ON : STR_CONFIG_PATCHES_OFF);
|
||||
}
|
||||
} break;
|
||||
default: {
|
||||
int32 val = (int32)ReadValue(ce->variable, ce->type);
|
||||
char buf[512];
|
||||
|
||||
DrawString(50, y + 1, ce->str, TC_FROMSTRING);
|
||||
/* Draw [<][>] boxes for settings of an integer-type */
|
||||
DrawArrowButtons(x + 20, y, 3, clk - (i * 2), true, true);
|
||||
|
||||
y += 12;
|
||||
switch (ce->str) {
|
||||
/* Display date for change date cheat */
|
||||
case STR_CHEAT_CHANGE_DATE: SetDParam(0, _date); break;
|
||||
/* Draw colored flag for change player cheat */
|
||||
case STR_CHEAT_CHANGE_PLAYER:
|
||||
SetDParam(0, val);
|
||||
GetString(buf, STR_CHEAT_CHANGE_PLAYER, lastof(buf));
|
||||
DrawPlayerIcon(_current_player, 60 + GetStringBoundingBox(buf).width, y + 2);
|
||||
break;
|
||||
/* Set correct string for switch climate cheat */
|
||||
case STR_CHEAT_SWITCH_CLIMATE: val += STR_TEMPERATE_LANDSCAPE;
|
||||
/* Fallthrough */
|
||||
default: SetDParam(0, val);
|
||||
}
|
||||
} break;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case WE_CLICK: {
|
||||
DrawString(50, y + 1, ce->str, TC_FROMSTRING);
|
||||
|
||||
y += 12;
|
||||
}
|
||||
break;
|
||||
}
|
||||
|
||||
case WE_CLICK: {
|
||||
const CheatEntry *ce;
|
||||
uint btn = (e->we.click.pt.y - 46) / 12;
|
||||
int32 value, oldvalue;
|
||||
uint x = e->we.click.pt.x;
|
||||
|
||||
/* Not clicking a button? */
|
||||
/* not clicking a button? */
|
||||
if (!IsInsideMM(x, 20, 40) || btn >= lengthof(_cheats_ui)) break;
|
||||
|
||||
const CheatEntry *ce = &_cheats_ui[btn];
|
||||
int value = (int32)ReadValue(ce->variable, ce->type);
|
||||
int oldvalue = value;
|
||||
ce = &_cheats_ui[btn];
|
||||
oldvalue = value = (int32)ReadValue(ce->variable, ce->type);
|
||||
|
||||
*ce->been_used = true;
|
||||
|
||||
switch (ce->type) {
|
||||
case SLE_BOOL:
|
||||
value ^= 1;
|
||||
if (ce->proc != NULL) ce->proc(value, 0);
|
||||
break;
|
||||
case SLE_BOOL:
|
||||
if (ce->flags & CE_CLICK) WP(w, def_d).data_1 = btn * 2 + 1;
|
||||
value ^= 1;
|
||||
if (ce->proc != NULL) ce->proc(value, 0);
|
||||
break;
|
||||
default: {
|
||||
/* Add a dynamic step-size to the scroller. In a maximum of
|
||||
* 50-steps you should be able to get from min to max */
|
||||
uint16 step = ((ce->max - ce->min) / 20);
|
||||
if (step == 0) step = 1;
|
||||
|
||||
default:
|
||||
/* Take whatever the function returns */
|
||||
value = ce->proc(value + ((x >= 30) ? 1 : -1), (x >= 30) ? 1 : -1);
|
||||
/* Increase or decrease the value and clamp it to extremes */
|
||||
value += (x >= 30) ? step : -step;
|
||||
value = Clamp(value, ce->min, ce->max);
|
||||
|
||||
if (value != oldvalue) WP(w, def_d).data_1 = btn * 2 + 1 + ((x >= 30) ? 1 : 0);
|
||||
break;
|
||||
/* take whatever the function returns */
|
||||
value = ce->proc(value, (x >= 30) ? 1 : -1);
|
||||
|
||||
if (value != oldvalue) {
|
||||
WP(w, def_d).data_1 = btn * 2 + 1 + ((x >= 30) ? 1 : 0);
|
||||
}
|
||||
} break;
|
||||
}
|
||||
|
||||
if (value != oldvalue) WriteValue(ce->variable, ce->type, (int64)value);
|
||||
if (value != oldvalue) {
|
||||
WriteValue(ce->variable, ce->type, (int64)value);
|
||||
SetWindowDirty(w);
|
||||
}
|
||||
|
||||
w->flags4 |= 5 << WF_TIMEOUT_SHL;
|
||||
|
||||
SetWindowDirty(w);
|
||||
} break;
|
||||
|
||||
case WE_TIMEOUT:
|
||||
WP(w, def_d).data_1 = 0;
|
||||
SetWindowDirty(w);
|
||||
break;
|
||||
}
|
||||
break;
|
||||
case WE_TIMEOUT:
|
||||
WP(w, def_d).data_1 = 0;
|
||||
SetWindowDirty(w);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+9
-15
@@ -13,7 +13,7 @@ static struct {
|
||||
HANDLE wait_obj;
|
||||
HANDLE thread;
|
||||
UINT_PTR devid;
|
||||
char start_song[MAX_PATH];
|
||||
char start_song[260];
|
||||
} _midi;
|
||||
|
||||
static FMusicDriver_Win32 iFMusicDriver_Win32;
|
||||
@@ -46,34 +46,28 @@ void MusicDriver_Win32::SetVolume(byte vol)
|
||||
SetEvent(_midi.wait_obj);
|
||||
}
|
||||
|
||||
static MCIERROR CDECL MidiSendCommand(const TCHAR* cmd, ...)
|
||||
static MCIERROR CDECL MidiSendCommand(const char* cmd, ...)
|
||||
{
|
||||
va_list va;
|
||||
TCHAR buf[512];
|
||||
char buf[512];
|
||||
|
||||
va_start(va, cmd);
|
||||
_vsntprintf(buf, lengthof(buf), cmd, va);
|
||||
vsnprintf(buf, lengthof(buf), cmd, va);
|
||||
va_end(va);
|
||||
return mciSendString(buf, NULL, 0, 0);
|
||||
return mciSendStringA(buf, NULL, 0, 0);
|
||||
}
|
||||
|
||||
static bool MidiIntPlaySong(const char *filename)
|
||||
{
|
||||
MidiSendCommand(_T("close all"));
|
||||
MidiSendCommand("close all");
|
||||
if (MidiSendCommand("open \"%s\" type sequencer alias song", filename) != 0) return false;
|
||||
|
||||
if (MidiSendCommand(_T("open \"%s\" type sequencer alias song"), OTTD2FS(filename)) != 0) {
|
||||
/* Let's try the "short name" */
|
||||
TCHAR buf[MAX_PATH];
|
||||
if (GetShortPathName(OTTD2FS(filename), buf, MAX_PATH) == 0) return false;
|
||||
if (MidiSendCommand(_T("open \"%s\" type sequencer alias song"), buf) != 0) return false;
|
||||
}
|
||||
|
||||
return MidiSendCommand(_T("play song from 0")) == 0;
|
||||
return MidiSendCommand("play song from 0") == 0;
|
||||
}
|
||||
|
||||
static void MidiIntStopSong()
|
||||
{
|
||||
MidiSendCommand(_T("close all"));
|
||||
MidiSendCommand("close all");
|
||||
}
|
||||
|
||||
static void MidiIntSetVolume(int vol)
|
||||
|
||||
@@ -79,7 +79,7 @@ void NetworkSend_Command(TileIndex tile, uint32 p1, uint32 p2, uint32 cmd, Comma
|
||||
/* And we queue it for delivery to the clients */
|
||||
NetworkTCPSocketHandler *cs;
|
||||
FOR_ALL_CLIENTS(cs) {
|
||||
if (cs->status > STATUS_MAP_WAIT) NetworkAddCommandQueue(cs, &c);
|
||||
if (cs->status > STATUS_AUTH) NetworkAddCommandQueue(cs, &c);
|
||||
}
|
||||
return;
|
||||
}
|
||||
|
||||
@@ -728,7 +728,6 @@ static void NetworkStartServerWindowWndProc(Window *w, WindowEvent *e)
|
||||
} break;
|
||||
|
||||
case WE_CLICK:
|
||||
if (e->we.click.widget != NSSW_CONNTYPE_BTN && e->we.click.widget != NSSW_LANGUAGE_BTN) HideDropDownMenu(w);
|
||||
nd->field = e->we.click.widget;
|
||||
switch (e->we.click.widget) {
|
||||
case NSSW_CLOSE: // Close 'X'
|
||||
|
||||
+2
-2
@@ -120,7 +120,7 @@ static uint16 cargo_disallowed[TOTAL_NUM_ENGINES];
|
||||
static uint32 _grm_engines[TOTAL_NUM_ENGINES];
|
||||
|
||||
/* Contains the GRF ID of the owner of a cargo if it has been reserved */
|
||||
static uint32 _grm_cargos[NUM_CARGO * 2];
|
||||
static uint32 _grm_cargos[NUM_CARGO];
|
||||
|
||||
/** DEBUG() function dedicated to newGRF debugging messages
|
||||
* Function is essentialy the same as DEBUG(grf, severity, ...) with the
|
||||
@@ -4644,7 +4644,7 @@ static void DefineGotoLabel(byte *buf, int len)
|
||||
} else {
|
||||
/* Attach the label to the end of the list */
|
||||
GRFLabel *l;
|
||||
for (l = _cur_grffile->label; l->next != NULL; l = l->next) {}
|
||||
for (l = _cur_grffile->label; l->next != NULL; l = l->next);
|
||||
l->next = label;
|
||||
}
|
||||
|
||||
|
||||
@@ -210,11 +210,6 @@ enum CallbackID {
|
||||
|
||||
/** Customize the output cargo types of a newly build industry. */
|
||||
CBID_INDUSTRY_OUTPUT_CARGO_TYPES = 0x14C,
|
||||
|
||||
/* ATTENTION:
|
||||
* When adding new callbacks and their result is 15bit, add them to newgrf_spritegroup.cpp:Is8BitCallback().
|
||||
* It does not harm to add them there though they are not implemented. But it does harm if they get forgotton.
|
||||
*/
|
||||
};
|
||||
|
||||
/**
|
||||
|
||||
+5
-5
@@ -179,7 +179,7 @@ static void NewGRFAddDlgWndProc(Window *w, WindowEvent *e)
|
||||
const GRFConfig *c;
|
||||
uint i = (e->we.click.pt.y - w->widget[ANGRFW_GRF_LIST].top) / 10 + w->vscroll.pos;
|
||||
|
||||
for (c = _all_grfs; c != NULL && i > 0; c = c->next, i--) {}
|
||||
for (c = _all_grfs; c != NULL && i > 0; c = c->next, i--);
|
||||
WP(w, newgrf_add_d).sel = c;
|
||||
SetWindowDirty(w);
|
||||
break;
|
||||
@@ -304,7 +304,7 @@ static void SetupNewGRFWindow(Window *w)
|
||||
const GRFConfig *c;
|
||||
int i;
|
||||
|
||||
for (c = *WP(w, newgrf_d).list, i = 0; c != NULL; c = c->next, i++) {}
|
||||
for (c = *WP(w, newgrf_d).list, i = 0; c != NULL; c = c->next, i++);
|
||||
|
||||
w->vscroll.cap = (w->widget[SNGRFS_FILE_LIST].bottom - w->widget[SNGRFS_FILE_LIST].top) / 14 + 1;
|
||||
SetVScrollCount(w, i);
|
||||
@@ -327,9 +327,9 @@ static void NewGRFConfirmationCallback(Window *w, bool confirmed)
|
||||
ReloadNewGRFData();
|
||||
|
||||
/* Show new, updated list */
|
||||
for (c = *nd->list; c != NULL && c != nd->sel; c = c->next, i++) {}
|
||||
for (c = *nd->list; c != NULL && c != nd->sel; c = c->next, i++);
|
||||
CopyGRFConfigList(nd->list, *nd->orig_list, false);
|
||||
for (c = *nd->list; c != NULL && i > 0; c = c->next, i--) {}
|
||||
for (c = *nd->list; c != NULL && i > 0; c = c->next, i--);
|
||||
nd->sel = c;
|
||||
|
||||
SetWindowDirty(w);
|
||||
@@ -474,7 +474,7 @@ static void NewGRFWndProc(Window *w, WindowEvent *e)
|
||||
GRFConfig *c;
|
||||
uint i = (e->we.click.pt.y - w->widget[SNGRFS_FILE_LIST].top) / 14 + w->vscroll.pos;
|
||||
|
||||
for (c = *WP(w, newgrf_d).list; c != NULL && i > 0; c = c->next, i--) {}
|
||||
for (c = *WP(w, newgrf_d).list; c != NULL && i > 0; c = c->next, i--);
|
||||
WP(w, newgrf_d).sel = c;
|
||||
|
||||
SetWindowDirty(w);
|
||||
|
||||
+3
-28
@@ -31,24 +31,13 @@ static HouseClassMapping _class_mapping[HOUSE_CLASS_MAX];
|
||||
|
||||
HouseOverrideManager _house_mngr(NEW_HOUSE_OFFSET, HOUSE_MAX, INVALID_HOUSE_ID);
|
||||
|
||||
/**
|
||||
* Check and update town and house values.
|
||||
*
|
||||
* Checked are the HouseIDs. Updated are the
|
||||
* town population the number of houses per
|
||||
* town, the town radius and the max passengers
|
||||
* of the town.
|
||||
*/
|
||||
void UpdateHousesAndTowns()
|
||||
void CheckHouseIDs()
|
||||
{
|
||||
Town *town;
|
||||
InitializeBuildingCounts();
|
||||
|
||||
/* Reset town population and num_houses */
|
||||
FOR_ALL_TOWNS(town) {
|
||||
town->population = 0;
|
||||
town->num_houses = 0;
|
||||
}
|
||||
/* Reset town population */
|
||||
FOR_ALL_TOWNS(town) town->population = 0;
|
||||
|
||||
for (TileIndex t = 0; t < MapSize(); t++) {
|
||||
HouseID house_id;
|
||||
@@ -62,23 +51,9 @@ void UpdateHousesAndTowns()
|
||||
house_id = _house_mngr.GetSubstituteID(house_id);
|
||||
SetHouseType(t, house_id);
|
||||
}
|
||||
|
||||
town = GetTownByTile(t);
|
||||
IncreaseBuildingCount(town, house_id);
|
||||
if (IsHouseCompleted(t)) town->population += GetHouseSpecs(house_id)->population;
|
||||
|
||||
/* Increase the number of houses for every house tile which
|
||||
* has a size bit set. Multi tile buildings have got only
|
||||
* one tile with such a bit set, so there is no problem. */
|
||||
if (GetHouseSpecs(GetHouseType(t))->building_flags & BUILDING_HAS_1_TILE) {
|
||||
town->num_houses++;
|
||||
}
|
||||
}
|
||||
|
||||
/* Update the population and num_house dependant values */
|
||||
FOR_ALL_TOWNS(town) {
|
||||
UpdateTownRadius(town);
|
||||
UpdateTownMaxPass(town);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -26,7 +26,7 @@ struct HouseClassMapping {
|
||||
uint8 class_id; ////< The class id within the grf file
|
||||
};
|
||||
|
||||
void UpdateHousesAndTowns();
|
||||
void CheckHouseIDs();
|
||||
|
||||
HouseClassID AllocateHouseClassID(byte grf_class_id, uint32 grfid);
|
||||
|
||||
|
||||
@@ -25,7 +25,7 @@
|
||||
|
||||
#include "table/strings.h"
|
||||
|
||||
static uint32 _industry_creation_random_bits;
|
||||
static Randomizer _industry_creation_randomizer;
|
||||
|
||||
/* Since the industry IDs defined by the GRF file don't necessarily correlate
|
||||
* to those used by the game, the IDs used for overriding old industries must be
|
||||
@@ -469,7 +469,7 @@ uint32 IndustryLocationGetVariable(const ResolverObject *object, byte variable,
|
||||
case 0x8D: return min(DistanceSquare(industry->town->xy, tile), 65535);
|
||||
|
||||
/* 32 random bits */
|
||||
case 0x8F: return _industry_creation_random_bits;
|
||||
case 0x8F: return _industry_creation_randomizer.Next();
|
||||
}
|
||||
|
||||
/* None of the special ones, so try the general ones */
|
||||
@@ -494,7 +494,7 @@ bool CheckIfCallBackAllowsCreation(TileIndex tile, IndustryType type, uint itspe
|
||||
NewIndustryResolver(&object, tile, &ind, type);
|
||||
object.GetVariable = IndustryLocationGetVariable;
|
||||
object.callback = CBID_INDUSTRY_LOCATION;
|
||||
_industry_creation_random_bits = seed;
|
||||
_industry_creation_randomizer.SetSeed(seed);
|
||||
|
||||
group = Resolve(GetIndustrySpec(type)->grf_prop.spritegroup, &object);
|
||||
|
||||
|
||||
@@ -275,7 +275,7 @@ bool PerformIndustryTileSlopeCheck(TileIndex ind_base_tile, TileIndex ind_tile,
|
||||
return !IsSlopeRefused(GetTileSlope(ind_tile, NULL), its->slopes_refused);
|
||||
}
|
||||
if (its->grf_prop.grffile->grf_version < 7) {
|
||||
return (callback_res & 0xFF) != 0; // mask to 8 bit callback result
|
||||
return callback_res != 0;
|
||||
}
|
||||
|
||||
/* Copy some parameters from the registers to the error message text ref. stack */
|
||||
|
||||
+19
-41
@@ -80,37 +80,6 @@ void InitializeSpriteGroupPool()
|
||||
TemporaryStorageArray<uint32, 0x110> _temp_store;
|
||||
|
||||
|
||||
static inline bool Is8BitCallback(const ResolverObject *object)
|
||||
{
|
||||
/* Var 0x7E procedure results are always 15 bit */
|
||||
if (object == NULL || object->procedure_call) return false;
|
||||
|
||||
switch (object->callback) {
|
||||
/* All these functions are 15 bit callbacks */
|
||||
case CBID_STATION_SPRITE_LAYOUT:
|
||||
case CBID_VEHICLE_REFIT_CAPACITY:
|
||||
case CBID_HOUSE_COLOUR:
|
||||
case CBID_HOUSE_CARGO_ACCEPTANCE:
|
||||
case CBID_INDUSTRY_LOCATION:
|
||||
case CBID_HOUSE_ACCEPT_CARGO:
|
||||
case CBID_INDTILE_CARGO_ACCEPTANCE:
|
||||
case CBID_INDTILE_ACCEPT_CARGO:
|
||||
case CBID_VEHICLE_COLOUR_MAPPING:
|
||||
case CBID_HOUSE_PRODUCE_CARGO:
|
||||
case CBID_INDTILE_SHAPE_CHECK: // depends on grf version, masked to 8 bit in PerformIndustryTileSlopeCheck() if needed
|
||||
case CBID_VEHICLE_SOUND_EFFECT:
|
||||
case CBID_VEHICLE_MODIFY_PROPERTY: // depends on queried property
|
||||
case CBID_CARGO_PROFIT_CALC:
|
||||
case CBID_SOUNDS_AMBIENT_EFFECT:
|
||||
case CBID_CARGO_STATION_RATING_CALC:
|
||||
return false;
|
||||
|
||||
/* The rest is a 8 bit callback, which should be truncated properly */
|
||||
default:
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
static inline uint32 GetVariable(const ResolverObject *object, byte variable, byte parameter, bool *available)
|
||||
{
|
||||
/* First handle variables common with Action7/9/D */
|
||||
@@ -205,7 +174,6 @@ static inline const SpriteGroup *ResolveVariable(const SpriteGroup *group, Resol
|
||||
bool available = true;
|
||||
if (adjust->variable == 0x7E) {
|
||||
ResolverObject subobject = *object;
|
||||
subobject.procedure_call = true;
|
||||
const SpriteGroup *subgroup = Resolve(adjust->subroutine, &subobject);
|
||||
if (subgroup == NULL || subgroup->type != SGT_CALLBACK) {
|
||||
value = CALLBACK_FAILED;
|
||||
@@ -236,7 +204,25 @@ static inline const SpriteGroup *ResolveVariable(const SpriteGroup *group, Resol
|
||||
if (group->g.determ.num_ranges == 0) {
|
||||
/* nvar == 0 is a special case -- we turn our value into a callback result */
|
||||
nvarzero.type = SGT_CALLBACK;
|
||||
nvarzero.g.callback.result = GB(value, 0, Is8BitCallback(object) ? 8 : 15);
|
||||
switch (object->callback) {
|
||||
/* All these functions are 15 bit callbacks */
|
||||
case CBID_VEHICLE_REFIT_CAPACITY:
|
||||
case CBID_HOUSE_COLOUR:
|
||||
case CBID_HOUSE_CARGO_ACCEPTANCE:
|
||||
case CBID_INDUSTRY_LOCATION:
|
||||
case CBID_INDTILE_CARGO_ACCEPTANCE:
|
||||
case CBID_VEHICLE_COLOUR_MAPPING:
|
||||
case CBID_HOUSE_PRODUCE_CARGO:
|
||||
case CBID_VEHICLE_SOUND_EFFECT:
|
||||
case CBID_SOUNDS_AMBIENT_EFFECT:
|
||||
nvarzero.g.callback.result = GB(value, 0, 15);
|
||||
break;
|
||||
|
||||
/* The rest is a 8 bit callback, which should be truncated properly */
|
||||
default:
|
||||
nvarzero.g.callback.result = GB(value, 0, 8);
|
||||
break;
|
||||
}
|
||||
return &nvarzero;
|
||||
}
|
||||
|
||||
@@ -294,14 +280,6 @@ const SpriteGroup *Resolve(const SpriteGroup *group, ResolverObject *object)
|
||||
case SGT_REAL: return object->ResolveReal(object, group);
|
||||
case SGT_DETERMINISTIC: return ResolveVariable(group, object);
|
||||
case SGT_RANDOMIZED: return ResolveRandom(group, object);
|
||||
case SGT_CALLBACK: {
|
||||
if (!Is8BitCallback(object)) return group;
|
||||
|
||||
static SpriteGroup result8bit;
|
||||
result8bit.type = SGT_CALLBACK;
|
||||
result8bit.g.callback.result = GB(group->g.callback.result, 0, 8);
|
||||
return &result8bit;
|
||||
}
|
||||
default: return group;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -198,7 +198,6 @@ struct ResolverObject {
|
||||
CallbackID callback;
|
||||
uint32 callback_param1;
|
||||
uint32 callback_param2;
|
||||
bool procedure_call; ///< true if we are currently resolving a var 0x7E procedure result.
|
||||
|
||||
byte trigger;
|
||||
uint32 last_value;
|
||||
@@ -255,8 +254,6 @@ struct ResolverObject {
|
||||
void (*SetTriggers)(const struct ResolverObject*, int);
|
||||
uint32 (*GetVariable)(const struct ResolverObject*, byte, byte, bool*);
|
||||
const SpriteGroup *(*ResolveReal)(const struct ResolverObject*, const SpriteGroup*);
|
||||
|
||||
ResolverObject() : procedure_call(false) { }
|
||||
};
|
||||
|
||||
|
||||
|
||||
@@ -105,7 +105,7 @@ StringID GetStationClassName(StationClassID sclass)
|
||||
uint GetNumStationClasses()
|
||||
{
|
||||
uint i;
|
||||
for (i = 0; i < STAT_CLASS_MAX && _station_classes[i].id != 0; i++) {}
|
||||
for (i = 0; i < STAT_CLASS_MAX && _station_classes[i].id != 0; i++);
|
||||
return i;
|
||||
}
|
||||
|
||||
@@ -724,7 +724,7 @@ void DeallocateSpecFromStation(Station* st, byte specindex)
|
||||
|
||||
/* If this was the highest spec index, reallocate */
|
||||
if (specindex == st->num_specs - 1) {
|
||||
for (; st->speclist[st->num_specs - 1].grfid == 0 && st->num_specs > 1; st->num_specs--) {}
|
||||
for (; st->speclist[st->num_specs - 1].grfid == 0 && st->num_specs > 1; st->num_specs--);
|
||||
|
||||
if (st->num_specs > 1) {
|
||||
st->speclist = ReallocT(st->speclist, st->num_specs);
|
||||
|
||||
+1
-1
@@ -642,7 +642,7 @@ uint RemapNewGRFStringControlCode(uint scc, char **buff, const char **str, int64
|
||||
case SCC_NEWGRF_PRINT_SIGNED_WORD:
|
||||
case SCC_NEWGRF_PRINT_SIGNED_BYTE:
|
||||
case SCC_NEWGRF_PRINT_UNSIGNED_WORD:
|
||||
return SCC_COMMA;
|
||||
return SCC_NUM;
|
||||
|
||||
case SCC_NEWGRF_PRINT_DWORD_CURRENCY:
|
||||
case SCC_NEWGRF_PRINT_QWORD_CURRENCY:
|
||||
|
||||
+1
-1
@@ -64,7 +64,7 @@ uint32 TownGetVariable(byte variable, byte parameter, bool *available, const Tow
|
||||
case 0xAD: return GB(t->ratings[7], 8, 8);
|
||||
case 0xAE: return t->have_ratings;
|
||||
case 0xB2: return t->statues;
|
||||
case 0xB6: return ClampToU16(t->num_houses);
|
||||
case 0xB6: return t->num_houses;
|
||||
case 0xB9: return t->growth_rate;
|
||||
case 0xBA: return ClampToU16(t->new_max_pass);
|
||||
case 0xBB: return GB(ClampToU16(t->new_max_pass), 8, 8);
|
||||
|
||||
+14
-39
@@ -339,18 +339,6 @@ static void FixOldVehicles()
|
||||
ClrBit(v->u.road.state, RVS_IS_STOPPING);
|
||||
}
|
||||
|
||||
/* The subtype should be 0, but it sometimes isn't :( */
|
||||
if (v->type == VEH_ROAD) v->subtype = 0;
|
||||
|
||||
/* Sometimes primary vehicles would have a nothing (invalid) order
|
||||
* or vehicles that could not have an order would still have a
|
||||
* (loading) order which causes assertions and the like later on.
|
||||
*/
|
||||
if (!IsPlayerBuildableVehicleType(v) ||
|
||||
(v->IsPrimaryVehicle() && v->current_order.type == OT_NOTHING)) {
|
||||
v->current_order.type = OT_DUMMY;
|
||||
}
|
||||
|
||||
FOR_ALL_VEHICLES_FROM(u, v->index + 1) {
|
||||
/* If a vehicle has the same orders, add the link to eachother
|
||||
* in both vehicles */
|
||||
@@ -440,7 +428,7 @@ static void ReadTTDPatchFlags()
|
||||
|
||||
static const OldChunks town_chunk[] = {
|
||||
OCL_SVAR( OC_TILE, Town, xy ),
|
||||
OCL_NULL( 2 ), ///< population, no longer in use
|
||||
OCL_SVAR( OC_FILE_U16 | OC_VAR_U32, Town, population ),
|
||||
OCL_SVAR( OC_UINT16, Town, townnametype ),
|
||||
OCL_SVAR( OC_UINT32, Town, townnameparts ),
|
||||
OCL_SVAR( OC_UINT8, Town, grow_counter ),
|
||||
@@ -463,7 +451,7 @@ static const OldChunks town_chunk[] = {
|
||||
nothing changed ? ? */
|
||||
OCL_SVAR( OC_FILE_U32 | OC_VAR_U8, Town, have_ratings ),
|
||||
OCL_SVAR( OC_FILE_U32 | OC_VAR_U8, Town, statues ),
|
||||
OCL_NULL( 2 ), ///< num_houses, no longer in use
|
||||
OCL_SVAR( OC_UINT16, Town, num_houses ),
|
||||
OCL_SVAR( OC_UINT8, Town, time_until_rebuild ),
|
||||
OCL_SVAR( OC_UINT8, Town, growth_rate ),
|
||||
|
||||
@@ -1111,15 +1099,17 @@ static bool LoadOldVehicleUnion(LoadgameState *ls, int num)
|
||||
uint temp = ls->total_read;
|
||||
bool res;
|
||||
|
||||
/* We changed the offset of the vehicle types, so fix it
|
||||
* Basically v->type -= 0x10; would suffice, but play safely */
|
||||
switch (v->type) {
|
||||
default: NOT_REACHED();
|
||||
case VEH_INVALID : res = LoadChunk(ls, NULL, vehicle_empty_chunk); break;
|
||||
case VEH_TRAIN : res = LoadChunk(ls, &v->u.rail, vehicle_train_chunk); break;
|
||||
case VEH_ROAD : res = LoadChunk(ls, &v->u.road, vehicle_road_chunk); break;
|
||||
case VEH_SHIP : res = LoadChunk(ls, &v->u.ship, vehicle_ship_chunk); break;
|
||||
case VEH_AIRCRAFT: res = LoadChunk(ls, &v->u.air, vehicle_air_chunk); break;
|
||||
case VEH_SPECIAL : res = LoadChunk(ls, &v->u.special, vehicle_special_chunk); break;
|
||||
case VEH_DISASTER: res = LoadChunk(ls, &v->u.disaster, vehicle_disaster_chunk); break;
|
||||
case 0x00 /*VEH_INVALID */: v = new (v) InvalidVehicle(); res = LoadChunk(ls, NULL, vehicle_empty_chunk); break;
|
||||
case 0x10 /*VEH_TRAIN */: v = new (v) Train(); res = LoadChunk(ls, &v->u.rail, vehicle_train_chunk); break;
|
||||
case 0x11 /*VEH_ROAD */: v = new (v) RoadVehicle(); res = LoadChunk(ls, &v->u.road, vehicle_road_chunk); break;
|
||||
case 0x12 /*VEH_SHIP */: v = new (v) Ship(); res = LoadChunk(ls, &v->u.ship, vehicle_ship_chunk); break;
|
||||
case 0x13 /*VEH_AIRCRAFT*/: v = new (v) Aircraft(); res = LoadChunk(ls, &v->u.air, vehicle_air_chunk); break;
|
||||
case 0x14 /*VEH_SPECIAL */: v = new (v) SpecialVehicle(); res = LoadChunk(ls, &v->u.special, vehicle_special_chunk); break;
|
||||
case 0x15 /*VEH_DISASTER*/: v = new (v) DisasterVehicle(); res = LoadChunk(ls, &v->u.disaster, vehicle_disaster_chunk); break;
|
||||
}
|
||||
|
||||
/* This chunk size should always be 10 bytes */
|
||||
@@ -1134,6 +1124,7 @@ static bool LoadOldVehicleUnion(LoadgameState *ls, int num)
|
||||
static uint16 _cargo_count;
|
||||
|
||||
static const OldChunks vehicle_chunk[] = {
|
||||
OCL_SVAR( OC_UINT8, Vehicle, type ),
|
||||
OCL_SVAR( OC_UINT8, Vehicle, subtype ),
|
||||
|
||||
OCL_NULL( 2 ), ///< Hash, calculated automatically
|
||||
@@ -1222,18 +1213,7 @@ bool LoadOldVehicle(LoadgameState *ls, int num)
|
||||
for (i = 0; i < _old_vehicle_multiplier; i++) {
|
||||
_current_vehicle_id = num * _old_vehicle_multiplier + i;
|
||||
|
||||
/* Read the vehicle type and allocate the right vehicle */
|
||||
Vehicle *v;
|
||||
switch (ReadByte(ls)) {
|
||||
default: NOT_REACHED();
|
||||
case 0x00 /*VEH_INVALID */: v = new (_current_vehicle_id) InvalidVehicle(); break;
|
||||
case 0x10 /*VEH_TRAIN */: v = new (_current_vehicle_id) Train(); break;
|
||||
case 0x11 /*VEH_ROAD */: v = new (_current_vehicle_id) RoadVehicle(); break;
|
||||
case 0x12 /*VEH_SHIP */: v = new (_current_vehicle_id) Ship(); break;
|
||||
case 0x13 /*VEH_AIRCRAFT*/: v = new (_current_vehicle_id) Aircraft(); break;
|
||||
case 0x14 /*VEH_SPECIAL */: v = new (_current_vehicle_id) SpecialVehicle(); break;
|
||||
case 0x15 /*VEH_DISASTER*/: v = new (_current_vehicle_id) DisasterVehicle(); break;
|
||||
}
|
||||
Vehicle *v = new (_current_vehicle_id) InvalidVehicle();
|
||||
if (!LoadChunk(ls, v, vehicle_chunk)) return false;
|
||||
|
||||
/* This should be consistent, else we have a big problem... */
|
||||
@@ -1243,12 +1223,7 @@ bool LoadOldVehicle(LoadgameState *ls, int num)
|
||||
}
|
||||
|
||||
if (_old_order_ptr != 0 && _old_order_ptr != 0xFFFFFFFF) {
|
||||
uint old_id = REMAP_ORDER_IDX(_old_order_ptr);
|
||||
/* There is a maximum of 5000 orders in old savegames, so *if*
|
||||
* we go over that limit something is very wrong. In that case
|
||||
* we just assume there are no orders for the vehicle.
|
||||
*/
|
||||
if (old_id < 5000) v->orders = GetOrder(old_id);
|
||||
v->orders = GetOrder(REMAP_ORDER_IDX(_old_order_ptr));
|
||||
}
|
||||
AssignOrder(&v->current_order, UnpackOldOrder(_old_order));
|
||||
|
||||
|
||||
+7
-16
@@ -1348,9 +1348,9 @@ bool AfterLoadGame()
|
||||
if (CheckSavegameVersionOldStyle(6, 1)) UpdateSignOwner();
|
||||
|
||||
/* In old version there seems to be a problem that water is owned by
|
||||
* OWNER_NONE, not OWNER_WATER.. I can't replicate it for the current
|
||||
* (4.3) version, so I just check when versions are older, and then
|
||||
* walk through the whole map.. */
|
||||
OWNER_NONE, not OWNER_WATER.. I can't replicate it for the current
|
||||
(4.3) version, so I just check when versions are older, and then
|
||||
walk through the whole map.. */
|
||||
if (CheckSavegameVersionOldStyle(4, 3)) {
|
||||
for (TileIndex t = 0; t < map_size; t++) {
|
||||
if (IsTileType(t, MP_WATER) && GetTileOwner(t) >= MAX_PLAYERS) {
|
||||
@@ -2034,8 +2034,8 @@ bool AfterLoadGame()
|
||||
}
|
||||
}
|
||||
|
||||
/* Check and update house and town values */
|
||||
UpdateHousesAndTowns();
|
||||
/* Check that house ids are still valid. */
|
||||
CheckHouseIDs();
|
||||
|
||||
if (CheckSavegameVersion(43)) {
|
||||
for (TileIndex t = 0; t < map_size; t++) {
|
||||
@@ -2431,15 +2431,6 @@ bool AfterLoadGame()
|
||||
}
|
||||
}
|
||||
|
||||
if (CheckSavegameVersion(91)) {
|
||||
/* Increase HouseAnimationFrame from 5 to 7 bits */
|
||||
for (TileIndex t = 0; t < map_size; t++) {
|
||||
if (IsTileType(t, MP_HOUSE) && GetHouseType(t) >= NEW_HOUSE_OFFSET) {
|
||||
SetHouseAnimationFrame(t, GB(_m[t].m6, 3, 5));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return InitializeWindowsAndCaches();
|
||||
}
|
||||
|
||||
@@ -2461,8 +2452,8 @@ void ReloadNewGRFData()
|
||||
/* update station and waypoint graphics */
|
||||
AfterLoadWaypoints();
|
||||
AfterLoadStations();
|
||||
/* Check and update house and town values */
|
||||
UpdateHousesAndTowns();
|
||||
/* check that house ids are still valid */
|
||||
CheckHouseIDs();
|
||||
/* redraw the whole screen */
|
||||
MarkWholeScreenDirty();
|
||||
}
|
||||
|
||||
+2
-2
@@ -997,8 +997,8 @@ void RestoreVehicleOrders(const Vehicle *v, const BackuppedOrders *bak)
|
||||
break;
|
||||
}
|
||||
|
||||
/* Copy timetable if enabled */
|
||||
if (_patches.timetabling && !DoCommandP(0, v->index | (i << 16) | (1 << 25),
|
||||
/* Copy timetable */
|
||||
if (!DoCommandP(0, v->index | (i << 16) | (1 << 25),
|
||||
bak->order[i].wait_time << 16 | bak->order[i].travel_time, NULL,
|
||||
CMD_CHANGE_TIMETABLE | CMD_NO_TEST_IF_IN_NETWORK)) {
|
||||
break;
|
||||
|
||||
+6
-6
@@ -13,7 +13,7 @@
|
||||
#ifdef MSVC
|
||||
#include "winres.h"
|
||||
#else
|
||||
#define IDC_STATIC (-1) // all static controls
|
||||
#include "afxres.h"
|
||||
#endif
|
||||
|
||||
/////////////////////////////////////////////////////////////////////////////
|
||||
@@ -66,8 +66,8 @@ END
|
||||
//
|
||||
|
||||
VS_VERSION_INFO VERSIONINFO
|
||||
FILEVERSION 0,6,0,12525
|
||||
PRODUCTVERSION 0,6,0,12525
|
||||
FILEVERSION 0,6,0,12338
|
||||
PRODUCTVERSION 0,6,0,12338
|
||||
FILEFLAGSMASK 0x3fL
|
||||
#ifdef _DEBUG
|
||||
FILEFLAGS 0x1L
|
||||
@@ -85,14 +85,14 @@ BEGIN
|
||||
VALUE "Comments", "This program is licensed under the GNU General Public License.\0"
|
||||
VALUE "CompanyName", "OpenTTD Development Team\0"
|
||||
VALUE "FileDescription", "OpenTTD\0"
|
||||
VALUE "FileVersion", "0.6.0\0"
|
||||
VALUE "FileVersion", "@@VERSION@@\0"
|
||||
VALUE "InternalName", "openttd\0"
|
||||
VALUE "LegalCopyright", "Copyright © OpenTTD Developers 2002-2008. All Rights Reserved.\0"
|
||||
VALUE "LegalCopyright", "Copyright © OpenTTD Developers 2002-2007. All Rights Reserved.\0"
|
||||
VALUE "LegalTrademarks", "\0"
|
||||
VALUE "OriginalFilename", "openttd.exe\0"
|
||||
VALUE "PrivateBuild", "\0"
|
||||
VALUE "ProductName", "OpenTTD\0"
|
||||
VALUE "ProductVersion", "0.6.0\0"
|
||||
VALUE "ProductVersion", "@@VERSION@@\0"
|
||||
VALUE "SpecialBuild", "-\0"
|
||||
END
|
||||
END
|
||||
|
||||
+30
-15
@@ -611,22 +611,37 @@ start_at:
|
||||
/* If the tile is the entry tile of a tunnel, and we're not going out of the tunnel,
|
||||
* need to find the exit of the tunnel. */
|
||||
if (IsTileType(tile, MP_TUNNELBRIDGE)) {
|
||||
if (GetTunnelBridgeDirection(tile) != ReverseDiagDir(direction)) {
|
||||
/* We are not just driving out of the tunnel/bridge */
|
||||
if (GetTunnelBridgeDirection(tile) != direction ||
|
||||
GetTunnelBridgeTransportType(tile) != tpf->tracktype) {
|
||||
/* We are not driving into the tunnel/bridge, or it is an invalid tunnel/bridge */
|
||||
continue;
|
||||
}
|
||||
if (!HasBit(tpf->railtypes, GetRailType(tile))) {
|
||||
bits = TRACK_BIT_NONE;
|
||||
break;
|
||||
}
|
||||
if (IsTunnel(tile)) {
|
||||
if (GetTunnelBridgeDirection(tile) != ReverseDiagDir(direction)) {
|
||||
/* We are not just driving out of the tunnel */
|
||||
if (GetTunnelBridgeDirection(tile) != direction ||
|
||||
GetTunnelBridgeTransportType(tile) != tpf->tracktype) {
|
||||
/* We are not driving into the tunnel, or it is an invalid tunnel */
|
||||
continue;
|
||||
}
|
||||
if (!HasBit(tpf->railtypes, GetRailType(tile))) {
|
||||
bits = TRACK_BIT_NONE;
|
||||
break;
|
||||
}
|
||||
|
||||
TileIndex endtile = GetOtherTunnelBridgeEnd(tile);
|
||||
si.cur_length += DIAG_FACTOR * (GetTunnelBridgeLength(tile, endtile) + 1);
|
||||
tile = endtile;
|
||||
/* tile now points to the exit tile of the tunnel/bridge */
|
||||
TileIndex endtile = GetOtherTunnelEnd(tile);
|
||||
si.cur_length += DIAG_FACTOR * (GetTunnelBridgeLength(tile, endtile) + 1);
|
||||
tile = endtile;
|
||||
/* tile now points to the exit tile of the tunnel */
|
||||
}
|
||||
} else { // IsBridge(tile)
|
||||
TileIndex tile_end;
|
||||
if (GetTunnelBridgeDirection(tile) != ReverseDiagDir(direction)) {
|
||||
/* We are not just leaving the bridge */
|
||||
if (GetTunnelBridgeDirection(tile) != direction ||
|
||||
GetTunnelBridgeTransportType(tile) != tpf->tracktype) {
|
||||
/* Not entering the bridge or not compatible */
|
||||
continue;
|
||||
}
|
||||
}
|
||||
tile_end = GetOtherBridgeEnd(tile);
|
||||
si.cur_length += DIAG_FACTOR * (GetTunnelBridgeLength(tile, tile_end) + 1);
|
||||
tile = tile_end;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -181,7 +181,6 @@ void *UpdateTrainPowerProc(Vehicle *v, void *data);
|
||||
void DrawTrainDepotSprite(int x, int y, int image, RailType railtype);
|
||||
void DrawDefaultWaypointSprite(int x, int y, RailType railtype);
|
||||
void *EnsureNoTrainOnTrackProc(Vehicle *v, void *data);
|
||||
int TicksToLeaveDepot(const Vehicle *v);
|
||||
|
||||
/**
|
||||
* Draws overhead wires and pylons for electric railways.
|
||||
|
||||
+13
-52
@@ -1699,51 +1699,35 @@ static void DrawTrackBits(TileInfo* ti, TrackBits track)
|
||||
}
|
||||
}
|
||||
|
||||
/** Enums holding the offsets from base signal sprite,
|
||||
* according to the side it is representing.
|
||||
* The addtion of 2 per enum is necessary in order to "jump" over the
|
||||
* green state sprite, all signal sprites being in pair,
|
||||
* starting with the off-red state */
|
||||
enum {
|
||||
SIGNAL_TO_SOUTHWEST = 0,
|
||||
SIGNAL_TO_NORTHEAST = 2,
|
||||
SIGNAL_TO_SOUTHEAST = 4,
|
||||
SIGNAL_TO_NORTHWEST = 6,
|
||||
SIGNAL_TO_EAST = 8,
|
||||
SIGNAL_TO_WEST = 10,
|
||||
SIGNAL_TO_SOUTH = 12,
|
||||
SIGNAL_TO_NORTH = 14,
|
||||
};
|
||||
|
||||
static void DrawSignals(TileIndex tile, TrackBits rails)
|
||||
{
|
||||
#define MAYBE_DRAW_SIGNAL(x,y,z,t) if (IsSignalPresent(tile, x)) DrawSingleSignal(tile, t, GetSingleSignalState(tile, x), y, z)
|
||||
#define MAYBE_DRAW_SIGNAL(x,y,z,t) if (IsSignalPresent(tile, x)) DrawSingleSignal(tile, t, GetSingleSignalState(tile, x), y - 0x4FB, z)
|
||||
|
||||
if (!(rails & TRACK_BIT_Y)) {
|
||||
if (!(rails & TRACK_BIT_X)) {
|
||||
if (rails & TRACK_BIT_LEFT) {
|
||||
MAYBE_DRAW_SIGNAL(2, SIGNAL_TO_NORTH, 0, TRACK_LEFT);
|
||||
MAYBE_DRAW_SIGNAL(3, SIGNAL_TO_SOUTH, 1, TRACK_LEFT);
|
||||
MAYBE_DRAW_SIGNAL(2, 0x509, 0, TRACK_LEFT);
|
||||
MAYBE_DRAW_SIGNAL(3, 0x507, 1, TRACK_LEFT);
|
||||
}
|
||||
if (rails & TRACK_BIT_RIGHT) {
|
||||
MAYBE_DRAW_SIGNAL(0, SIGNAL_TO_NORTH, 2, TRACK_RIGHT);
|
||||
MAYBE_DRAW_SIGNAL(1, SIGNAL_TO_SOUTH, 3, TRACK_RIGHT);
|
||||
MAYBE_DRAW_SIGNAL(0, 0x509, 2, TRACK_RIGHT);
|
||||
MAYBE_DRAW_SIGNAL(1, 0x507, 3, TRACK_RIGHT);
|
||||
}
|
||||
if (rails & TRACK_BIT_UPPER) {
|
||||
MAYBE_DRAW_SIGNAL(3, SIGNAL_TO_WEST, 4, TRACK_UPPER);
|
||||
MAYBE_DRAW_SIGNAL(2, SIGNAL_TO_EAST, 5, TRACK_UPPER);
|
||||
MAYBE_DRAW_SIGNAL(3, 0x505, 4, TRACK_UPPER);
|
||||
MAYBE_DRAW_SIGNAL(2, 0x503, 5, TRACK_UPPER);
|
||||
}
|
||||
if (rails & TRACK_BIT_LOWER) {
|
||||
MAYBE_DRAW_SIGNAL(1, SIGNAL_TO_WEST, 6, TRACK_LOWER);
|
||||
MAYBE_DRAW_SIGNAL(0, SIGNAL_TO_EAST, 7, TRACK_LOWER);
|
||||
MAYBE_DRAW_SIGNAL(1, 0x505, 6, TRACK_LOWER);
|
||||
MAYBE_DRAW_SIGNAL(0, 0x503, 7, TRACK_LOWER);
|
||||
}
|
||||
} else {
|
||||
MAYBE_DRAW_SIGNAL(3, SIGNAL_TO_SOUTHWEST, 8, TRACK_X);
|
||||
MAYBE_DRAW_SIGNAL(2, SIGNAL_TO_NORTHEAST, 9, TRACK_X);
|
||||
MAYBE_DRAW_SIGNAL(3, 0x4FB, 8, TRACK_X);
|
||||
MAYBE_DRAW_SIGNAL(2, 0x4FD, 9, TRACK_X);
|
||||
}
|
||||
} else {
|
||||
MAYBE_DRAW_SIGNAL(3, SIGNAL_TO_SOUTHEAST, 10, TRACK_Y);
|
||||
MAYBE_DRAW_SIGNAL(2, SIGNAL_TO_NORTHWEST, 11, TRACK_Y);
|
||||
MAYBE_DRAW_SIGNAL(3, 0x4FF, 10, TRACK_Y);
|
||||
MAYBE_DRAW_SIGNAL(2, 0x501, 11, TRACK_Y);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -2230,29 +2214,6 @@ static const signed char _deltacoord_leaveoffset[8] = {
|
||||
0, 1, 0, -1 /* y */
|
||||
};
|
||||
|
||||
|
||||
/** Compute number of ticks when next wagon will leave a depot.
|
||||
* Negative means next wagon should have left depot n ticks before.
|
||||
* @param v vehicle outside (leaving) the depot
|
||||
* @return number of ticks when the next wagon will leave
|
||||
*/
|
||||
int TicksToLeaveDepot(const Vehicle *v)
|
||||
{
|
||||
DiagDirection dir = GetRailDepotDirection(v->tile);
|
||||
int length = v->u.rail.cached_veh_length;
|
||||
|
||||
switch (dir) {
|
||||
case DIAGDIR_NE: return ((int)(v->x_pos & 0x0F) - ((_fractcoords_enter[dir] & 0x0F) - (length + 1)));
|
||||
case DIAGDIR_SE: return -((int)(v->y_pos & 0x0F) - ((_fractcoords_enter[dir] >> 4) + (length + 1)));
|
||||
case DIAGDIR_SW: return -((int)(v->x_pos & 0x0F) - ((_fractcoords_enter[dir] & 0x0F) + (length + 1)));
|
||||
default:
|
||||
case DIAGDIR_NW: return ((int)(v->y_pos & 0x0F) - ((_fractcoords_enter[dir] >> 4) - (length + 1)));
|
||||
}
|
||||
|
||||
return 0; // make compilers happy
|
||||
}
|
||||
|
||||
|
||||
static VehicleEnterTileStatus VehicleEnter_Track(Vehicle *v, TileIndex tile, int x, int y)
|
||||
{
|
||||
byte fract_coord;
|
||||
|
||||
+3
-3
@@ -19,7 +19,7 @@
|
||||
* norev000 is for non-releases that are made on systems without
|
||||
* subversion or sources that are not a checkout of subversion.
|
||||
*/
|
||||
extern const char _openttd_revision[] = "0.6.0";
|
||||
extern const char _openttd_revision[] = "@@VERSION@@";
|
||||
|
||||
/**
|
||||
* The NewGRF revision of OTTD:
|
||||
@@ -34,11 +34,11 @@ extern const char _openttd_revision[] = "0.6.0";
|
||||
* final release will always have a lower version number than the released
|
||||
* version, thus making comparisions on specific revisions easy.
|
||||
*/
|
||||
uint32 _openttd_newgrf_version = 0 << 28 | 6 << 24 | 0 << 20 | 1 << 19 | (12525 & ((1 << 19) - 1));
|
||||
uint32 _openttd_newgrf_version = 0 << 28 | 6 << 24 | 0 << 20 | 0 << 19 | (12338 & ((1 << 19) - 1));
|
||||
|
||||
#ifdef __MORPHOS__
|
||||
/**
|
||||
* Variable used by MorphOS to show the version.
|
||||
*/
|
||||
extern const char morphos_versions_tag[] = "\\0$VER: OpenTTD 0.6.0 (@@DATE@@) OpenTTD Team [MorphOS, PowerPC]";
|
||||
extern const char morphos_versions_tag[] = "\\0$VER: OpenTTD @@VERSION@@ (@@DATE@@) OpenTTD Team [MorphOS, PowerPC]";
|
||||
#endif
|
||||
|
||||
@@ -414,9 +414,6 @@ CommandCost CmdBuildRoad(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
|
||||
|
||||
RoadBits pieces = Extract<RoadBits, 0>(p1);
|
||||
|
||||
/* do not allow building 'zero' road bits, code wouldn't handle it */
|
||||
if (pieces == ROAD_NONE) return CMD_ERROR;
|
||||
|
||||
RoadType rt = (RoadType)GB(p1, 4, 2);
|
||||
if (!IsValidRoadType(rt) || !ValParamRoadType(rt)) return CMD_ERROR;
|
||||
|
||||
|
||||
@@ -114,20 +114,6 @@ static inline RoadBits DiagDirToRoadBits(DiagDirection d)
|
||||
return (RoadBits)(ROAD_NW << (3 ^ d));
|
||||
}
|
||||
|
||||
/**
|
||||
* Create the road-part which belongs to the given Axis
|
||||
*
|
||||
* This function returns a RoadBits value which belongs to
|
||||
* the given Axis.
|
||||
*
|
||||
* @param a The Axis
|
||||
* @return The result RoadBits which the selected road-part set
|
||||
*/
|
||||
static inline RoadBits AxisToRoadBits(Axis a)
|
||||
{
|
||||
return a == AXIS_X ? ROAD_X : ROAD_Y;
|
||||
}
|
||||
|
||||
/**
|
||||
* Finds out, whether given player has all given RoadTypes available
|
||||
* @param PlayerID ID of player
|
||||
|
||||
@@ -418,11 +418,9 @@ static void UpdateOptionWidgetStatus(Window *w, int clicked_widget)
|
||||
switch (clicked_widget) {
|
||||
case RTW_REMOVE:
|
||||
w->RaiseWidget(RTW_ONE_WAY);
|
||||
w->InvalidateWidget(RTW_ONE_WAY);
|
||||
break;
|
||||
case RTW_ONE_WAY:
|
||||
w->RaiseWidget(RTW_REMOVE);
|
||||
w->InvalidateWidget(RTW_REMOVE);
|
||||
break;
|
||||
case RTW_BUS_STATION:
|
||||
case RTW_TRUCK_STATION:
|
||||
|
||||
+2
-4
@@ -14,7 +14,7 @@
|
||||
#include "tunnelbridge_map.h"
|
||||
|
||||
|
||||
RoadBits GetAnyRoadBits(TileIndex tile, RoadType rt, bool straight_tunnel_bridge_entrance)
|
||||
RoadBits GetAnyRoadBits(TileIndex tile, RoadType rt)
|
||||
{
|
||||
if (!HasTileRoadType(tile, rt)) return ROAD_NONE;
|
||||
|
||||
@@ -34,9 +34,7 @@ RoadBits GetAnyRoadBits(TileIndex tile, RoadType rt, bool straight_tunnel_bridge
|
||||
|
||||
case MP_TUNNELBRIDGE:
|
||||
if (GetTunnelBridgeTransportType(tile) != TRANSPORT_ROAD) return ROAD_NONE;
|
||||
return straight_tunnel_bridge_entrance ?
|
||||
AxisToRoadBits(DiagDirToAxis(GetTunnelBridgeDirection(tile))) :
|
||||
DiagDirToRoadBits(ReverseDiagDir(GetTunnelBridgeDirection(tile)));
|
||||
return DiagDirToRoadBits(ReverseDiagDir(GetTunnelBridgeDirection(tile)));
|
||||
|
||||
default: return ROAD_NONE;
|
||||
}
|
||||
|
||||
+1
-6
@@ -328,16 +328,11 @@ static inline DiagDirection GetRoadDepotDirection(TileIndex t)
|
||||
* - road tunnels: entrance is treated as road piece
|
||||
* - bridge ramps: start of the ramp is treated as road piece
|
||||
* - bridge middle parts: bridge itself is ignored
|
||||
*
|
||||
* If straight_tunnel_bridge_entrance is set a ROAD_X or ROAD_Y
|
||||
* for bridge ramps and tunnel entrances is returned depending
|
||||
* on the orientation of the tunnel or bridge.
|
||||
* @param tile the tile to get the road bits for
|
||||
* @param rt the road type to get the road bits form
|
||||
* @param stbe whether to return straight road bits for tunnels/bridges.
|
||||
* @return the road bits of the given tile
|
||||
*/
|
||||
RoadBits GetAnyRoadBits(TileIndex tile, RoadType rt, bool straight_tunnel_bridge_entrance = false);
|
||||
RoadBits GetAnyRoadBits(TileIndex tile, RoadType rt);
|
||||
|
||||
/**
|
||||
* Get the accessible track bits for the given tile.
|
||||
|
||||
+2
-2
@@ -1461,7 +1461,7 @@ static Trackdir FollowPreviousRoadVehicle(const Vehicle *v, const Vehicle *prev,
|
||||
};
|
||||
RoadBits required = required_roadbits[dir & 0x07];
|
||||
|
||||
if ((required & GetAnyRoadBits(tile, v->u.road.roadtype, true)) == ROAD_NONE) {
|
||||
if ((required & GetAnyRoadBits(tile, v->u.road.roadtype)) == ROAD_NONE) {
|
||||
dir = INVALID_TRACKDIR;
|
||||
}
|
||||
|
||||
@@ -1698,7 +1698,7 @@ again:
|
||||
uint turn_around_start_frame = RVC_TURN_AROUND_START_FRAME;
|
||||
|
||||
RoadBits tram;
|
||||
if (v->u.road.roadtype == ROADTYPE_TRAM && CountBits(tram = GetAnyRoadBits(v->tile, ROADTYPE_TRAM, true)) == 1) {
|
||||
if (v->u.road.roadtype == ROADTYPE_TRAM && CountBits(tram = GetAnyRoadBits(v->tile, ROADTYPE_TRAM)) == 1) {
|
||||
/*
|
||||
* The tram is turning around with one tram 'roadbit'. This means that
|
||||
* it is using the 'big' corner 'drive data'. However, to support the
|
||||
|
||||
+2
-2
@@ -34,7 +34,7 @@
|
||||
|
||||
#include "table/strings.h"
|
||||
|
||||
extern const uint16 SAVEGAME_VERSION = 92;
|
||||
extern const uint16 SAVEGAME_VERSION = 90;
|
||||
uint16 _sl_version; ///< the major savegame version identifier
|
||||
byte _sl_minor_version; ///< the minor savegame version, DO NOT USE!
|
||||
|
||||
@@ -1600,7 +1600,7 @@ SaveOrLoadResult SaveOrLoad(const char *filename, int mode, Subdirectory sb)
|
||||
InitializeGame(IG_DATE_RESET, 256, 256); // set a mapsize of 256x256 for TTDPatch games or it might get confused
|
||||
if (!LoadOldSaveGame(filename)) return SL_REINIT;
|
||||
_sl_version = 0;
|
||||
if (!AfterLoadGame()) return SL_REINIT;
|
||||
AfterLoadGame();
|
||||
return SL_OK;
|
||||
}
|
||||
|
||||
|
||||
+4
-46
@@ -236,7 +236,7 @@ static IniFile *ini_load(const char *filename)
|
||||
while (fgets(buffer, sizeof(buffer), in)) {
|
||||
|
||||
/* trim whitespace from the left side */
|
||||
for (s = buffer; *s == ' ' || *s == '\t'; s++) {}
|
||||
for (s = buffer; *s == ' ' || *s == '\t'; s++);
|
||||
|
||||
/* trim whitespace from right side. */
|
||||
e = s + strlen(s);
|
||||
@@ -278,10 +278,10 @@ static IniFile *ini_load(const char *filename)
|
||||
/* find end of keyname */
|
||||
if (*s == '\"') {
|
||||
s++;
|
||||
for (t = s; *t != '\0' && *t != '\"'; t++) {}
|
||||
for (t = s; *t != '\0' && *t != '\"'; t++);
|
||||
if (*t == '\"') *t = ' ';
|
||||
} else {
|
||||
for (t = s; *t != '\0' && *t != '=' && *t != '\t' && *t != ' '; t++) {}
|
||||
for (t = s; *t != '\0' && *t != '=' && *t != '\t' && *t != ' '; t++);
|
||||
}
|
||||
|
||||
/* it's an item in an existing group */
|
||||
@@ -1195,17 +1195,6 @@ static int32 EngineRenewMoneyUpdate(int32 p1)
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int32 RealisticAccelerationChanged(int32 p1)
|
||||
{
|
||||
Vehicle *v;
|
||||
|
||||
FOR_ALL_VEHICLES(v) {
|
||||
if (v->type == VEH_TRAIN && IsFrontEngine(v)) UpdateTrainAcceleration(v);
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
/**
|
||||
* Check for right TownLayout usage in editor mode.
|
||||
* The No Road mode is not desirable since towns have to be
|
||||
@@ -1406,7 +1395,7 @@ const SettingDesc _patch_settings[] = {
|
||||
|
||||
/***************************************************************************/
|
||||
/* Vehicle section of the GUI-configure patches window */
|
||||
SDT_BOOL(Patches, realistic_acceleration, 0, 0, false, STR_CONFIG_PATCHES_REALISTICACCEL, RealisticAccelerationChanged),
|
||||
SDT_BOOL(Patches, realistic_acceleration, 0, 0, false, STR_CONFIG_PATCHES_REALISTICACCEL, NULL),
|
||||
SDT_BOOL(Patches, forbid_90_deg, 0, 0, false, STR_CONFIG_PATCHES_FORBID_90_DEG, NULL),
|
||||
SDT_BOOL(Patches, mammoth_trains, 0,NN, true, STR_CONFIG_PATCHES_MAMMOTHTRAINS, NULL),
|
||||
SDT_BOOL(Patches, gotodepot, 0, 0, true, STR_CONFIG_PATCHES_GOTODEPOT, NULL),
|
||||
@@ -1750,36 +1739,6 @@ static void NewsDisplaySaveConfig(IniFile *ini, const char *grpname, uint news_d
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Save the version of OpenTTD to the ini file.
|
||||
* @param ini the ini to write to
|
||||
*/
|
||||
static void SaveVersionInConfig(IniFile *ini)
|
||||
{
|
||||
extern const char _openttd_revision[];
|
||||
extern uint32 _openttd_newgrf_version;
|
||||
|
||||
IniGroup *group = ini_getgroup(ini, "version", -1);
|
||||
|
||||
if (group == NULL) return;
|
||||
group->item = NULL;
|
||||
IniItem **item = &group->item;
|
||||
|
||||
char version[9];
|
||||
snprintf(version, lengthof(version), "%08X", _openttd_newgrf_version);
|
||||
|
||||
const char *versions[][2] = {
|
||||
{ "version_string", _openttd_revision },
|
||||
{ "version_number", version }
|
||||
};
|
||||
|
||||
for (uint i = 0; i < lengthof(versions); i++) {
|
||||
*item = ini_item_alloc(group, versions[i][0], strlen(versions[i][0]));
|
||||
(*item)->value = (char*)pool_strdup(&ini->pool, versions[i][1], strlen(versions[i][1]));
|
||||
item = &(*item)->next;
|
||||
}
|
||||
}
|
||||
|
||||
/* Save a GRF configuration to the given group name */
|
||||
static void GRFSaveConfig(IniFile *ini, const char *grpname, const GRFConfig *list)
|
||||
{
|
||||
@@ -1844,7 +1803,6 @@ void SaveToConfig()
|
||||
GRFSaveConfig(ini, "newgrf", _grfconfig_newgame);
|
||||
GRFSaveConfig(ini, "newgrf-static", _grfconfig_static);
|
||||
NewsDisplaySaveConfig(ini, "news_display", _news_display_opt);
|
||||
SaveVersionInConfig(ini);
|
||||
ini_save(_config_file, ini);
|
||||
ini_free(ini);
|
||||
}
|
||||
|
||||
@@ -9,6 +9,7 @@
|
||||
#include "../fileio.h"
|
||||
#include "../debug.h"
|
||||
#include "../core/alloc_func.hpp"
|
||||
#include "../core/endian_func.hpp"
|
||||
#include "png.hpp"
|
||||
#include <png.h>
|
||||
|
||||
@@ -125,8 +126,18 @@ static bool LoadPNG(SpriteLoader::Sprite *sprite, const char *filename, uint32 i
|
||||
color_type = PNG_COLOR_TYPE_RGB;
|
||||
}
|
||||
|
||||
#ifdef TTD_LITTLE_ENDIAN
|
||||
png_set_bgr(png_ptr);
|
||||
#else
|
||||
if (color_type == PNG_COLOR_TYPE_RGB_ALPHA) png_set_swap_alpha(png_ptr);
|
||||
#endif
|
||||
|
||||
if (color_type == PNG_COLOR_TYPE_RGB) {
|
||||
#ifdef TTD_LITTLE_ENDIAN
|
||||
png_set_filler(png_ptr, 0xff, PNG_FILLER_AFTER);
|
||||
#else
|
||||
png_set_filler(png_ptr, 0xff, PNG_FILLER_BEFORE);
|
||||
#endif
|
||||
}
|
||||
|
||||
pixelsize = sizeof(uint32);
|
||||
@@ -148,16 +159,16 @@ static bool LoadPNG(SpriteLoader::Sprite *sprite, const char *filename, uint32 i
|
||||
for (uint x = 0; x < info_ptr->width; x++) {
|
||||
if (mask) {
|
||||
if (row_pointer[x * sizeof(uint8)] != 0) {
|
||||
dst[x].r = 0;
|
||||
dst[x].g = 0;
|
||||
dst[x].b = 0;
|
||||
dst[x].g = 0;
|
||||
dst[x].r = 0;
|
||||
/* Alpha channel is used from the original image (to allow transparency in remap colors) */
|
||||
dst[x].m = row_pointer[x * sizeof(uint8)];
|
||||
}
|
||||
} else {
|
||||
dst[x].r = row_pointer[x * sizeof(uint32) + 0];
|
||||
dst[x].b = row_pointer[x * sizeof(uint32) + 0];
|
||||
dst[x].g = row_pointer[x * sizeof(uint32) + 1];
|
||||
dst[x].b = row_pointer[x * sizeof(uint32) + 2];
|
||||
dst[x].r = row_pointer[x * sizeof(uint32) + 2];
|
||||
dst[x].a = row_pointer[x * sizeof(uint32) + 3];
|
||||
dst[x].m = 0;
|
||||
}
|
||||
|
||||
+1
-1
@@ -953,7 +953,7 @@ static void StationViewWndProc(Window *w, WindowEvent *e)
|
||||
|
||||
case WE_DESTROY: {
|
||||
WindowNumber wno =
|
||||
(w->window_number << 16) | VLW_STATION_LIST | GetStation(w->window_number)->owner;
|
||||
(w->window_number << 16) | GetStation(w->window_number)->owner;
|
||||
|
||||
DeleteWindowById(WC_TRAINS_LIST, wno);
|
||||
DeleteWindowById(WC_ROADVEH_LIST, wno);
|
||||
|
||||
@@ -279,8 +279,6 @@ typedef unsigned char byte;
|
||||
#define assert_compile(expr) extern "C" void __ct_assert__(int a[1 - 2 * !(expr)])
|
||||
#endif /* __OS2__ */
|
||||
|
||||
/* Check if the types have the bitsizes like we are using them */
|
||||
assert_compile(sizeof(uint64) == 8);
|
||||
assert_compile(sizeof(uint32) == 4);
|
||||
assert_compile(sizeof(uint16) == 2);
|
||||
assert_compile(sizeof(uint8) == 1);
|
||||
|
||||
@@ -103,7 +103,7 @@ static char _cases[MAX_NUM_CASES][16];
|
||||
static int _numcases;
|
||||
|
||||
// for each plural value, this is the number of plural forms.
|
||||
static const byte _plural_form_counts[] = { 2, 1, 2, 3, 3, 3, 3, 3, 4, 2 };
|
||||
static const byte _plural_form_counts[] = { 2, 1, 2, 3, 3, 3, 3, 3, 4 };
|
||||
|
||||
static const char *_cur_ident;
|
||||
|
||||
|
||||
+4
-4
@@ -48,7 +48,7 @@ static inline bool StrEmpty(const char *s) { return s == NULL || s[0] == '\0'; }
|
||||
static inline int ttd_strnlen(const char *str, int maxlen)
|
||||
{
|
||||
const char *t;
|
||||
for (t = str; *t != '\0' && t - str < maxlen; t++) {}
|
||||
for (t = str; *t != '\0' && t - str < maxlen; t++);
|
||||
return t - str;
|
||||
}
|
||||
|
||||
@@ -128,7 +128,7 @@ static inline bool IsUtf8Part(char c)
|
||||
static inline char *Utf8PrevChar(const char *s)
|
||||
{
|
||||
const char *ret = s;
|
||||
while (IsUtf8Part(*--ret)) {}
|
||||
while (IsUtf8Part(*--ret));
|
||||
return (char*)ret;
|
||||
}
|
||||
|
||||
@@ -142,8 +142,7 @@ static inline bool IsPrintable(WChar c)
|
||||
}
|
||||
|
||||
/**
|
||||
* Check whether UNICODE character is whitespace or not, i.e. whether
|
||||
* this is a potential line-break character.
|
||||
* Check whether UNICODE character is whitespace or not
|
||||
* @param c UNICODE character to check
|
||||
* @return a boolean value whether 'c' is a whitespace character or not
|
||||
* @see http://www.fileformat.info/info/unicode/category/Zs/list.htm
|
||||
@@ -152,6 +151,7 @@ static inline bool IsWhitespace(WChar c)
|
||||
{
|
||||
return
|
||||
c == 0x0020 /* SPACE */ ||
|
||||
c == 0x00A0 /* NO-BREAK SPACE */ ||
|
||||
c == 0x3000 /* IDEOGRAPHIC SPACE */
|
||||
;
|
||||
}
|
||||
|
||||
@@ -462,12 +462,6 @@ static int DeterminePluralForm(int64 cnt)
|
||||
* Slovenian */
|
||||
case 8:
|
||||
return n % 100 == 1 ? 0 : n % 100 == 2 ? 1 : n % 100 == 3 || n % 100 == 4 ? 2 : 3;
|
||||
|
||||
/* Two forms; singular used for everything ending in 1 but not in 11.
|
||||
* Used in:
|
||||
* Icelandic */
|
||||
case 9:
|
||||
return n % 10 == 1 && n % 100 != 11 ? 0 : 1;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -106,11 +106,11 @@ static const CargoSpec _default_cargo[] = {
|
||||
SPR_CARGO_SUGAR, CC_BULK ),
|
||||
|
||||
MK( 18, 'TOYS', 174, 2, 5574, 25, 255, true, TE_NONE,
|
||||
STR_0025_TOYS, STR_0045_TOY, STR_ITEMS, STR_QUANTITY_TOYS, STR_ABBREV_TOYS,
|
||||
STR_0025_TOYS, STR_0045_TOY, STR_NOTHING, STR_QUANTITY_TOYS, STR_ABBREV_TOYS,
|
||||
SPR_CARGO_TOYS, CC_PIECE_GOODS ),
|
||||
|
||||
MK( 19, 'BATT', 208, 4, 4322, 2, 30, true, TE_NONE,
|
||||
STR_002B_BATTERIES, STR_004B_BATTERY, STR_ITEMS, STR_QUANTITY_BATTERIES, STR_ABBREV_BATTERIES,
|
||||
STR_002B_BATTERIES, STR_004B_BATTERY, STR_NOTHING, STR_QUANTITY_BATTERIES, STR_ABBREV_BATTERIES,
|
||||
SPR_CARGO_BATTERIES, CC_PIECE_GOODS ),
|
||||
|
||||
MK( 20, 'SWET', 194, 5, 6144, 8, 40, true, TE_GOODS,
|
||||
@@ -130,7 +130,7 @@ static const CargoSpec _default_cargo[] = {
|
||||
SPR_CARGO_COTTONCANDY, CC_BULK ),
|
||||
|
||||
MK( 24, 'BUBL', 10, 1, 5077, 20, 80, true, TE_NONE,
|
||||
STR_0029_BUBBLES, STR_0049_BUBBLE, STR_ITEMS, STR_QUANTITY_BUBBLES, STR_ABBREV_BUBBLES,
|
||||
STR_0029_BUBBLES, STR_0049_BUBBLE, STR_NOTHING, STR_QUANTITY_BUBBLES, STR_ABBREV_BUBBLES,
|
||||
SPR_CARGO_BUBBLES, CC_PIECE_GOODS ),
|
||||
|
||||
MK( 25, 'PLST', 202, 16, 4664, 30, 255, true, TE_NONE,
|
||||
@@ -138,7 +138,7 @@ static const CargoSpec _default_cargo[] = {
|
||||
SPR_CARGO_PLASTIC, CC_LIQUID ),
|
||||
|
||||
MK( 26, 'FZDR', 48, 2, 6250, 30, 50, true, TE_FOOD,
|
||||
STR_002D_FIZZY_DRINKS, STR_004D_FIZZY_DRINK, STR_ITEMS, STR_QUANTITY_FIZZY_DRINKS, STR_ABBREV_FIZZY_DRINKS,
|
||||
STR_002D_FIZZY_DRINKS, STR_004D_FIZZY_DRINK, STR_NOTHING, STR_QUANTITY_FIZZY_DRINKS, STR_ABBREV_FIZZY_DRINKS,
|
||||
SPR_CARGO_FIZZYDRINK, CC_PIECE_GOODS ),
|
||||
|
||||
/* Void slot in temperate */
|
||||
|
||||
+1
-1
@@ -33,7 +33,7 @@ static FileList files_dos = {
|
||||
{ "TRGT.GRF", {0xfc, 0xde, 0x1d, 0x7e, 0x8a, 0x74, 0x19, 0x7d, 0x72, 0xa6, 0x26, 0x95, 0x88, 0x4b, 0x90, 0x9e} }
|
||||
},
|
||||
{ "SAMPLE.CAT", {0x42, 0x2e, 0xa3, 0xdd, 0x07, 0x4d, 0x28, 0x59, 0xbb, 0x51, 0x63, 0x9a, 0x6e, 0x0e, 0x85, 0xda} },
|
||||
{ "OPENTTDD.GRF", {0x9e, 0xb2, 0xf4, 0xd8, 0xf3, 0x63, 0xd4, 0x22, 0x5b, 0x70, 0xa6, 0xd4, 0xbe, 0x55, 0x1c, 0xd9} }
|
||||
{ "OPENTTDD.GRF", {0x2c, 0x3a, 0x86, 0x3b, 0xe0, 0x42, 0xb1, 0x65, 0xba, 0x59, 0xcb, 0x99, 0x9c, 0x3f, 0xe5, 0x3e} }
|
||||
};
|
||||
|
||||
static FileList files_win = {
|
||||
|
||||
+1
-2
@@ -90,7 +90,7 @@ struct Town : PoolItem<Town, TownID, &_Town_pool> {
|
||||
TileIndex xy;
|
||||
|
||||
/* Current population of people and amount of houses. */
|
||||
uint32 num_houses;
|
||||
uint16 num_houses;
|
||||
uint32 population;
|
||||
|
||||
/* Town name */
|
||||
@@ -320,7 +320,6 @@ void ResetHouses();
|
||||
void ClearTownHouse(Town *t, TileIndex tile);
|
||||
void AfterLoadTown();
|
||||
void UpdateTownMaxPass(Town *t);
|
||||
void UpdateTownRadius(Town *t);
|
||||
bool CheckIfAuthorityAllows(TileIndex tile);
|
||||
Town *ClosestTownFromTile(TileIndex tile, uint threshold);
|
||||
void ChangeTownRating(Town *t, int add, int max);
|
||||
|
||||
+15
-8
@@ -265,6 +265,8 @@ static void AnimateTile_Town(TileIndex tile)
|
||||
MarkTileDirtyByTile(tile);
|
||||
}
|
||||
|
||||
static void UpdateTownRadius(Town *t);
|
||||
|
||||
/**
|
||||
* Determines if a town is close to a tile
|
||||
* @param tile TileIndex of the tile to query
|
||||
@@ -1280,7 +1282,7 @@ static bool GrowTown(Town *t)
|
||||
return false;
|
||||
}
|
||||
|
||||
void UpdateTownRadius(Town *t)
|
||||
static void UpdateTownRadius(Town *t)
|
||||
{
|
||||
static const uint16 _town_radius_data[23][5] = {
|
||||
{ 4, 0, 0, 0, 0}, // 0
|
||||
@@ -2072,12 +2074,12 @@ CommandCost CmdRenameTown(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
|
||||
/** Called from GUI */
|
||||
void ExpandTown(Town *t)
|
||||
{
|
||||
uint amount, n;
|
||||
int amount, n;
|
||||
|
||||
_generating_world = true;
|
||||
|
||||
/* The more houses, the faster we grow */
|
||||
amount = RandomRange(ClampToU16(t->num_houses / 10)) + 3;
|
||||
amount = RandomRange(t->num_houses / 10) + 3;
|
||||
t->num_houses += amount;
|
||||
UpdateTownRadius(t);
|
||||
|
||||
@@ -2562,10 +2564,10 @@ static const SaveLoad _town_desc[] = {
|
||||
SLE_CONDVAR(Town, xy, SLE_FILE_U16 | SLE_VAR_U32, 0, 5),
|
||||
SLE_CONDVAR(Town, xy, SLE_UINT32, 6, SL_MAX_VERSION),
|
||||
|
||||
SLE_CONDNULL(2, 0, 2), ///< population, no longer in use
|
||||
SLE_CONDNULL(4, 3, 84), ///< population, no longer in use
|
||||
SLE_CONDNULL(2, 0, 91), ///< num_houses, no longer in use
|
||||
SLE_CONDNULL(2, 0, 2),
|
||||
SLE_CONDNULL(4, 3, 84),
|
||||
|
||||
SLE_VAR(Town, num_houses, SLE_UINT16),
|
||||
SLE_CONDVAR(Town, townnamegrfid, SLE_UINT32, 66, SL_MAX_VERSION),
|
||||
SLE_VAR(Town, townnametype, SLE_UINT16),
|
||||
SLE_VAR(Town, townnameparts, SLE_UINT32),
|
||||
@@ -2574,12 +2576,13 @@ static const SaveLoad _town_desc[] = {
|
||||
SLE_VAR(Town, flags12, SLE_UINT8),
|
||||
SLE_VAR(Town, statues, SLE_UINT8),
|
||||
|
||||
SLE_CONDNULL(1, 0, 1), ///< sort_index, no longer in use
|
||||
/* sort_index_obsolete was stored here in savegame format 0 - 1 */
|
||||
SLE_CONDNULL(1, 0, 1),
|
||||
|
||||
SLE_VAR(Town, have_ratings, SLE_UINT8),
|
||||
SLE_ARR(Town, ratings, SLE_INT16, 8),
|
||||
/* failed bribe attempts are stored since savegame format 4 */
|
||||
SLE_CONDARR(Town, unwanted, SLE_INT8, 8, 4, SL_MAX_VERSION),
|
||||
SLE_CONDARR(Town, unwanted, SLE_INT8, 8, 4,SL_MAX_VERSION),
|
||||
|
||||
SLE_CONDVAR(Town, max_pass, SLE_FILE_U16 | SLE_VAR_U32, 0, 8),
|
||||
SLE_CONDVAR(Town, max_mail, SLE_FILE_U16 | SLE_VAR_U32, 0, 8),
|
||||
@@ -2692,6 +2695,10 @@ static void Load_TOWN()
|
||||
|
||||
void AfterLoadTown()
|
||||
{
|
||||
Town *t;
|
||||
FOR_ALL_TOWNS(t) {
|
||||
UpdateTownRadius(t);
|
||||
}
|
||||
_town_sort_dirty = true;
|
||||
}
|
||||
|
||||
|
||||
@@ -275,10 +275,6 @@ static void TownViewWndProc(Window *w, WindowEvent *e)
|
||||
Town *t = GetTown(w->window_number);
|
||||
|
||||
switch (e->event) {
|
||||
case WE_CREATE:
|
||||
if (t->larger_town) w->widget[1].data = STR_CITY;
|
||||
break;
|
||||
|
||||
case WE_PAINT:
|
||||
/* disable renaming town in network games if you are not the server */
|
||||
w->SetWidgetDisabledState(8, _networking && !_network_server);
|
||||
|
||||
+2
-3
@@ -145,7 +145,7 @@ static inline void SetLiftPosition(TileIndex t, byte pos)
|
||||
static inline byte GetHouseAnimationFrame(TileIndex t)
|
||||
{
|
||||
assert(IsTileType(t, MP_HOUSE));
|
||||
return GB(_m[t].m6, 2, 6) | (GB(_m[t].m3, 5, 1) << 6);
|
||||
return GB(_m[t].m6, 3, 5);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -157,8 +157,7 @@ static inline byte GetHouseAnimationFrame(TileIndex t)
|
||||
static inline void SetHouseAnimationFrame(TileIndex t, byte frame)
|
||||
{
|
||||
assert(IsTileType(t, MP_HOUSE));
|
||||
SB(_m[t].m6, 2, 6, GB(frame, 0, 6));
|
||||
SB(_m[t].m3, 5, 1, GB(frame, 6, 1));
|
||||
SB(_m[t].m6, 3, 5, frame);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -274,7 +274,6 @@ byte FreightWagonMult(CargoID cargo);
|
||||
|
||||
int CheckTrainInDepot(const Vehicle *v, bool needs_to_be_stopped);
|
||||
int CheckTrainStoppedInDepot(const Vehicle *v);
|
||||
void UpdateTrainAcceleration(Vehicle* v);
|
||||
|
||||
/**
|
||||
* This class 'wraps' Vehicle; you do not actually instantiate this class.
|
||||
|
||||
+46
-87
@@ -52,7 +52,7 @@
|
||||
#include "table/train_cmd.h"
|
||||
|
||||
static bool TrainCheckIfLineEnds(Vehicle *v);
|
||||
static void TrainController(Vehicle *v, Vehicle *nomove, bool update_image);
|
||||
static void TrainController(Vehicle *v, bool update_image);
|
||||
static TileIndex TrainApproachingCrossingTile(const Vehicle *v);
|
||||
|
||||
static const byte _vehicle_initial_x_fract[4] = {10, 8, 4, 8};
|
||||
@@ -214,9 +214,6 @@ void TrainConsistChanged(Vehicle* v)
|
||||
/* Reset color map */
|
||||
u->colormap = PAL_NONE;
|
||||
|
||||
/* Set user defined data (must be done before other properties) */
|
||||
u->u.rail.user_def_data = GetVehicleProperty(u, 0x25, rvi_u->user_def_data);
|
||||
|
||||
if (rvi_u->visual_effect != 0) {
|
||||
u->u.rail.cached_vis_effect = rvi_u->visual_effect;
|
||||
} else {
|
||||
@@ -273,6 +270,8 @@ void TrainConsistChanged(Vehicle* v)
|
||||
u->cargo_cap = GetVehicleProperty(u, 0x14, rvi_u->capacity);
|
||||
}
|
||||
|
||||
u->u.rail.user_def_data = GetVehicleProperty(u, 0x25, rvi_u->user_def_data);
|
||||
|
||||
/* check the vehicle length (callback) */
|
||||
uint16 veh_len = CALLBACK_FAILED;
|
||||
if (HasBit(EngInfo(u->engine_type)->callbackmask, CBM_VEHICLE_LENGTH)) {
|
||||
@@ -290,11 +289,6 @@ void TrainConsistChanged(Vehicle* v)
|
||||
|
||||
/* recalculate cached weights and power too (we do this *after* the rest, so it is known which wagons are powered and need extra weight added) */
|
||||
TrainCargoChanged(v);
|
||||
|
||||
if (IsFrontEngine(v)) {
|
||||
UpdateTrainAcceleration(v);
|
||||
InvalidateWindow(WC_VEHICLE_DETAILS, v->index);
|
||||
}
|
||||
}
|
||||
|
||||
enum AccelType {
|
||||
@@ -473,7 +467,7 @@ static int GetTrainAcceleration(Vehicle *v, bool mode)
|
||||
}
|
||||
}
|
||||
|
||||
void UpdateTrainAcceleration(Vehicle* v)
|
||||
static void UpdateTrainAcceleration(Vehicle* v)
|
||||
{
|
||||
assert(IsFrontEngine(v));
|
||||
|
||||
@@ -795,6 +789,7 @@ CommandCost CmdBuildRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32
|
||||
}
|
||||
|
||||
TrainConsistChanged(v);
|
||||
UpdateTrainAcceleration(v);
|
||||
UpdateTrainGroupID(v);
|
||||
|
||||
if (!HasBit(p2, 1)) { // check if the cars should be added to the new vehicle
|
||||
@@ -1219,7 +1214,7 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p
|
||||
{
|
||||
Vehicle *v;
|
||||
|
||||
for (v = src; GetNextVehicle(v) != NULL; v = GetNextVehicle(v)) {}
|
||||
for (v = src; GetNextVehicle(v) != NULL; v = GetNextVehicle(v));
|
||||
GetLastEnginePart(v)->SetNext(dst->Next());
|
||||
}
|
||||
dst->SetNext(src);
|
||||
@@ -1249,6 +1244,8 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p
|
||||
TrainConsistChanged(src_head);
|
||||
UpdateTrainGroupID(src_head);
|
||||
if (IsFrontEngine(src_head)) {
|
||||
UpdateTrainAcceleration(src_head);
|
||||
InvalidateWindow(WC_VEHICLE_DETAILS, src_head->index);
|
||||
/* Update the refit button and window */
|
||||
InvalidateWindow(WC_VEHICLE_REFIT, src_head->index);
|
||||
InvalidateWindowWidget(WC_VEHICLE_VIEW, src_head->index, VVW_WIDGET_REFIT_VEH);
|
||||
@@ -1262,6 +1259,8 @@ CommandCost CmdMoveRailVehicle(TileIndex tile, uint32 flags, uint32 p1, uint32 p
|
||||
TrainConsistChanged(dst_head);
|
||||
UpdateTrainGroupID(dst_head);
|
||||
if (IsFrontEngine(dst_head)) {
|
||||
UpdateTrainAcceleration(dst_head);
|
||||
InvalidateWindow(WC_VEHICLE_DETAILS, dst_head->index);
|
||||
/* Update the refit button and window */
|
||||
InvalidateWindowWidget(WC_VEHICLE_VIEW, dst_head->index, VVW_WIDGET_REFIT_VEH);
|
||||
InvalidateWindow(WC_VEHICLE_REFIT, dst_head->index);
|
||||
@@ -1434,7 +1433,11 @@ CommandCost CmdSellRailWagon(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
|
||||
NormaliseTrainConsist(first);
|
||||
TrainConsistChanged(first);
|
||||
UpdateTrainGroupID(first);
|
||||
if (IsFrontEngine(first)) InvalidateWindow(WC_VEHICLE_REFIT, first->index);
|
||||
if (IsFrontEngine(first)) {
|
||||
InvalidateWindow(WC_VEHICLE_DETAILS, first->index);
|
||||
InvalidateWindow(WC_VEHICLE_REFIT, first->index);
|
||||
UpdateTrainAcceleration(first);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1500,6 +1503,8 @@ CommandCost CmdSellRailWagon(TileIndex tile, uint32 flags, uint32 p1, uint32 p2)
|
||||
NormaliseTrainConsist(first);
|
||||
TrainConsistChanged(first);
|
||||
UpdateTrainGroupID(first);
|
||||
if (IsFrontEngine(first)) UpdateTrainAcceleration(first);
|
||||
InvalidateWindow(WC_VEHICLE_DETAILS, first->index);
|
||||
InvalidateWindow(WC_VEHICLE_REFIT, first->index);
|
||||
}
|
||||
} break;
|
||||
@@ -1716,86 +1721,39 @@ static inline void MaybeBarCrossingWithSound(TileIndex tile)
|
||||
|
||||
/**
|
||||
* Advances wagons for train reversing, needed for variable length wagons.
|
||||
* This one is called before the train is reversed.
|
||||
* Needs to be called once before the train is reversed, and once after it.
|
||||
* @param v First vehicle in chain
|
||||
* @param before Set to true for the call before reversing, false otherwise
|
||||
*/
|
||||
static void AdvanceWagonsBeforeSwap(Vehicle *v)
|
||||
static void AdvanceWagons(Vehicle *v, bool before)
|
||||
{
|
||||
Vehicle *base = v;
|
||||
Vehicle *first = base; // first vehicle to move
|
||||
Vehicle *last = GetLastVehicleInChain(v); // last vehicle to move
|
||||
Vehicle *first = base->Next();
|
||||
uint length = CountVehiclesInChain(v);
|
||||
|
||||
while (length > 2) {
|
||||
last = last->Previous();
|
||||
first = first->Next();
|
||||
|
||||
int differential = base->u.rail.cached_veh_length - last->u.rail.cached_veh_length;
|
||||
|
||||
/* do not update images now
|
||||
* negative differential will be handled in AdvanceWagonsAfterSwap() */
|
||||
for (int i = 0; i < differential; i++) TrainController(first, last->Next(), false);
|
||||
|
||||
base = first; // == base->Next()
|
||||
length -= 2;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Advances wagons for train reversing, needed for variable length wagons.
|
||||
* This one is called after the train is reversed.
|
||||
* @param v First vehicle in chain
|
||||
*/
|
||||
static void AdvanceWagonsAfterSwap(Vehicle *v)
|
||||
{
|
||||
/* first of all, fix the situation when the train was entering a depot */
|
||||
Vehicle *dep = v; // last vehicle in front of just left depot
|
||||
while (dep->Next() != NULL && (dep->u.rail.track == TRACK_BIT_DEPOT || dep->Next()->u.rail.track != TRACK_BIT_DEPOT)) {
|
||||
dep = dep->Next(); // find first vehicle outside of a depot, with next vehicle inside a depot
|
||||
}
|
||||
|
||||
Vehicle *leave = dep->Next(); // first vehicle in a depot we are leaving now
|
||||
|
||||
if (leave != NULL) {
|
||||
/* 'pull' next wagon out of the depot, so we won't miss it (it could stay in depot forever) */
|
||||
int d = TicksToLeaveDepot(dep);
|
||||
|
||||
if (d <= 0) {
|
||||
leave->vehstatus &= ~VS_HIDDEN; // move it out of the depot
|
||||
leave->u.rail.track = AxisToTrackBits(DiagDirToAxis(GetRailDepotDirection(leave->tile)));
|
||||
for (int i = 0; i >= d; i--) TrainController(leave, NULL, false); // maybe move it, and maybe let another wagon leave
|
||||
}
|
||||
} else {
|
||||
dep = NULL; // no vehicle in a depot, so no vehicle leaving a depot
|
||||
}
|
||||
|
||||
Vehicle *base = v;
|
||||
Vehicle *first = base; // first vehicle to move
|
||||
Vehicle *last = GetLastVehicleInChain(v); // last vehicle to move
|
||||
uint length = CountVehiclesInChain(v);
|
||||
|
||||
/* we have to make sure all wagons that leave a depot because of train reversing are moved coorectly
|
||||
* they have already correct spacing, so we have to make sure they are moved how they should */
|
||||
bool nomove = (dep == NULL); // if there is no vehicle leaving a depot, limit the number of wagons moved immediatelly
|
||||
|
||||
while (length > 2) {
|
||||
/* we reached vehicle (originally) in front of a depot, stop now
|
||||
* (we would move wagons that are alredy moved with new wagon length) */
|
||||
if (base == dep) break;
|
||||
|
||||
/* the last wagon was that one leaving a depot, so do not move it anymore */
|
||||
if (last == dep) nomove = true;
|
||||
|
||||
last = last->Previous();
|
||||
first = first->Next();
|
||||
/* find pairwise matching wagon
|
||||
* start<>end, start+1<>end-1, ... */
|
||||
Vehicle *last = first;
|
||||
for (uint i = length - 3; i > 0; i--) last = last->Next();
|
||||
|
||||
int differential = last->u.rail.cached_veh_length - base->u.rail.cached_veh_length;
|
||||
if (before) differential *= -1;
|
||||
|
||||
/* do not update images now */
|
||||
for (int i = 0; i < differential; i++) TrainController(first, (nomove ? last->Next() : NULL), false);
|
||||
if (differential > 0) {
|
||||
/* disconnect last car to make sure only this subset moves */
|
||||
Vehicle *tempnext = last->Next();
|
||||
last->SetNext(NULL);
|
||||
|
||||
base = first; // == base->Next()
|
||||
/* do not update images now because the wagons are disconnected
|
||||
* and that could cause problems with NewGRFs */
|
||||
for (int i = 0; i < differential; i++) TrainController(first, false);
|
||||
|
||||
last->SetNext(tempnext);
|
||||
}
|
||||
|
||||
base = first;
|
||||
first = first->Next();
|
||||
length -= 2;
|
||||
}
|
||||
}
|
||||
@@ -1814,7 +1772,7 @@ static void ReverseTrainDirection(Vehicle *v)
|
||||
int r = 0; ///< number of vehicles - 1
|
||||
for (const Vehicle *u = v; (u = u->Next()) != NULL;) { r++; }
|
||||
|
||||
AdvanceWagonsBeforeSwap(v);
|
||||
AdvanceWagons(v, true);
|
||||
|
||||
/* swap start<>end, start+1<>end-1, ... */
|
||||
int l = 0;
|
||||
@@ -1822,7 +1780,7 @@ static void ReverseTrainDirection(Vehicle *v)
|
||||
ReverseTrainSwapVeh(v, l++, r--);
|
||||
} while (l <= r);
|
||||
|
||||
AdvanceWagonsAfterSwap(v);
|
||||
AdvanceWagons(v, false);
|
||||
|
||||
if (IsTileDepotType(v->tile, TRANSPORT_RAIL)) {
|
||||
InvalidateWindowData(WC_VEHICLE_DEPOT, v->tile);
|
||||
@@ -3040,12 +2998,12 @@ static void *CheckVehicleAtSignal(Vehicle *v, void *data)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
static void TrainController(Vehicle *v, Vehicle *nomove, bool update_image)
|
||||
static void TrainController(Vehicle *v, bool update_image)
|
||||
{
|
||||
Vehicle *prev;
|
||||
|
||||
/* For every vehicle after and including the given vehicle */
|
||||
for (prev = v->Previous(); v != nomove; prev = v, v = v->Next()) {
|
||||
for (prev = v->Previous(); v != NULL; prev = v, v = v->Next()) {
|
||||
DiagDirection enterdir = DIAGDIR_BEGIN;
|
||||
bool update_signals_crossing = false; // will we update signals or crossing state?
|
||||
BeginVehicleMove(v);
|
||||
@@ -3269,6 +3227,7 @@ static void DeleteLastWagon(Vehicle *v)
|
||||
} else {
|
||||
/* Recalculate cached train properties */
|
||||
TrainConsistChanged(first);
|
||||
InvalidateWindow(WC_VEHICLE_DETAILS, first->index);
|
||||
/* Update the depot window if the first vehicle is in depot -
|
||||
* if v == first, then it is updated in PreDestructor() */
|
||||
if (first->u.rail.track == TRACK_BIT_DEPOT) {
|
||||
@@ -3601,7 +3560,7 @@ static void TrainLocoHandler(Vehicle *v, bool mode)
|
||||
TrainCheckIfLineEnds(v);
|
||||
|
||||
do {
|
||||
TrainController(v, NULL, true);
|
||||
TrainController(v, true);
|
||||
CheckTrainCollision(v);
|
||||
if (v->cur_speed <= 0x100)
|
||||
break;
|
||||
@@ -3786,7 +3745,7 @@ void ConnectMultiheadedTrains()
|
||||
}
|
||||
|
||||
Vehicle *w;
|
||||
for (w = u->Next(); w != NULL && (w->engine_type != u->engine_type || w->u.rail.other_multiheaded_part != NULL); w = GetNextVehicle(w)) {}
|
||||
for (w = u->Next(); w != NULL && (w->engine_type != u->engine_type || w->u.rail.other_multiheaded_part != NULL); w = GetNextVehicle(w));
|
||||
if (w != NULL) {
|
||||
/* we found a car to partner with this engine. Now we will make sure it face the right way */
|
||||
if (IsTrainEngine(w)) {
|
||||
|
||||
@@ -2201,7 +2201,6 @@ void VehicleEnterDepot(Vehicle *v)
|
||||
v->load_unload_time_rem = 0;
|
||||
/* Reset reversed flag */
|
||||
for (Vehicle *u = v; u != NULL; u = u->Next()) ClrBit(u->u.rail.flags, VRF_TOGGLE_REVERSE);
|
||||
TrainConsistChanged(v);
|
||||
break;
|
||||
|
||||
case VEH_ROAD:
|
||||
|
||||
+6
-4
@@ -941,8 +941,10 @@ static void DrawAutorailSelection(const TileInfo *ti, uint autorail_type)
|
||||
static void DrawTileSelection(const TileInfo *ti)
|
||||
{
|
||||
/* Draw a red error square? */
|
||||
bool is_redsq = _thd.redsq != 0 && _thd.redsq == ti->tile;
|
||||
if (is_redsq) DrawTileSelectionRect(ti, PALETTE_TILE_RED_PULSATING);
|
||||
if (_thd.redsq != 0 && _thd.redsq == ti->tile) {
|
||||
DrawTileSelectionRect(ti, PALETTE_TILE_RED_PULSATING);
|
||||
return;
|
||||
}
|
||||
|
||||
/* no selection active? */
|
||||
if (_thd.drawstyle == 0) return;
|
||||
@@ -951,7 +953,7 @@ static void DrawTileSelection(const TileInfo *ti)
|
||||
if (IsInsideBS(ti->x, _thd.pos.x, _thd.size.x) &&
|
||||
IsInsideBS(ti->y, _thd.pos.y, _thd.size.y)) {
|
||||
if (_thd.drawstyle & HT_RECT) {
|
||||
if (!is_redsq) DrawTileSelectionRect(ti, _thd.make_square_red ? PALETTE_SEL_TILE_RED : PAL_NONE);
|
||||
DrawTileSelectionRect(ti, _thd.make_square_red ? PALETTE_SEL_TILE_RED : PAL_NONE);
|
||||
} else if (_thd.drawstyle & HT_POINT) {
|
||||
/* Figure out the Z coordinate for the single dot. */
|
||||
byte z = 0;
|
||||
@@ -992,7 +994,7 @@ static void DrawTileSelection(const TileInfo *ti)
|
||||
}
|
||||
|
||||
/* Check if it's inside the outer area? */
|
||||
if (!is_redsq && _thd.outersize.x &&
|
||||
if (_thd.outersize.x &&
|
||||
_thd.size.x < _thd.size.x + _thd.outersize.x &&
|
||||
IsInsideBS(ti->x, _thd.pos.x + _thd.offs.x, _thd.size.x + _thd.outersize.x) &&
|
||||
IsInsideBS(ti->y, _thd.pos.y + _thd.offs.y, _thd.size.y + _thd.outersize.y)) {
|
||||
|
||||
+1
-3
@@ -912,7 +912,7 @@ static FloodingBehaviour GetFloodingBehaviour(TileIndex tile)
|
||||
*/
|
||||
static void DoFloodTile(TileIndex target)
|
||||
{
|
||||
assert(!IsTileType(target, MP_WATER));
|
||||
if (IsTileType(target, MP_WATER)) return;
|
||||
|
||||
bool flooded = false; // Will be set to true if something is changed.
|
||||
|
||||
@@ -1033,8 +1033,6 @@ void TileLoop_Water(TileIndex tile)
|
||||
for (Direction dir = DIR_BEGIN; dir < DIR_END; dir++) {
|
||||
TileIndex dest = AddTileIndexDiffCWrap(tile, TileIndexDiffCByDir(dir));
|
||||
if (dest == INVALID_TILE) continue;
|
||||
/* do not try to flood water tiles - increases performance a lot */
|
||||
if (IsTileType(dest, MP_WATER)) continue;
|
||||
|
||||
uint z_dest;
|
||||
Slope slope_dest = (Slope)(GetFoundationSlope(dest, &z_dest) & ~SLOPE_HALFTILE_MASK & ~SLOPE_STEEP);
|
||||
|
||||
+3
-10
@@ -2175,22 +2175,15 @@ void RelocateAllWindows(int neww, int newh)
|
||||
IConsoleResize(w);
|
||||
continue;
|
||||
|
||||
default: {
|
||||
default:
|
||||
left = w->left;
|
||||
if (left + (w->width >> 1) >= neww) left = neww - w->width;
|
||||
if (left < 0) left = 0;
|
||||
|
||||
top = w->top;
|
||||
if (top + (w->height >> 1) >= newh) top = newh - w->height;
|
||||
|
||||
const Window *wt = FindWindowById(WC_MAIN_TOOLBAR, 0);
|
||||
if (wt != NULL) {
|
||||
if (top < wt->height) top = wt->height;
|
||||
if (top >= newh) top = newh - 1;
|
||||
} else {
|
||||
if (top < 0) top = 0;
|
||||
}
|
||||
} break;
|
||||
if (top < 0) top = 0;
|
||||
break;
|
||||
}
|
||||
|
||||
if (w->viewport != NULL) {
|
||||
|
||||
Reference in New Issue
Block a user