mirror of https://github.com/OpenTTD/OpenTTD.git
(svn r18952) -Fix (r18950): loading recent (=newer then title game) savegames failed
This commit is contained in:
parent
b0349704b0
commit
dc714960e3
|
@ -295,6 +295,16 @@ static inline VarType GetVarFileType(VarType type)
|
|||
return type & 0xF; // GB(type, 0, 4);
|
||||
}
|
||||
|
||||
/**
|
||||
* Check if the given saveload type is a numeric type.
|
||||
* @param conv the type to check
|
||||
* @return True if it's a numeric type.
|
||||
*/
|
||||
static bool IsNumericType(VarType conv)
|
||||
{
|
||||
return GetVarMemType(conv) <= SLE_VAR_U64;
|
||||
}
|
||||
|
||||
/** Get the address of the variable. Which one to pick depends on the object
|
||||
* pointer. If it is NULL we are dealing with global variables so the address
|
||||
* is taken. If non-null only the offset is stored in the union and we need
|
||||
|
|
|
@ -1784,7 +1784,7 @@ static void LoadSettings(const SettingDesc *osd, void *object)
|
|||
void *ptr = GetVariableAddress(object, sld);
|
||||
|
||||
if (!SlObjectMember(ptr, sld)) continue;
|
||||
Write_ValidateSetting(ptr, osd, ReadValue(ptr, sld->conv));
|
||||
if (IsNumericType(sld->conv)) Write_ValidateSetting(ptr, osd, ReadValue(ptr, sld->conv));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue