aboutsummaryrefslogtreecommitdiff
path: root/backends/platform/ps2/Gs2dScreen.h
diff options
context:
space:
mode:
authorD G Turner2012-11-27 03:55:06 +0000
committerD G Turner2012-11-27 03:55:06 +0000
commit6d4b0a2c9f422d4c3fd51e7c68644c16ddd805d4 (patch)
treec946f3b5d5a35515c9deb720e14e451e589f1eb1 /backends/platform/ps2/Gs2dScreen.h
parentcf87fcba858cb5e989c8a0ee12f5fc1912502cff (diff)
downloadscummvm-rg350-6d4b0a2c9f422d4c3fd51e7c68644c16ddd805d4.tar.gz
scummvm-rg350-6d4b0a2c9f422d4c3fd51e7c68644c16ddd805d4.tar.bz2
scummvm-rg350-6d4b0a2c9f422d4c3fd51e7c68644c16ddd805d4.zip
PS2: Fix three compiler warnings and minor code formatting fixes.
Diffstat (limited to 'backends/platform/ps2/Gs2dScreen.h')
-rw-r--r--backends/platform/ps2/Gs2dScreen.h27
1 files changed, 12 insertions, 15 deletions
diff --git a/backends/platform/ps2/Gs2dScreen.h b/backends/platform/ps2/Gs2dScreen.h
index 005dabc809..1a70dad170 100644
--- a/backends/platform/ps2/Gs2dScreen.h
+++ b/backends/platform/ps2/Gs2dScreen.h
@@ -29,7 +29,6 @@
#include "backends/platform/ps2/DmaPipe.h"
#include "graphics/surface.h"
-
enum TVMode {
TV_DONT_CARE = 0,
TV_PAL,
@@ -41,10 +40,9 @@ enum GsInterlace {
GS_INTERLACED
};
-
class Gs2dScreen {
public:
- Gs2dScreen(uint16 width, uint16 height, TVMode tvMode);
+ Gs2dScreen(uint16 width, uint16 height, TVMode mode);
~Gs2dScreen(void);
void newScreenSize(uint16 width, uint16 height);
uint8 tvMode(void);
@@ -94,27 +92,26 @@ private:
uint8 _curDrawBuf;
uint32 _frameBufPtr[2]; //
- uint32 _clutPtrs[3]; // vram pointers
+ uint32 _clutPtrs[3]; // vram pointers
uint32 _texPtrs[4]; //
Graphics::Surface _framebuffer;
- /* TODO : check if we do need this */
- struct VideoState {
- bool setup;
+ // TODO : check if we do need this
+ struct VideoState {
+ bool setup;
- bool fullscreen;
- bool aspectRatio;
+ bool fullscreen;
+ bool aspectRatio;
- int mode;
- int scaleFactor;
+ int mode;
+ int scaleFactor;
- int screenWidth, screenHeight;
- int overlayWidth, overlayHeight;
- };
+ int screenWidth, screenHeight;
+ int overlayWidth, overlayHeight;
+ };
VideoState _videoMode;
- /* */
uint16 _width, _height, _pitch;
int16 _mouseX, _mouseY, _hotSpotX, _hotSpotY;