diff options
author | rubidium <rubidium@openttd.org> | 2008-04-18 21:49:38 +0000 |
---|---|---|
committer | rubidium <rubidium@openttd.org> | 2008-04-18 21:49:38 +0000 |
commit | 7e5639ccea74f36d85b465ef93b0cdb9f135c4e4 (patch) | |
tree | 92ccb2f516619d9f9a117d750c144fb6c3c478db /src/video/win32_v.cpp | |
parent | 6813a17d15c511c0c1c3800688d6bea3632f8dda (diff) | |
download | openttd-7e5639ccea74f36d85b465ef93b0cdb9f135c4e4.tar.xz |
(svn r12779) -Codechange: remove a few constants from openttd.h.
Diffstat (limited to 'src/video/win32_v.cpp')
-rw-r--r-- | src/video/win32_v.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/video/win32_v.cpp b/src/video/win32_v.cpp index 5030362c6..0ab7be62f 100644 --- a/src/video/win32_v.cpp +++ b/src/video/win32_v.cpp @@ -545,8 +545,8 @@ static LRESULT CALLBACK WndProcGdi(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lP w = r->right - r->left - (r2.right - r2.left); h = r->bottom - r->top - (r2.bottom - r2.top); - w = Clamp(w, 64, MAX_SCREEN_WIDTH); - h = Clamp(h, 64, MAX_SCREEN_HEIGHT); + w = max(w, 64); + h = max(h, 64); SetRect(&r2, 0, 0, w, h); AdjustWindowRect(&r2, GetWindowLong(hwnd, GWL_STYLE), FALSE); @@ -677,8 +677,8 @@ static bool AllocateDibSection(int w, int h) HDC dc; int bpp = BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth(); - w = Clamp(w, 64, MAX_SCREEN_WIDTH); - h = Clamp(h, 64, MAX_SCREEN_HEIGHT); + w = max(w, 64); + h = max(h, 64); if (bpp == 0) error("Can't use a blitter that blits 0 bpp for normal visuals"); @@ -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() && IsInsideMM(dm.dmPelsWidth, 640, MAX_SCREEN_WIDTH + 1) && - IsInsideMM(dm.dmPelsHeight, 480, MAX_SCREEN_HEIGHT + 1)) { + if (dm.dmBitsPerPel == BlitterFactoryBase::GetCurrentBlitter()->GetScreenDepth() && + dm.dmPelsWidth >= 640 && dm.dmPelsHeight >= 480) { uint j; for (j = 0; j < n; j++) { @@ -787,10 +787,10 @@ const char *VideoDriver_Win32::Start(const char * const *parm) _wnd.height_org = _cur_resolution[1]; AllocateDibSection(_cur_resolution[0], _cur_resolution[1]); - MarkWholeScreenDirty(); - MakeWindow(_fullscreen); + MarkWholeScreenDirty(); + return NULL; } |