Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r22736) -Codechange: constify some numbers

Browse Source
This commit is contained in:
rubidium 2011-08-12 18:34:09 +00:00
parent 14fae95134
commit c8f19a608d
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/saveload/strings_sl.cpp
View File

@ -15,6 +15,10 @@
#include "table/strings.h" #include "table/strings.h"
static const int NUM_OLD_STRINGS = 512; ///< The number of custom strings stored in old savegames.
static const int LEN_OLD_STRINGS = 32; ///< The number of characters per string.
static const int LEN_OLD_STRINGS_TTO = 24; ///< The number of characters per string in TTO savegames.
/** /**
* Remap a string ID from the old format to the new format * Remap a string ID from the old format to the new format
* @param s StringID that requires remapping * @param s StringID that requires remapping
@ -57,10 +61,9 @@ char *CopyFromOldName(StringID id)
if (GB(id, 11, 5) != 15) return NULL; if (GB(id, 11, 5) != 15) return NULL;
if (IsSavegameVersionBefore(37)) { if (IsSavegameVersionBefore(37)) {
/* Old names were 24/32 characters long, so 128 characters should be /* Allow for expansion when converted to UTF-8. */
* plenty to allow for expansion when converted to UTF-8. */ char tmp[LEN_OLD_STRINGS * MAX_CHAR_LENGTH];
char tmp[128]; uint offs = _savegame_type == SGT_TTO ? LEN_OLD_STRINGS_TTO * GB(id, 0, 8) : LEN_OLD_STRINGS * GB(id, 0, 9);
uint offs = _savegame_type == SGT_TTO ? 24 * GB(id, 0, 8) : 32 * GB(id, 0, 9);
const char *strfrom = &_old_name_array[offs]; const char *strfrom = &_old_name_array[offs];
char *strto = tmp; char *strto = tmp;
@ -92,7 +95,7 @@ char *CopyFromOldName(StringID id)
return strdup(tmp); return strdup(tmp);
} else { } else {
/* Name will already be in UTF-8. */ /* Name will already be in UTF-8. */
return strdup(&_old_name_array[32 * GB(id, 0, 9)]); return strdup(&_old_name_array[LEN_OLD_STRINGS * GB(id, 0, 9)]);
} }
} }
@ -112,7 +115,7 @@ void ResetOldNames()
void InitializeOldNames() void InitializeOldNames()
{ {
free(_old_name_array); free(_old_name_array);
_old_name_array = CallocT<char>(512 * 32); // 200 * 24 would be enough for TTO savegames _old_name_array = CallocT<char>(NUM_OLD_STRINGS * LEN_OLD_STRINGS); // 200 * 24 would be enough for TTO savegames
} }
/** /**
@ -123,7 +126,7 @@ static void Load_NAME()
int index; int index;
while ((index = SlIterateArray()) != -1) { while ((index = SlIterateArray()) != -1) {
SlArray(&_old_name_array[32 * index], SlGetFieldLength(), SLE_UINT8); SlArray(&_old_name_array[LEN_OLD_STRINGS * index], SlGetFieldLength(), SLE_UINT8);
} }
} }