From cc10796dfef65acde7df7bb88b227b00bec8cd36 Mon Sep 17 00:00:00 2001 From: Albert Zeyer Date: Tue, 17 Nov 2009 15:31:23 +0100 Subject: [PATCH] small fix: initResolutionList also works for iphone --- src/sdl/CVideoDriver.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/src/sdl/CVideoDriver.cpp b/src/sdl/CVideoDriver.cpp index 1c72eb5c9..4a82f203d 100644 --- a/src/sdl/CVideoDriver.cpp +++ b/src/sdl/CVideoDriver.cpp @@ -92,23 +92,16 @@ void CVideoDriver::resetSettings() { BGLayerSurface=NULL; BlitSurface=NULL; -#if defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR) - m_Resolution.width = 320; // 320; - m_Resolution.height = 200; // 480; - m_Resolution.depth = 32; - m_Resolutionlist.push_back(m_Resolution); - m_Resolution_pos = m_Resolutionlist.begin(); - +#if defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR) Zoom = 1; Filtermode = 0; FrameSkip=1; m_targetfps = 30; m_aspect_correction = false; +#endif -#else m_Resolution_pos = m_Resolutionlist.begin(); initResolutionList(); -#endif } CVideoDriver::CVideoDriver() { @@ -121,6 +114,16 @@ CVideoDriver::~CVideoDriver() { void CVideoDriver::initResolutionList() { +#if defined(TARGET_OS_IPHONE) || defined(TARGET_IPHONE_SIMULATOR) + m_Resolution.width = 320; // 320; + m_Resolution.height = 200; // 480; + m_Resolution.depth = 32; + m_Resolutionlist.push_back(m_Resolution); + m_Resolution_pos = m_Resolutionlist.begin(); + + return; +#endif + st_resolution resolution; char buf[256];