[Scummvm-cvs-logs] CVS: scummvm/backends/sdl events.cpp,1.3,1.4 graphics.cpp,1.4,1.5 sdl-common.h,1.54,1.55

Max Horn fingolfin at users.sourceforge.net
Sun Mar 14 16:55:17 CET 2004


Update of /cvsroot/scummvm/scummvm/backends/sdl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1672/sdl

Modified Files:
	events.cpp graphics.cpp sdl-common.h 
Log Message:
Added OSystem::getDefaultGraphicsMode(); renamed OSystem::get_height() and get_width() to getHeight and getWidth(); augmented some doxygen comments in common/system.h

Index: events.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/events.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- events.cpp	13 Mar 2004 14:59:43 -0000	1.3
+++ events.cpp	15 Mar 2004 00:45:45 -0000	1.4
@@ -192,7 +192,7 @@
 
 			// Alt-Return toggles full screen mode				
 			if (b == KBD_ALT && ev.key.keysym.sym == SDLK_RETURN) {
-				setFeatureState(kFeatureFullscreenMode, !_full_screen);
+				setFullscreenMode(!_full_screen);
 				break;
 			}
 

Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/graphics.cpp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- graphics.cpp	13 Mar 2004 14:19:08 -0000	1.4
+++ graphics.cpp	15 Mar 2004 00:45:45 -0000	1.5
@@ -45,6 +45,10 @@
 	return s_supportedGraphicsModes;
 }
 
+int OSystem_SDL::getDefaultGraphicsMode() const {
+	return GFX_DOUBLESIZE;
+}
+
 bool OSystem_SDL::setGraphicsMode(int mode) {
 	Common::StackLock lock(_graphicsMutex, this);
 
@@ -715,11 +719,11 @@
 	}
 }
 
-int16 OSystem_SDL::get_height() {
+int16 OSystem_SDL::getHeight() {
 	return _screenHeight;
 }
 
-int16 OSystem_SDL::get_width() {
+int16 OSystem_SDL::getWidth() {
 	return _screenWidth;
 }
 

Index: sdl-common.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl-common.h,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- sdl-common.h	13 Mar 2004 14:19:08 -0000	1.54
+++ sdl-common.h	15 Mar 2004 00:45:45 -0000	1.55
@@ -116,8 +116,8 @@
 	virtual void clear_overlay();
 	virtual void grab_overlay(OverlayColor *buf, int pitch);
 	virtual void copy_rect_overlay(const OverlayColor *buf, int pitch, int x, int y, int w, int h);
-	virtual int16 get_height();
-	virtual int16 get_width();
+	virtual int16 getHeight();
+	virtual int16 getWidth();
 
 	// Methods that convert RGB to/from colors suitable for the overlay.
 	virtual OverlayColor RGBToColor(uint8 r, uint8 g, uint8 b);
@@ -125,6 +125,7 @@
 
 
 	virtual const GraphicsMode *getSupportedGraphicsModes() const;
+	virtual int getDefaultGraphicsMode() const;
 	virtual bool setGraphicsMode(int mode);
 	virtual int getGraphicsMode() const;
 	





More information about the Scummvm-git-logs mailing list