Mercurial > hg > openttd
changeset 4257:c32de36ea14f draft
(svn r5873) - Fix a bad comment in r5871, and add a further check for saving strings.
author | Darkvater <Darkvater@openttd.org> |
---|---|
date | Sun, 13 Aug 2006 08:51:55 +0000 |
parents | d3201268dcc2 |
children | e35e00de9973 |
files | saveload.c saveload.h |
diffstat | 2 files changed, 4 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/saveload.c +++ b/saveload.c @@ -516,7 +516,8 @@ { 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);
--- a/saveload.h +++ b/saveload.h @@ -98,9 +98,9 @@ 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 */