Mercurial > hg > openttd
changeset 3625:932748eea581 draft
(svn r4524) - Codechange: Use GB() macros for getting the saveload file/memory types
| author | Darkvater <Darkvater@openttd.org> |
|---|---|
| date | Sat, 22 Apr 2006 12:40:25 +0000 |
| parents | 4f4cb9981c64 |
| children | 772aa823c9bf |
| files | saveload.c saveload.h |
| diffstat | 2 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/saveload.c +++ b/saveload.c @@ -101,7 +101,7 @@ static inline byte SlCalcConvMemLen(VarType conv) { static const byte conv_mem_size[] = {1, 1, 1, 2, 2, 4, 4, 8, 8, 0}; - byte length = (conv >> 4) & 0xF; + byte length = GB(conv, 4, 4); assert(length < lengthof(conv_mem_size)); return conv_mem_size[length]; } @@ -113,7 +113,7 @@ static inline byte SlCalcConvFileLen(VarType conv) { static const byte conv_file_size[] = {1, 1, 2, 2, 4, 4, 8, 8, 2}; - byte length = conv & 0xF; + byte length = GB(conv, 0, 4); assert(length < lengthof(conv_file_size)); return conv_file_size[length]; }
--- a/saveload.h +++ b/saveload.h @@ -250,7 +250,7 @@ * @return return the SLE_VAR_* part of a variable-type description */ static inline VarType GetVarMemType(VarType type) { - return type & 0xF0; // GB(type, 4, 8) << 4; + return type & 0xF0; // GB(type, 4, 4) << 4; } /* Get the FileType of a setting. This describes the integer type