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

(svn r23816) -Fix (r23635, r23805): make SCC_ENCODED the first entry in the StringControlCode enum since it's value is not allowed to change

Browse Source
This commit is contained in:
yexo
2012-01-16 22:29:25 +00:00
parent 358b3e41b2
commit 2c99805117
4 changed files with 35 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/saveload/saveload.cpp
View File

@@ -232,8 +232,9 @@
* 166 23415
* 167 23504
* 168 23637
* 169 23816
*/
extern const uint16 SAVEGAME_VERSION = 168; ///< Current savegame version of OpenTTD.
extern const uint16 SAVEGAME_VERSION = 169; ///< Current savegame version of OpenTTD.
SavegameType _savegame_type; ///< type of savegame we are loading
@@ -1096,6 +1097,9 @@ static void SlString(void *ptr, size_t length, VarType conv)
StringValidationSettings settings = SVS_REPLACE_WITH_QUESTION_MARK;
if ((conv & SLF_ALLOW_CONTROL) != 0) {
settings = settings | SVS_ALLOW_CONTROL_CODE;
if (IsSavegameVersionBefore(169)) {
str_fix_scc_encoded((char *)ptr, (char *)ptr + len);
}
}
if ((conv & SLF_ALLOW_NEWLINE) != 0) {
settings = settings | SVS_ALLOW_NEWLINE;