diff options
| author | skidd13 <skidd13@openttd.org> | 2007-11-24 10:38:43 +0000 |
|---|---|---|
| committer | skidd13 <skidd13@openttd.org> | 2007-11-24 10:38:43 +0000 |
| commit | bf959f926ff6dee99a15d91652256169a6484042 (patch) | |
| tree | 9c936ecbb5e2e4367788a18a55cbf52eb6eb6cc6 /src/strings.cpp | |
| parent | 64246a2775c56c99746727a02af509fe8d75d53f (diff) | |
| download | openttd-bf959f926ff6dee99a15d91652256169a6484042.tar.xz | |
(svn r11510) -Codechange: merge the IS_*INSIDE* functions and rename them fitting to the naming style
Diffstat (limited to 'src/strings.cpp')
| -rw-r--r-- | src/strings.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/strings.cpp b/src/strings.cpp index ed84ee6ca..d45a6a24e 100644 --- a/src/strings.cpp +++ b/src/strings.cpp @@ -1120,20 +1120,20 @@ static char *GetSpecialPlayerNameString(char *buff, int ind, const int64 *argv, } /* town name? */ - if (IS_INT_INSIDE(ind - 6, 0, SPECSTR_TOWNNAME_LAST-SPECSTR_TOWNNAME_START + 1)) { + if (IsInsideMM(ind - 6, 0, SPECSTR_TOWNNAME_LAST-SPECSTR_TOWNNAME_START + 1)) { buff = GetSpecialTownNameString(buff, ind - 6, GetInt32(&argv), last); return strecpy(buff, " Transport", last); } /* language name? */ - if (IS_INT_INSIDE(ind, (SPECSTR_LANGUAGE_START - 0x70E4), (SPECSTR_LANGUAGE_END - 0x70E4) + 1)) { + if (IsInsideMM(ind, (SPECSTR_LANGUAGE_START - 0x70E4), (SPECSTR_LANGUAGE_END - 0x70E4) + 1)) { int i = ind - (SPECSTR_LANGUAGE_START - 0x70E4); return strecpy(buff, i == _dynlang.curr ? _langpack->own_name : _dynlang.ent[i].name, last); } /* resolution size? */ - if (IS_INT_INSIDE(ind, (SPECSTR_RESOLUTION_START - 0x70E4), (SPECSTR_RESOLUTION_END - 0x70E4) + 1)) { + if (IsInsideMM(ind, (SPECSTR_RESOLUTION_START - 0x70E4), (SPECSTR_RESOLUTION_END - 0x70E4) + 1)) { int i = ind - (SPECSTR_RESOLUTION_START - 0x70E4); buff += snprintf( buff, last - buff + 1, "%dx%d", _resolutions[i][0], _resolutions[i][1] @@ -1142,7 +1142,7 @@ static char *GetSpecialPlayerNameString(char *buff, int ind, const int64 *argv, } /* screenshot format name? */ - if (IS_INT_INSIDE(ind, (SPECSTR_SCREENSHOT_START - 0x70E4), (SPECSTR_SCREENSHOT_END - 0x70E4) + 1)) { + if (IsInsideMM(ind, (SPECSTR_SCREENSHOT_START - 0x70E4), (SPECSTR_SCREENSHOT_END - 0x70E4) + 1)) { int i = ind - (SPECSTR_SCREENSHOT_START - 0x70E4); return strecpy(buff, GetScreenshotFormatDesc(i), last); } @@ -1168,7 +1168,7 @@ StringID RemapOldStringID(StringID s) case 0xA02F: return STR_SV_AIRCRAFT_NAME; default: - if (IS_INT_INSIDE(s, 0x300F, 0x3030)) { + if (IsInsideMM(s, 0x300F, 0x3030)) { return s - 0x300F + STR_SV_STNAME; } else { return s; |