mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

(svn r23192) -Codechange: don't cast away const needlessly

release/1.2
rubidium 2011-11-12 07:58:22 +00:00
parent 39263445b0
commit a8d33a4d89
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/saveload/saveload.cpp
View File

@ -884,15 +884,15 @@ size_t SlGetFieldLength()
int64 ReadValue(const void *ptr, VarType conv) int64 ReadValue(const void *ptr, VarType conv)
{ {
switch (GetVarMemType(conv)) { switch (GetVarMemType(conv)) {
case SLE_VAR_BL: return (*(bool *)ptr != 0); case SLE_VAR_BL: return (*(const bool *)ptr != 0);
case SLE_VAR_I8: return *(int8 *)ptr; case SLE_VAR_I8: return *(const int8 *)ptr;
case SLE_VAR_U8: return *(byte *)ptr; case SLE_VAR_U8: return *(const byte *)ptr;
case SLE_VAR_I16: return *(int16 *)ptr; case SLE_VAR_I16: return *(const int16 *)ptr;
case SLE_VAR_U16: return *(uint16*)ptr; case SLE_VAR_U16: return *(const uint16*)ptr;
case SLE_VAR_I32: return *(int32 *)ptr; case SLE_VAR_I32: return *(const int32 *)ptr;
case SLE_VAR_U32: return *(uint32*)ptr; case SLE_VAR_U32: return *(const uint32*)ptr;
case SLE_VAR_I64: return *(int64 *)ptr; case SLE_VAR_I64: return *(const int64 *)ptr;
case SLE_VAR_U64: return *(uint64*)ptr; case SLE_VAR_U64: return *(const uint64*)ptr;
case SLE_VAR_NULL:return 0; case SLE_VAR_NULL:return 0;
default: NOT_REACHED(); default: NOT_REACHED();
} }
@ -1012,7 +1012,7 @@ static inline size_t SlCalcStringLen(const void *ptr, size_t length, VarType con
default: NOT_REACHED(); default: NOT_REACHED();
case SLE_VAR_STR: case SLE_VAR_STR:
case SLE_VAR_STRQ: case SLE_VAR_STRQ:
str = *(const char**)ptr; str = *(const char * const *)ptr;
len = SIZE_MAX; len = SIZE_MAX;
break; break;
case SLE_VAR_STRB: case SLE_VAR_STRB:
@ -1265,7 +1265,7 @@ static void *IntToReference(size_t index, SLRefType rt)
*/ */
static inline size_t SlCalcListLen(const void *list) static inline size_t SlCalcListLen(const void *list)
{ {
std::list<void *> *l = (std::list<void *> *) list; const std::list<void *> *l = (const std::list<void *> *) list;
int type_size = IsSavegameVersionBefore(69) ? 2 : 4; int type_size = IsSavegameVersionBefore(69) ? 2 : 4;
/* Each entry is saved as type_size bytes, plus type_size bytes are used for the length /* Each entry is saved as type_size bytes, plus type_size bytes are used for the length