dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'cpp-11' into save_ext

Browse Source 
# Conflicts:
#	config.lib
#	src/saveload/saveload.cpp
This commit is contained in:
Jonathan G Rennison
2019-01-06 22:10:04 +00:00
parent 373ff3dd4e 962a9c5430
commit 0dba091d79
375 changed files with 6874 additions and 8226 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/saveload/saveload.h
View File

@@ -638,7 +638,7 @@ static inline bool SlIsObjectCurrentlyValid(uint16 version_from, uint16 version_
* Get the NumberType of a setting. This describes the integer type
* as it is represented in memory
* @param type VarType holding information about the variable-type
* @return return the SLE_VAR_* part of a variable-type description
* @return the SLE_VAR_* part of a variable-type description
*/
static inline VarType GetVarMemType(VarType type)
{
@@ -646,10 +646,10 @@ static inline VarType GetVarMemType(VarType type)
}
/**
* Get the #FileType of a setting. This describes the integer type
* Get the FileType of a setting. This describes the integer type
* as it is represented in a savegame/file
* @param type VarType holding information about the file-type
* @param return the SLE_FILE_* part of a variable-type description
* @return the SLE_FILE_* part of a variable-type description
*/
static inline VarType GetVarFileType(VarType type)
{