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/video | |
| 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/video')
| -rw-r--r-- | src/video/dedicated_v.cpp | 2 | ||||
| -rw-r--r-- | src/video/sdl_v.cpp | 4 | ||||
| -rw-r--r-- | src/video/win32_v.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/video/dedicated_v.cpp b/src/video/dedicated_v.cpp index 3d9490c59..e7b9302fe 100644 --- a/src/video/dedicated_v.cpp +++ b/src/video/dedicated_v.cpp @@ -235,7 +235,7 @@ static void DedicatedHandleKeyInput() if (input_line[i] == '\0') break; - if (!IS_INT_INSIDE(input_line[i], ' ', 256)) + if (!IsInsideMM(input_line[i], ' ', 256)) input_line[i] = ' '; } } diff --git a/src/video/sdl_v.cpp b/src/video/sdl_v.cpp index aa1addc34..c0cd58ef6 100644 --- a/src/video/sdl_v.cpp +++ b/src/video/sdl_v.cpp @@ -128,8 +128,8 @@ static void GetVideoModes() for (i = 0; modes[i]; i++) { int w = modes[i]->w; int h = modes[i]->h; - if (IS_INT_INSIDE(w, 640, MAX_SCREEN_WIDTH + 1) && - IS_INT_INSIDE(h, 480, MAX_SCREEN_HEIGHT + 1)) { + if (IsInsideMM(w, 640, MAX_SCREEN_WIDTH + 1) && + IsInsideMM(h, 480, MAX_SCREEN_HEIGHT + 1)) { int j; for (j = 0; j < n; j++) { if (_resolutions[j][0] == w && _resolutions[j][1] == h) break; diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp index 16677fb87..b742bbfd3 100644 --- a/src/video/win32_v.cpp +++ b/src/video/win32_v.cpp @@ -737,8 +737,8 @@ static void FindResolutions() * Doesn't really matter since we don't pass a string anyways, but still * a letdown */ for (i = 0; EnumDisplaySettingsA(NULL, i, &dm) != 0; i++) { - if (dm.dmBitsPerPel == BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth() && IS_INT_INSIDE(dm.dmPelsWidth, 640, MAX_SCREEN_WIDTH + 1) && - IS_INT_INSIDE(dm.dmPelsHeight, 480, MAX_SCREEN_HEIGHT + 1)) { + if (dm.dmBitsPerPel == BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth() && IsInsideMM(dm.dmPelsWidth, 640, MAX_SCREEN_WIDTH + 1) && + IsInsideMM(dm.dmPelsHeight, 480, MAX_SCREEN_HEIGHT + 1)) { uint j; for (j = 0; j < n; j++) { |