f9f2d37a8e
Merge branch 'master' into tracerestrict
...
# Conflicts:
# src/saveload/saveload.cpp
7 years ago
57745b1c74
(svn r27793) -Fix [FS#6450]: Use of uninitialised variable cause lzo to fail. Add check for error status.
7 years ago
d3de080883
(svn r27778) -Change [FS#6442-ish]: Convenience savegame bump to distinguish 1.7 savegames from 1.6 savegames.
7 years ago
5e28cc4757
(svn r27772) -Fix [FS#5819]: If the intro game had a savegame version which contains a NewGRF configuration, then townname NewGRFs would not be activated in the game options.
7 years ago
0d5ee772fc
(svn r27770) -Fix [FS#6540]: Initialize variables in station_sl.cpp (JGR)
7 years ago
60f7168c22
(svn r27760) -Change: Enable realisitic train and road vehicle acceleration by default.
7 years ago
0c1fcc02ec
(svn r27757) -Change: Make StringID 32bit.
7 years ago
49b940f69c
(svn r27756) -Codechange: Add StringTab enum
7 years ago
02967c3c08
(svn r27754) -Codechange: Add GetStringTab(), GetStringIndex() and MakeStringID() to access the structure of StringIDs.
7 years ago
f5e4d8e73a
Merge branch 'master' into tracerestrict
...
# Conflicts:
# src/rail_gui.cpp
# src/saveload/saveload.cpp
8 years ago
d8a316d7c5
(svn r27709) -Fix-ish: Silence some warnings. (adf88)
8 years ago
3f75b8bca2
(svn r27670) -Add: [FS#6471] Assign descriptive names to (GNU pthread) threads. (JGR)
8 years ago
ba566e9126
(svn r27668) -Feature: [NewGRF] Allow composing vehicles from multiple sprites.
8 years ago
f36539837e
(svn r27666) -Codechange: Pass vehicle sprites around using a struct VehicleSpriteSeq.
8 years ago
f286ba8db2
(svn r27653) -Fix(r27647): Rename FileOperation enum and values to SaveLoadOperation to avoid nameclash with windows compiler toolkit.
8 years ago
0b8869930f
(svn r27652) -Fix(r27650): Use the file operation being performed to set the _sl.action variable.
8 years ago
e735bbebce
(svn r27651) -Codechange: Introduce methods for setting the name and title of _file_to_saveload.
8 years ago
a959c0c965
(svn r27650) -Codechange: Replace SaveOrLoadMode by FileOperation and DetailedFileType.
8 years ago
c3bed437ee
(svn r27649) -Codechange: Introduce detailed file type enum, rebuild FiosType with it.
8 years ago
b6c29ae4eb
(svn r27639) -Codechange: Also always set the abstract FileToSaveLoad::filetype when setting a mode.
8 years ago
e78627f2f1
(svn r27638) -Codechange: Move FiosType enum, move and rename SetFiosType function.
8 years ago
b5eb50da7b
(svn r27637) -Codechange: Don't use _saveload_mode for scenario loading detection.
8 years ago
757bc0a97b
(svn r27636) -Codechange: Rename FileType to AbstractFileType.
8 years ago
a35e970ab0
(svn r27635) -Codechange: Move FileType and FileToSaveLoad structure definitions.
8 years ago
2337d169e8
(svn r27627) -Codechange: Deduplicate some cursor magic into SetMouseCursorBusy.
8 years ago
2de4652d09
(svn r27572) -Fix [FS#6442]: Convenience savegame bump to distinguish 1.6 savegames from 1.5 savegames.
8 years ago
fbd79d88f0
(svn r27518) -Update: Numbers
8 years ago
73b69c5594
Validate type of all instructions, log validation failures at load.
...
The validator now checks that the type of conditional instructions
is known.
On a validation failure, the load code now outputs a corrupt savegame
message, with the validation error message and a program dump,
instead of using an assertion.
9 years ago
3dd51e96b8
Bulk documentation update, and a few style fixes.
9 years ago
5f1b148cf9
Initial minimal working tracerestrict implementation.
...
This is a port of the tracerestrict/routing restrictions feature
from TTDPatch.
At present this implements if tests (train length only),
and pathfinder deny and penalty actions.
This requires the use of YAPF. Note that restrictions are only evaluated
within the YAPF lookahead distance.
9 years ago
c5a4b89915
(svn r27320) -Codechange: Do not drop order backups when loading a savegame for replaying.
9 years ago
fa83524eb4
(svn r27291) -Fix (r27278) [FS#6303]: Some savegame data was discarded again during loading.
9 years ago
17d9b77db6
(svn r27278) -Fix: Handle savegames with an unexpected amount of industry-builder or NewGRF entity-mapping more gracefully.
9 years ago
c9e9dacc6b
(svn r27243) -Fix (r26816) [FS#6285]: Duplicate frees due to pool item classes not having copy constructors.
9 years ago
2edbc72ebd
(svn r27192) -Change: heading for 1.6 now
9 years ago
a14b836bf2
(svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects.
9 years ago
0c2f4bdc2b
(svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces)
10 years ago
660a95e5d2
(svn r27003) -Cleanup: fix the use of spaces and asterices "around" some comments
10 years ago
39fa9d2127
(svn r26978) -Fix (r23609): Typo in game script warning message.
10 years ago
b50c649405
(svn r26881) -Codechange: bump the savegame version
10 years ago
ab3660278a
(svn r26880) -Add: stub settings for limiting bridge and map height
10 years ago
dc2b4f2498
(svn r26879) -Codechange: remove most MayHaveBridgeAbove calls since the data is now always accessible
10 years ago
f3b79480ed
(svn r26878) -Change: move m6 to TileExtended to keep Tile 8 bytes and thus better alignable
10 years ago
173a234951
(svn r26876) -Codechange: move 'has bride above' data from m6 to type
10 years ago
f82c07b582
(svn r26875) -Codechange: move TropicZone information from m6 to type
10 years ago
337af973b0
(svn r26873) -Change: split type_height into a type and height array (ic111)
10 years ago
3dfb423446
(svn r26872) -Change: give the disaster vehicles the same treatment as aircraft in r26866; make the ascend and descend if needed to cross high mountains (based on patch by ic111)
10 years ago
39ded38c01
(svn r26866) -Change: make aircraft ascend/descend when they are too close to the ground or too far away (based on patch by ic111)
10 years ago
8ab4f746f2
(svn r26864) -Codechange: bring a bit more OO into the disaster vehicles
10 years ago
ac269a3f08
(svn r26863) -Codechange: move a number of Vehicle* functions into the Vehicle class
10 years ago
Jonathan G Rennison
peter1138
frosch
fonsinchen
alberth
rubidium