[Gemrb-commits] gemrb: branch master updated. v0.6.2-1191-gc99c4bb

[Tom <rtp...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  c99c4bb85958a4a6362a7b76a9ef33eafe5cb14f (commit)

Summary of changes:
 gemrb/core/Video.cpp                  |    5 +++++
 gemrb/core/Video.h                    |    6 +++---
 gemrb/plugins/GUIScript/GUIScript.cpp |    2 +-
 gemrb/plugins/SDLVideo/SDLVideo.cpp   |   13 +++++--------
 gemrb/plugins/SDLVideo/SDLVideo.h     |    2 +-
 5 files changed, 15 insertions(+), 13 deletions(-)
      from  2c87aaf9a7362e986c4e89c2fa40b9870044f5b4 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=c99c4bb85958a4a6362a7b76a9ef33eafe5cb14f

commit c99c4bb85958a4a6362a7b76a9ef33eafe5cb14f
Author: Tom Prince <tom...@ua...>
Date:   Sun May 1 18:09:48 2011 -0400

    Video: Split SetFullscreenMode from ToggleFullscreenMode.
    
    Signed-off-by: Tom Prince <tom...@ua...>

diff --git a/gemrb/core/Video.cpp b/gemrb/core/Video.cpp
index 981b81c..d056070 100644
--- a/gemrb/core/Video.cpp
+++ b/gemrb/core/Video.cpp
@@ -46,6 +46,11 @@ Video::~Video(void)
 {
 }
 
+bool Video::ToggleFullscreenMode()
+{
+	return SetFullscreenMode(!fullscreen);
+}
+
 /** Set Event Manager */
 void Video::SetEventMgr(EventMgr* evnt)
 {
diff --git a/gemrb/core/Video.h b/gemrb/core/Video.h
index c28af59..ec28d57 100644
--- a/gemrb/core/Video.h
+++ b/gemrb/core/Video.h
@@ -80,9 +80,9 @@ public:
 	virtual int CreateDisplay(int width, int height, int bpp, bool fullscreen) = 0;
 	/** Sets window title of GemRB window */
 	virtual void SetDisplayTitle(char* title, char* icon) = 0;
-	/** Toggles GemRB between fullscreen and windowed mode.
-	  * 0 = windowed, 1 = fullscreen, -1 (default) = toggle */
-	virtual bool ToggleFullscreenMode(int set_reset=-1) = 0;
+	/** Toggles GemRB between fullscreen and windowed mode. */
+	bool ToggleFullscreenMode();
+	virtual bool SetFullscreenMode(bool set) = 0;
 	/** Swaps displayed and back buffers */
 	virtual int SwapBuffers(void) = 0;
 	/** Grabs and releases mouse cursor within GemRB window */
diff --git a/gemrb/plugins/GUIScript/GUIScript.cpp b/gemrb/plugins/GUIScript/GUIScript.cpp
index 736cd4a..bfcc6e0 100644
--- a/gemrb/plugins/GUIScript/GUIScript.cpp
+++ b/gemrb/plugins/GUIScript/GUIScript.cpp
@@ -9208,7 +9208,7 @@ static PyObject* GemRB_SetFullScreen(PyObject * /*self*/, PyObject* args)
 	if (!PyArg_ParseTuple( args, "i", &fullscreen )) {
 		return AttributeError( GemRB_SetFullScreen__doc );
 	}
-	core->GetVideoDriver()->ToggleFullscreenMode(fullscreen);
+	core->GetVideoDriver()->SetFullscreenMode(fullscreen);
 	Py_INCREF( Py_None );
 	return Py_None;
 }
diff --git a/gemrb/plugins/SDLVideo/SDLVideo.cpp b/gemrb/plugins/SDLVideo/SDLVideo.cpp
index 870a367..4ff9c50 100644
--- a/gemrb/plugins/SDLVideo/SDLVideo.cpp
+++ b/gemrb/plugins/SDLVideo/SDLVideo.cpp
@@ -144,13 +144,10 @@ void SDLVideoDriver::SetDisplayTitle(char* title, char* icon)
 	SDL_WM_SetCaption( title, icon );
 }
 
-bool SDLVideoDriver::ToggleFullscreenMode(int set_reset)
+bool SDLVideoDriver::SetFullscreenMode(bool set)
 {
-	if (set_reset==-1) {
-		 set_reset=!fullscreen;
-	}
-	if (fullscreen != set_reset) {
-		fullscreen=set_reset;
+	if (fullscreen != set) {
+		fullscreen=set;
 		SDL_WM_ToggleFullScreen( disp );
 		//readjust mouse to original position
 		MoveMouse(CursorPos.x, CursorPos.y);
@@ -269,7 +266,7 @@ int SDLVideoDriver::PollEvents() {
 					break;
 				case SDLK_f:
 					if (modstate & GEM_MOD_CTRL) {
-						ToggleFullscreenMode(-1);
+						ToggleFullscreenMode();
 					}
 					break;
 				default:
@@ -2498,7 +2495,7 @@ int SDLVideoDriver::PollMovieEvents()
 					case SDLK_q:
 						return 1;
 					case SDLK_f:
-						ToggleFullscreenMode(-1);
+						ToggleFullscreenMode();
 						break;
 					default:
 						break;
diff --git a/gemrb/plugins/SDLVideo/SDLVideo.h b/gemrb/plugins/SDLVideo/SDLVideo.h
index e24ad9f..c62355d 100644
--- a/gemrb/plugins/SDLVideo/SDLVideo.h
+++ b/gemrb/plugins/SDLVideo/SDLVideo.h
@@ -55,7 +55,7 @@ public:
 	int Init(void);
 	int CreateDisplay(int width, int height, int bpp, bool fullscreen);
 	void SetDisplayTitle(char* title, char* icon);
-	bool ToggleFullscreenMode(int set_reset=-1);
+	bool SetFullscreenMode(bool set);
 	int SwapBuffers(void);
 	int PollEvents();
 	bool ToggleGrabInput();

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator