thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ALL: unify setupScreen() arguments type

Browse source
This commit is contained in:
Pawel Kolodziejski 2014-07-19 19:42:01 +02:00
parent 230fb47de4
commit c14d0ad8dc
8 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/graphics/graphics.h
View file

@ -59,7 +59,7 @@ public:
// ResidualVM specific method // ResidualVM specific method
virtual void launcherInitSize(uint w, uint h) = 0; virtual void launcherInitSize(uint w, uint h) = 0;
// ResidualVM specific method // ResidualVM specific method
virtual Graphics::PixelBuffer setupScreen(int screenW, int screenH, bool fullscreen, bool accel3d) = 0; virtual Graphics::PixelBuffer setupScreen(uint screenW, uint screenH, bool fullscreen, bool accel3d) = 0;
virtual int16 getHeight() = 0; virtual int16 getHeight() = 0;
virtual int16 getWidth() = 0; virtual int16 getWidth() = 0;

2
backends/graphics/surfacesdl/surfacesdl-graphics.cpp
View file

@ -160,7 +160,7 @@ void SurfaceSdlGraphicsManager::launcherInitSize(uint w, uint h) {
setupScreen(w, h, false, false); setupScreen(w, h, false, false);
} }
Graphics::PixelBuffer SurfaceSdlGraphicsManager::setupScreen(int screenW, int screenH, bool fullscreen, bool accel3d) { Graphics::PixelBuffer SurfaceSdlGraphicsManager::setupScreen(uint screenW, uint screenH, bool fullscreen, bool accel3d) {
uint32 sdlflags; uint32 sdlflags;
int bpp; int bpp;

2
backends/graphics/surfacesdl/surfacesdl-graphics.h
View file

@ -74,7 +74,7 @@ public:
#endif #endif
virtual void initSize(uint w, uint h, const Graphics::PixelFormat *format = NULL); virtual void initSize(uint w, uint h, const Graphics::PixelFormat *format = NULL);
virtual void launcherInitSize(uint w, uint h); // ResidualVM specific method virtual void launcherInitSize(uint w, uint h); // ResidualVM specific method
Graphics::PixelBuffer setupScreen(int screenW, int screenH, bool fullscreen, bool accel3d); // ResidualVM specific method Graphics::PixelBuffer setupScreen(uint screenW, uint screenH, bool fullscreen, bool accel3d); // ResidualVM specific method
virtual int getScreenChangeID() const { return _screenChangeCount; } virtual int getScreenChangeID() const { return _screenChangeCount; }
virtual void beginGFXTransaction(); virtual void beginGFXTransaction();

2
backends/modular-backend.cpp
View file

@ -104,7 +104,7 @@ void ModularBackend::launcherInitSize(uint w, uint h) {
} }
// ResidualVM specific method // ResidualVM specific method
Graphics::PixelBuffer ModularBackend::setupScreen(int screenW, int screenH, bool fullscreen, bool accel3d) { Graphics::PixelBuffer ModularBackend::setupScreen(uint screenW, uint screenH, bool fullscreen, bool accel3d) {
return _graphicsManager->setupScreen(screenW, screenH, fullscreen, accel3d); return _graphicsManager->setupScreen(screenW, screenH, fullscreen, accel3d);
} }

2
backends/modular-backend.h
View file

@ -73,7 +73,7 @@ public:
#endif #endif
virtual void initSize(uint width, uint height, const Graphics::PixelFormat *format = NULL); virtual void initSize(uint width, uint height, const Graphics::PixelFormat *format = NULL);
virtual void launcherInitSize(uint w, uint h); // ResidualVM specific method virtual void launcherInitSize(uint w, uint h); // ResidualVM specific method
virtual Graphics::PixelBuffer setupScreen(int screenW, int screenH, bool fullscreen, bool accel3d); // ResidualVM specific method virtual Graphics::PixelBuffer setupScreen(uint screenW, uint screenH, bool fullscreen, bool accel3d); // ResidualVM specific method
virtual int getScreenChangeID() const; virtual int getScreenChangeID() const;
virtual void beginGFXTransaction(); virtual void beginGFXTransaction();

4
backends/platform/android/android.h
View file

@ -303,10 +303,10 @@ public:
// ResidualVM specific method // ResidualVM specific method
virtual void launcherInitSize(uint w, uint h); virtual void launcherInitSize(uint w, uint h);
bool lockMouse(bool lock); bool lockMouse(bool lock);
Graphics::PixelBuffer setupScreen(int screenW, int screenH, bool fullscreen, bool accel3d) { Graphics::PixelBuffer setupScreen(uint screenW, uint screenH, bool fullscreen, bool accel3d) {
return setupScreen(screenW, screenH, fullscreen, accel3d, true); return setupScreen(screenW, screenH, fullscreen, accel3d, true);
} }
Graphics::PixelBuffer setupScreen(int screenW, int screenH, bool fullscreen, bool accel3d, bool isGame); Graphics::PixelBuffer setupScreen(uint screenW, uint screenH, bool fullscreen, bool accel3d, bool isGame);
}; };
#endif #endif

2
backends/platform/android/gfx.cpp
View file

@ -457,7 +457,7 @@ void OSystem_Android::copyRectToScreen(const void *buf, int pitch,
// ResidualVM specific method // ResidualVM specific method
Graphics::PixelBuffer OSystem_Android::setupScreen(int screenW, int screenH, bool fullscreen, bool accel3d, bool isGame) { Graphics::PixelBuffer OSystem_Android::setupScreen(uint screenW, uint screenH, bool fullscreen, bool accel3d, bool isGame) {
_opengl = accel3d; _opengl = accel3d;
initViewport(); initViewport();

2
common/system.h
View file

@ -664,7 +664,7 @@ public:
* @param fullscreen the new screen will be displayed in fullscreeen mode * @param fullscreen the new screen will be displayed in fullscreeen mode
*/ */
virtual Graphics::PixelBuffer setupScreen(int screenW, int screenH, bool fullscreen, bool accel3d) = 0; virtual Graphics::PixelBuffer setupScreen(uint screenW, uint screenH, bool fullscreen, bool accel3d) = 0;
/** /**
* Returns the currently set virtual screen height. * Returns the currently set virtual screen height.