Commit Graph

23 Commits (43980639de7bd654a20982830798927b88d195d6)

Author SHA1 Message Date
Jonathan G Rennison 43980639de Merge branch 'master' into jgrpp
# Conflicts:
#	.gitignore
#	CMakeLists.txt
#	src/3rdparty/optional/optional.hpp
#	src/group_cmd.cpp
#	src/industry_cmd.cpp
#	src/misc_gui.cpp
#	src/video/sdl2_v.cpp
3 years ago
frosch 484ea62a62 Cleanup: use std::optional instead of custom implementation. 4 years ago
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
4 years ago
Michael Lutz 715aa67a9c Codechange: Use std::string in INI file parsing. 4 years ago
Jonathan G Rennison e67669d6ed Add missing include to ini_type.h 4 years ago
Jonathan G Rennison eef6ad7b2a Crash log: Save config file in new crash save chunk 4 years ago
S. D. Cloudt 13cc8a0cee Cleanup: Removed SVN headers 5 years ago
Henry Wilson 7c8e7c6b6e Codechange: Use null pointer literal instead of the NULL macro 5 years ago
Charles Pigott f5b1115039 Doc: Lots and lots of doxymentation fixes 6 years ago
rubidium 8960939b22 (svn r26499) -Codechange: replace strndup with stredup 10 years ago
rubidium 05300a00b1 (svn r22824) -Codechange: pass sub directory to ini loading 13 years ago
alberth fa9c193539 (svn r22170) -Add: Add IGT_SEQUENCE type for loading ini group lines without further interpretation. 13 years ago
alberth 6a88af662b (svn r22169) -Add: Add parameter to disable automatic group creation in IniLoadFile::GetGroup(). 13 years ago
alberth 722296e797 (svn r22168) -Codechange: Move ini file IO and file error reporting to virtual functions. 13 years ago
alberth d19a9f5df5 (svn r22167) -Codechange: Extract IniLoadFile base class for loading ini files out of IniFile. 13 years ago
rubidium 7efd7e19ed (svn r21845) -Codechange: move documentation towards the code to make it more likely to be updates [d-m]. 14 years ago
smatz 114d48e492 (svn r17596) -Codechange: constify some tables 15 years ago
rubidium 7fbc33dae1 (svn r17248) -Fix: add GPL license notice where appropriate 15 years ago
peter1138 7d70f0cd14 (svn r15085) -Fix (r14164): Clearing a settings group did not delete old items nor reset the last_item pointer, causing lists to not be saved unless they started blank. 16 years ago
rubidium 621a9b647a (svn r14167) -Fix: items in some ini-groups got duplicated on save. 16 years ago
rubidium 411c65e755 (svn r14164) -Codechange: simplify and unify the addition of ini items with value when not loading an ini file.
-Fix: wrong insertion management causing leaks.
16 years ago
smatz 0d4e7f9537 (svn r14156) -Fix (r14153): missing/wrong comments 16 years ago
rubidium ae32d158cb (svn r14153) -Codechange: split ini file reading/saving from settings.cpp. 16 years ago