Commit Graph

872 Commits (ddf31702a224056193a05098378d2a903be4c5c6)

Author SHA1 Message Date
Jonathan G Rennison 659b6b7337 PATX settings: Various changes to support legacy compilers. 9 years ago
Jonathan G Rennison b5c453b21e Add generic mechanism to cross-ref settings at load time.
This is useful for loading settings from legacy/special versions,
where the corresponding setting is somewhere else and/or a PATX setting,
with duplicating all the info.
Use this to load SpringPP settings which have a corresponding setting.
9 years ago
Jonathan G Rennison 4c6dc11c16 Merge branch 'infrastructure_sharing-sx' into jgrpp
Conflicts:
	src/lang/english.txt
	src/saveload/extended_ver_sl.cpp
	src/saveload/extended_ver_sl.h
	src/signal.cpp
	src/table/settings.ini
	src/vehicle.cpp
9 years ago
Jonathan G Rennison 037cce3b38 Merge branch 'save_ext' into infrastructure_sharing-sx
Conflicts:
	src/saveload/saveload.cpp
9 years ago
Jonathan G Rennison a4ad4130a6 Merge branch 'master' into infrastructure_sharing
Conflicts:
	src/aircraft_cmd.cpp
	src/economy.cpp
	src/lang/english.txt
	src/order_gui.cpp
	src/roadveh_cmd.cpp
	src/saveload/saveload.cpp
	src/settings.cpp
	src/settings_gui.cpp
	src/train_cmd.cpp
9 years ago
patch-import ee791055f9 Import infrastructure sharing patch
Strip trailing whitespace
Remove a leftover line form settings.ini

http://www.tt-forums.net/viewtopic.php?p=1008843#p1008843
9 years ago
Jonathan G Rennison 174779e371 Merge branch 'save_ext' into enhanced_viewport_overlay-sx
Conflicts:
	src/saveload/saveload.cpp
9 years ago
Jonathan G Rennison e24839ed65 Merge branch 'master' into enhanced_viewport_overlay
Notes on conflict resolution:
* MarkTileDirtyByTile gained an extra param on both sides of the merge
  Move bridge level offset to be after zoom level param, as it's used less.
* Add zoom level params to MarkBridgeDirty functions
* Fix undefined behaviour in colour_index cycling in ViewportMapDraw

Conflicts:
	src/clear_cmd.cpp
	src/pbs.cpp
	src/rail_cmd.cpp
	src/toolbar_gui.cpp
	src/train_cmd.cpp
	src/vehicle.cpp
	src/viewport.cpp
	src/viewport_func.h
