dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
49,076 Commits 1 Branch 0 Tags
f8d6e781bae9d64c5cc76451abc88feca7697e7b
Commit Graph

40 Commits

Author SHA1 Message Date
Jonathan G Rennison
f8d6e781ba Merge branch 'master' into jgrpp 
# Conflicts:
#	projects/openttd_vs140.vcxproj.filters
#	projects/openttd_vs141.vcxproj.filters
#	projects/openttd_vs142.vcxproj.filters
#	src/base_consist.h
#	src/company_base.h
#	src/newgrf_config.cpp
#	src/newgrf_config.h
#	src/openttd.cpp
#	src/saveload/saveload.cpp
#	src/saveload/saveload.h
#	src/saveload/station_sl.cpp
#	src/settings.cpp
#	src/signs_base.h
#	src/string.cpp
#	src/string_func.h
#	src/table/misc_settings.ini
#	src/table/settings.h.preamble
#	src/town_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_cmd.cpp
#	src/video/cocoa/cocoa_v.mm
#	src/video/null_v.cpp
 2020-05-21 22:24:01 +01:00
Michael Lutz
a49fdb7ebb Codechange: Store base set related texts in std::strings. 2020-05-21 20:02:34 +02:00
Jonathan G Rennison
8176da3f62 Saveload: Add value conversion support to settings xref 2020-01-03 18:53:09 +00:00
Jonathan G Rennison
cbdd9f84d8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/console_gui.cpp
#	src/lang/korean.txt
#	src/video/sdl2_v.cpp
#	src/video/sdl2_v.h
#	src/window.cpp
#	src/window_gui.h
 2019-11-12 18:43:10 +00:00
S. D. Cloudt
13cc8a0cee Cleanup: Removed SVN headers 2019-11-10 17:59:20 +00:00
Jonathan G Rennison
edfd378e93 Merge branch 'master' into jgrpp 
# Conflicts:
#	source.list
#	src/blitter/32bpp_anim.cpp
#	src/linkgraph/linkgraphjob.cpp
#	src/order_cmd.cpp
#	src/vehicle.cpp
#	src/vehicle_type.h
 2019-10-05 21:45:54 +01:00
JMcKiern
04f659e768 Fix: Some typos found using codespell 2019-09-29 21:27:32 +01:00
Jonathan G Rennison
36eb4165b8 Merge branch 'master' into jgrpp 
# Conflicts:
#	src/bridge_map.h
#	src/crashlog.cpp
#	src/industry.h
#	src/linkgraph/linkgraph_type.h
#	src/order_type.h
#	src/saveload/afterload.cpp
#	src/settings.cpp
#	src/settings_type.h
#	src/smallmap_gui.cpp
#	src/spritecache.cpp
#	src/stdafx.h
#	src/table/settings.h.preamble
#	src/train.h
#	src/vehicle.cpp
#	src/viewport.cpp
#	src/viewport_func.h
#	src/widgets/station_widget.h
#	src/zoom_func.h
#	src/zoom_type.h
 2019-07-08 16:19:07 +01:00
Jonathan G Rennison
8b1ee39ace Setting: Add support for enum type settings 2019-05-01 19:03:00 +01:00
Charles Pigott
644f4c3547 Codechange: Set size of SettingGuiFlag & SettingDescType enums, and use them properly 2019-04-29 17:40:22 +01:00
Jonathan G Rennison
674732cd68 Merge: Codechange: Use null pointer literal instead of the NULL macro 2019-04-11 18:14:13 +01:00
peter1138
c0836bccef Codechange: NULL -> nullptr in settings files. 2019-04-11 13:00:55 +01:00
Jonathan G Rennison
373ff3dd4e Merge branch 'master' into save_ext 
# Conflicts:
#	src/saveload/saveload.cpp
#	src/table/settings.h.preamble
 2018-07-02 18:41:39 +01:00
Charles Pigott
2aacddd412 Codechange: lengthof is not defined for runtime-length strings, use sizeof instead 2018-06-27 22:54:46 +02:00
Jonathan G Rennison
a3d1585826 Add settings callback field to re-order setting options in GUI 2017-08-20 10:37:45 +01:00
Jonathan G Rennison
6fcb156989 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.

