mirrors
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

(svn r5873) - Fix a bad comment in r5871, and add a further check for saving strings.

This commit is contained in:
Darkvater 2006-08-13 08:51:55 +00:00
parent b1b0b26fc8
commit 0daa7cdaed
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
saveload.c
View File

@ -516,7 +516,8 @@ static void SlString(void *ptr, uint length, VarType conv)
{
uint len;
assert(GetVarFileType(conv) == SLE_FILE_STRING);
assert(GetVarMemType(conv) == SLE_VAR_STRB || GetVarMemType(conv) == SLE_VAR_STRQ);
assert(GetVarMemType(conv) == SLE_VAR_STRB || GetVarMemType(conv) == SLE_VAR_STRBQ);
assert(ptr != NULL);
if (_sl.save) {
len = SlCalcNetStringLen(ptr, length);

4
saveload.h
View File

@ -98,9 +98,9 @@ enum VarTypes {
SLE_VAR_U64 = 8 << 4,
SLE_VAR_NULL = 9 << 4, ///< useful to write zeros in savegame.
SLE_VAR_STRB = 10 << 4, ///< normal string (with pre-allocated buffer)
SLE_VAR_STRBQ= 11 << 4, ///< string enclosed in parentheses (with pre-allocated buffer)
SLE_VAR_STRBQ= 11 << 4, ///< string enclosed in quotes (with pre-allocated buffer)
SLE_VAR_STR = 12 << 4, ///< string pointer
SLE_VAR_STRQ = 13 << 4, ///< string enclosed in parentheses
SLE_VAR_STRQ = 13 << 4, ///< string enclosed in quotes
/* 2 more possible memory-primitives */
/* Shortcut values */