9 years ago
patch-import 536a95dfd0 Import combined Enhanced viewport: zoom out, overlays & tooltips (r53_27127) patch
https://www.tt-forums.net/viewtopic.php?f=33&t=53394
9 years ago
Jonathan G Rennison b3e102fe52 Fix length mismatch in PATX loader. 9 years ago
Jonathan G Rennison c57ffc64bc Settings update: add PATX chunk to store additional settings
in an unordered format which is tolerant of extra, missing or reordered
settings.
9 years ago
Jonathan G Rennison 17e8693e62 Initial stubs for extending the save/load version checking/upgrade code,
with support for tests on individually versioned features as well as
savegame versions.
This is mainly for improved handling of features added to patchpacks.
The current status-quo of picking a random number for the savegame
version when releasing a patch breaks loading of savegames from newer
trunk savegame versions, with or without the same patch applied, as
savegame upgrade code is not run, which can also lead to crashes on load.
Instead don't change the savegame version (but set the high bit to
keep trunk versions away), but instead include the versions of individual
features using a separate mechanism.
9 years ago
alberth 56c9765f72 (svn r27285) -Codechange: Use LG_ORIGINAL instead of a magic 0 to indicate the original landscape generator. 9 years ago
alberth b8414c2884 (svn r27285) -Codechange: Use LG_ORIGINAL instead of a magic 0 to indicate the original landscape generator. 9 years ago
frosch 6cb930168f (svn r27163) -Fix [FS#6204]: Toolbars were not invalidated when changing max-vehicles settings. (adf88) 9 years ago
frosch c639fb0d8e (svn r27163) -Fix [FS#6204]: Toolbars were not invalidated when changing max-vehicles settings. (adf88) 9 years ago
frosch 04b8fe6d0b (svn r27151) -Add: Allow changing max heightlevel in scenario editor. 10 years ago
frosch 310258f283 (svn r27151) -Add: Allow changing max heightlevel in scenario editor. 10 years ago
peter1138 aa6fdf6f13 (svn r27004) -Codechange: Make GUI size apply to (sprite-font) text as well. 10 years ago
peter1138 1088ad48fc (svn r27004) -Codechange: Make GUI size apply to (sprite-font) text as well. 10 years ago
peter1138 2655de52d7 (svn r26990) -Feature: Add option to choose normal, double or quad-size interface. 10 years ago
peter1138 253c91b17d (svn r26990) -Feature: Add option to choose normal, double or quad-size interface. 10 years ago
alberth 88d1d3c8c1 (svn r26611) -Feature: Save and load grfid and md5sum of newgrfs in config file (frosch) 10 years ago
alberth c1e7c32f07 (svn r26611) -Feature: Save and load grfid and md5sum of newgrfs in config file (frosch) 10 years ago
rubidium 034735a54c (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 10 years ago
rubidium 9ed12b0f07 (svn r26509) -Codechange: replace strdup with stredup (the latter ensures the return is not NULL) 10 years ago
rubidium 699779324e (svn r26499) -Codechange: replace strndup with stredup 10 years ago
rubidium 8960939b22 (svn r26499) -Codechange: replace strndup with stredup 10 years ago
rubidium a7e999ee20 (svn r26494) -Codechange: replace some further usages of s(n)printf with seprintf 10 years ago
rubidium 24fdd0b7bb (svn r26494) -Codechange: replace some further usages of s(n)printf with seprintf 10 years ago
rubidium e2330f16ea (svn r26493) -Codechange: use strecat to concatenate script settings instead of manually accounting for the amount of characters that has been written 10 years ago
rubidium b4914b91d9 (svn r26493) -Codechange: use strecat to concatenate script settings instead of manually accounting for the amount of characters that has been written 10 years ago
rubidium 6ecc602050 (svn r26486) -Codechange: replace a number of snprintfs with seprintf 10 years ago
rubidium 5b82822c12 (svn r26486) -Codechange: replace a number of snprintfs with seprintf 10 years ago
frosch 24c7134bff (svn r26485) -Codechange: Replace ttd_strlcpy and ttd_strlcat with strecpy and strecat. 10 years ago
frosch ef4c2ce031 (svn r26485) -Codechange: Replace ttd_strlcpy and ttd_strlcat with strecpy and strecat. 10 years ago
rubidium 2be4215f43 (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 10 years ago
rubidium 0463dbdc9e (svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values 10 years ago
frosch eb6974179d (svn r26317) -Fix [FS#5897]: Check whether NewGRF change vehicle capacity when they are not supposed to, and truncate cargo appropiately if they are allowed to. 11 years ago
frosch 41b7a04a68 (svn r26317) -Fix [FS#5897]: Check whether NewGRF change vehicle capacity when they are not supposed to, and truncate cargo appropiately if they are allowed to. 11 years ago
fonsinchen 111ecddb50 (svn r25358) -Codechange: save and load link graph jobs and the schedule 11 years ago
fonsinchen 3d0a0e8e48 (svn r25358) -Codechange: save and load link graph jobs and the schedule 11 years ago
frosch b172ed3578 (svn r25291) -Add: WindowDesc ability to load and store information in a config file. 11 years ago
frosch 23ba42b66c (svn r25291) -Add: WindowDesc ability to load and store information in a config file. 11 years ago
rubidium afa894ba3e (svn r24996) -Change: Apply default service interval changes to vehicles without custom interval (peter1138) 12 years ago
rubidium ef8d491d8f (svn r24996) -Change: Apply default service interval changes to vehicles without custom interval (peter1138) 12 years ago
rubidium 0f53f270c1 (svn r24968) -Fix [FS#5379]: company window was not updated when shared were enabled/disabled 12 years ago
rubidium 99a08e1e8c (svn r24968) -Fix [FS#5379]: company window was not updated when shared were enabled/disabled 12 years ago
planetmaker f00d9976f9 (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
planetmaker c24374f99c (svn r24900) -Fix [FS#5389]: Comments with typos (most fixes supplied by Eagle_rainbow) 12 years ago
planetmaker dbaad927d7 (svn r24899) -Fix [FS#5434]: Also the station build window needs redrawing when the station spread changes (based on patch by juanjo) 12 years ago
planetmaker 89a2ba2a6d (svn r24899) -Fix [FS#5434]: Also the station build window needs redrawing when the station spread changes (based on patch by juanjo) 12 years ago
planetmaker 54858c3fbd (svn r24894) -Fix [FS#5434]: Invalidate station selection window when station spread changes (based on patch by juanjo) 12 years ago
planetmaker f8e0b22974 (svn r24894) -Fix [FS#5434]: Invalidate station selection window when station spread changes (based on patch by juanjo) 12 years ago
frosch af74f3bb2d (svn r24860) -Codechange: Add SettingDesc::GetType(). 12 years ago
frosch 0efd29b71b (svn r24860) -Codechange: Add SettingDesc::GetType(). 12 years ago
frosch 11bb1086bd (svn r24843) -Codechange: Move news display options into the general settings framework. (based on patch by eagle_rainbow) 12 years ago
frosch 21b43b63f5 (svn r24843) -Codechange: Move news display options into the general settings framework. (based on patch by eagle_rainbow) 12 years ago
michi_cc 37da99ab90 (svn r24833) -Codechange: Replace magic numbers for invalidating vehicle-related windows with an enum. 12 years ago
michi_cc c75962e04c (svn r24833) -Codechange: Replace magic numbers for invalidating vehicle-related windows with an enum. 12 years ago
frosch 76fef0843c (svn r24790) -Remove: Classic difficulty profiles. 12 years ago
frosch d1ab0f03bc (svn r24790) -Remove: Classic difficulty profiles. 12 years ago
frosch 6516c85c82 (svn r24787) -Fix: Unify checks for editability of settings. 12 years ago
frosch 22dc45738d (svn r24787) -Fix: Unify checks for editability of settings. 12 years ago
frosch 903294f2bb (svn r24786) -Codechange: Add SettingsProfile enum for difficulty profiles and highscore tables. 12 years ago
frosch a499435351 (svn r24786) -Codechange: Add SettingsProfile enum for difficulty profiles and highscore tables. 12 years ago
frosch b77bb699da (svn r24250) -Fix [FS#5154]: Do not immediately display error messages from parsing the cfg file, but schedule them for displaying after the GUI is prepared for it. 12 years ago
frosch c6ed8c01b3 (svn r24250) -Fix [FS#5154]: Do not immediately display error messages from parsing the cfg file, but schedule them for displaying after the GUI is prepared for it. 12 years ago
frosch 51e7c489a3 (svn r24247) -Fix: If loading of int-list settings fails, use the default. 12 years ago
frosch c11d80148f (svn r24247) -Fix: If loading of int-list settings fails, use the default. 12 years ago
frosch f214171d15 (svn r24193) -Fix (r24191): Also update comments accordingly. 12 years ago
frosch 599f89e641 (svn r24193) -Fix (r24191): Also update comments accordingly. 12 years ago
frosch 43ac4de940 (svn r24192) -Fix [FS#5153-ish]: Also use default value when reading an invalid integer setting value. 12 years ago
frosch ec73ad1145 (svn r24192) -Fix [FS#5153-ish]: Also use default value when reading an invalid integer setting value. 12 years ago
michi_cc adb1692f27 (svn r24146) -Fix [FS#5153]: Use default value when reading an invalid setting value. (Eddi) 12 years ago
michi_cc 3f267db3a6 (svn r24146) -Fix [FS#5153]: Use default value when reading an invalid setting value. (Eddi) 12 years ago
michi_cc 123427749b (svn r24145) -Cleanup: Switch coding style. 12 years ago
michi_cc 6c8a16f36e (svn r24145) -Cleanup: Switch coding style. 12 years ago
truebrain 5d4b2519a4 (svn r23609) -Add: save/load all GameScript related material 13 years ago
truebrain f239a61406 (svn r23609) -Add: save/load all GameScript related material 13 years ago
truebrain c74ccfff1b (svn r23601) -Fix: fix the conflict in window number 13 years ago
truebrain 561b25d031 (svn r23601) -Fix: fix the conflict in window number 13 years ago
rubidium c3440658e8 (svn r23480) -Fix [FS#4594]: replace OS error messages with internal error messages when that's possible 13 years ago
rubidium 0ca25fb3af (svn r23480) -Fix [FS#4594]: replace OS error messages with internal error messages when that's possible 13 years ago
rubidium 9aab2dc861 (svn r23474) -Codechange: move the declaration error related functions to error.h 13 years ago
rubidium 58423b26d1 (svn r23474) -Codechange: move the declaration error related functions to error.h 13 years ago
frosch ac150080de (svn r23427) -Fix: Do not load screen resolution and other basic stuff after bootstrap is finished. It was already loaded before, and might got changed already. 13 years ago
frosch 34f9c4d00f (svn r23427) -Fix: Do not load screen resolution and other basic stuff after bootstrap is finished. It was already loaded before, and might got changed already. 13 years ago
michi_cc fc8633e1ac (svn r23415) -Feature: Infrastructure maintenance costs. 13 years ago
michi_cc d3b7b89493 (svn r23415) -Feature: Infrastructure maintenance costs. 13 years ago
truebrain ac0f5398c2 (svn r23386) -Fix: debug script related events to 'script' (removes 'ai') 13 years ago
truebrain a8b22e5292 (svn r23386) -Fix: debug script related events to 'script' (removes 'ai') 13 years ago
truebrain bf803e40cc (svn r23384) -Remove: no longer allow a binary to be without AI support; the parts some compilers failed at, are integrated in other parts of the code now too 13 years ago
truebrain cc12942d70 (svn r23384) -Remove: no longer allow a binary to be without AI support; the parts some compilers failed at, are integrated in other parts of the code now too 13 years ago
truebrain e7c77353ce (svn r23364) -Codechange: refactor AIConfig, moving it mostly to Scriptconfig 13 years ago
truebrain 34d7f01ccc (svn r23364) -Codechange: refactor AIConfig, moving it mostly to Scriptconfig 13 years ago
peter1138 9e0e4bf639 (svn r23315) -Codechange: Only encode sprites for zoom levels that will be used. 13 years ago
peter1138 15d0a22aac (svn r23315) -Codechange: Only encode sprites for zoom levels that will be used. 13 years ago
peter1138 782aee3c2a (svn r23314) -Add: Add settings to restrict viewport zoom levels. 13 years ago
peter1138 4e97261315 (svn r23314) -Add: Add settings to restrict viewport zoom levels. 13 years ago