diff options
| author | frosch <frosch@openttd.org> | 2017-02-26 19:40:53 +0000 |
|---|---|---|
| committer | frosch <frosch@openttd.org> | 2017-02-26 19:40:53 +0000 |
| commit | a56e2bccd0bbeac71e3fa4c406ae5ec5f8e578a8 (patch) | |
| tree | 921d348a0938d086c0b7036bedc1e84df7264316 /src/strings_func.h | |
| parent | f4da8ece0ce02d6fe3dac6f8adc147e8a3d095a3 (diff) | |
| download | openttd-a56e2bccd0bbeac71e3fa4c406ae5ec5f8e578a8.tar.xz | |
(svn r27756) -Codechange: Add StringTab enum
Diffstat (limited to 'src/strings_func.h')
| -rw-r--r-- | src/strings_func.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/strings_func.h b/src/strings_func.h index 3e3aa4840..7ad20eb1f 100644 --- a/src/strings_func.h +++ b/src/strings_func.h @@ -22,9 +22,9 @@ * @param str String identifier * @return StringTab from \a str */ -static inline uint GetStringTab(StringID str) +static inline StringTab GetStringTab(StringID str) { - return GB(str, TAB_SIZE_BITS, 5); + return (StringTab)GB(str, TAB_SIZE_BITS, 5); } /** @@ -43,8 +43,9 @@ static inline uint GetStringIndex(StringID str) * @param index StringIndex * @return StringID composed from \a tab and \a index */ -static inline StringID MakeStringID(uint tab, uint index) +static inline StringID MakeStringID(StringTab tab, uint index) { + assert(tab < TEXT_TAB_END); assert(index < TAB_SIZE); return tab << TAB_SIZE_BITS | index; } |