(cherry picked from commit b5c453b21e)
 2017-08-20 01:44:10 +01:00
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.
 2015-08-01 12:58:53 +01:00
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.
 2015-08-01 12:26:22 +01:00
matthijs
cb9a5a8ad2 (svn r24991) -Doc: Clarify comments regarding settings macros. 2013-02-14 11:06:01 +00:00
matthijs
97decad061 (svn r24991) -Doc: Clarify comments regarding settings macros. 2013-02-14 11:06:01 +00:00
frosch
b4c70a51da (svn r24671) -Feature [FS#5355]: Add basic/advanced/expert filters to adv. settings GUI. (Eagle_rainbow) 2012-11-08 10:04:00 +00:00
frosch
69a62452be (svn r24671) -Feature [FS#5355]: Add basic/advanced/expert filters to adv. settings GUI. (Eagle_rainbow) 2012-11-08 10:04:00 +00:00
alberth
cc6b16a4c1 (svn r24234) -Add: Add help-string infrastructure to the ini files 2012-05-12 10:09:00 +00:00
alberth
1d58838a97 (svn r24234) -Add: Add help-string infrastructure to the ini files 2012-05-12 10:09:00 +00:00
frosch
ea311e7904 (svn r22522) -Fix (r22489): (size_t)(uint32)(-1) != (size_t)-1 2011-05-29 18:35:31 +00:00
frosch
615e435677 (svn r22522) -Fix (r22489): (size_t)(uint32)(-1) != (size_t)-1 2011-05-29 18:35:31 +00:00
alberth
a7e7e76f7f (svn r22210) -Add: Add a variable for the value strings in the settings tables. 2011-03-06 15:51:44 +00:00
alberth
9fe65f93fe (svn r22210) -Add: Add a variable for the value strings in the settings tables. 2011-03-06 15:51:44 +00:00
alberth
26ba8bd23e (svn r22209) -Codechange: Move function declarations from settings.h.preamble to the ini file that uses it. 2011-03-06 10:35:40 +00:00
alberth
02bf850d95 (svn r22209) -Codechange: Move function declarations from settings.h.preamble to the ini file that uses it. 2011-03-06 10:35:40 +00:00
rubidium
2e5b1f178e (svn r22202) -Codechange: make MusicFileSettings a proper citizen of the client settings 2011-03-05 18:00:48 +00:00
rubidium
f90044d343 (svn r22202) -Codechange: make MusicFileSettings a proper citizen of the client settings 2011-03-05 18:00:48 +00:00
rubidium
7c608a4e0a (svn r22199) -Cleanup-ish: replace the shortcut macros for (gui)flags with their more clearly named (longer) constant names 2011-03-05 11:34:31 +00:00
rubidium
b8d3c42de2 (svn r22199) -Cleanup-ish: replace the shortcut macros for (gui)flags with their more clearly named (longer) constant names 2011-03-05 11:34:31 +00:00
rubidium
2a7912d415 (svn r22198) -Codechange: make some constants name more explicit 2011-03-05 11:16:44 +00:00
rubidium
e48967541a (svn r22198) -Codechange: make some constants name more explicit 2011-03-05 11:16:44 +00:00
rubidium
8ead62cdc1 (svn r22197) -Cleanup: remove the distinction between conditional and non-conditional settings; with default from and to savegame versions all can be conditional. They previously were as well; the non-conditional ones were macros of the conditionals with to/from saveload versions hardcoded 2011-03-05 10:47:49 +00:00
rubidium
2636a4809b (svn r22197) -Cleanup: remove the distinction between conditional and non-conditional settings; with default from and to savegame versions all can be conditional. They previously were as well; the non-conditional ones were macros of the conditionals with to/from saveload versions hardcoded 2011-03-05 10:47:49 +00:00
alberth
da00c588ec (svn r22173) -Add: Add preamble and postamble files before and after the generated settings data. 2011-03-03 21:06:24 +00:00
alberth
7477f92029 (svn r22173) -Add: Add preamble and postamble files before and after the generated settings data. 2011-03-03 21:06:24 +00:00