WINTERMUTE: Remove in-engine fullscreen-switching, let ScummVM handle that.

5 files changed, 0 insertions, 29 deletions

diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index fcf45f18f2..622c23595b 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -3701,13 +3701,6 @@ bool BaseGame::handleKeypress(Common::Event *event, bool printable) {
 		return true;

 	}

 

-	if (event->type == Common::EVENT_KEYDOWN && event->kbd.keycode == Common::KEYCODE_RETURN && (event->kbd.flags == Common::KBD_ALT)) {

-		// TODO: Handle alt-enter as well as alt-return.

-		_renderer->switchFullscreen();

-		return true;

-	}

-

-

 	_keyboardState->handleKeyPress(event);

 	_keyboardState->readKey(event);

 // TODO

diff --git a/engines/wintermute/base/gfx/base_renderer.cpp b/engines/wintermute/base/gfx/base_renderer.cpp
index a40b3204a5..ac475b3c5e 100644
--- a/engines/wintermute/base/gfx/base_renderer.cpp
+++ b/engines/wintermute/base/gfx/base_renderer.cpp
@@ -111,13 +111,6 @@ void BaseRenderer::deleteRectList() {
 	_rectList.clear();

 }

 

-

-//////////////////////////////////////////////////////////////////////////

-//////////////////////////////////////////////////////////////////////

-bool BaseRenderer::switchFullscreen() {

-	return STATUS_FAILED;

-}

-

 //////////////////////////////////////////////////////////////////////

 bool BaseRenderer::flip() {

 	return STATUS_FAILED;

diff --git a/engines/wintermute/base/gfx/base_renderer.h b/engines/wintermute/base/gfx/base_renderer.h
index 84da8bd7f8..b67f221e83 100644
--- a/engines/wintermute/base/gfx/base_renderer.h
+++ b/engines/wintermute/base/gfx/base_renderer.h
@@ -68,7 +68,6 @@ public:
 	virtual bool initRenderer(int width, int height, bool windowed);

 	virtual bool flip();

 	virtual void initLoop();

-	virtual bool switchFullscreen();

 	virtual bool setup2D(bool force = false);

 	virtual bool setupLines();

 

diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
index 70d1268e5a..2d2e62076c 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.cpp
@@ -589,18 +589,6 @@ BaseImage *BaseRenderOSystem::takeScreenshot() {
 }

 

 //////////////////////////////////////////////////////////////////////////

-bool BaseRenderOSystem::switchFullscreen() {

-	/*if (_windowed) SDL_SetWindowFullscreen(_win, SDL_TRUE);

-	else SDL_SetWindowFullscreen(_win, SDL_FALSE);

-

-	_windowed = !_windowed;

-	*/

-	_gameRef->_registry->writeBool("Video", "Windowed", _windowed);

-

-	return STATUS_OK;

-}

-

-//////////////////////////////////////////////////////////////////////////

 const char *BaseRenderOSystem::getName() {

 	if (_name.empty()) {

 #if 0

diff --git a/engines/wintermute/base/gfx/osystem/base_render_osystem.h b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
index 75c745ecf7..3f4185dce2 100644
--- a/engines/wintermute/base/gfx/osystem/base_render_osystem.h
+++ b/engines/wintermute/base/gfx/osystem/base_render_osystem.h
@@ -71,8 +71,6 @@ public:
 	bool fade(uint16 alpha);

 	bool fadeToColor(uint32 color, Common::Rect *rect = NULL);

 

-	bool switchFullscreen();

-

 	bool drawLine(int x1, int y1, int x2, int y2, uint32 color);

 

 	BaseImage *takeScreenshot();