diff options
-rw-r--r-- | backends/platform/ps2/Makefile.ps2 | 2 | ||||
-rw-r--r-- | backends/platform/ps2/systemps2.cpp | 7 | ||||
-rw-r--r-- | backends/platform/ps2/systemps2.h | 4 |
3 files changed, 5 insertions, 8 deletions
diff --git a/backends/platform/ps2/Makefile.ps2 b/backends/platform/ps2/Makefile.ps2 index 5abeae5fb5..1dfa24a39e 100644 --- a/backends/platform/ps2/Makefile.ps2 +++ b/backends/platform/ps2/Makefile.ps2 @@ -1,7 +1,7 @@ # $Header: Exp $ include $(PS2SDK)/Defs.make -PS2_EXTRA = /media/disk/nw8240/extras/scummvm/ports +PS2_EXTRA = /works/devel/ps2/sdk-extra PS2_EXTRA_INCS = /zlib/include /libmad/ee/include /SjPcm/ee/src /tremor PS2_EXTRA_LIBS = /zlib/lib /libmad/ee/lib /SjPcm/ee/lib /tremor/tremor diff --git a/backends/platform/ps2/systemps2.cpp b/backends/platform/ps2/systemps2.cpp index 57a03f777d..a0e7b7d488 100644 --- a/backends/platform/ps2/systemps2.cpp +++ b/backends/platform/ps2/systemps2.cpp @@ -52,7 +52,6 @@ #include "backends/platform/ps2/asyncfio.h" #include "eecodyvdfs.h" #include "graphics/surface.h" -#include "graphics/scaler.h" #include "graphics/font.h" #include "backends/timer/default/default-timer.h" #include "sound/mixer_intern.h" @@ -87,8 +86,6 @@ volatile uint32 msecCount = 0; OSystem_PS2 *g_systemPs2; -int gBitFormat = 1555; - #define FOREVER 2147483647 namespace Graphics { @@ -525,7 +522,7 @@ bool OSystem_PS2::netPresent(void) { return _useNet; } -void OSystem_PS2::initSize(uint width, uint height) { +void OSystem_PS2::initSize(uint width, uint height, const Graphics::PixelFormat *format) { printf("initializing new size: (%d/%d)...", width, height); _screen->newScreenSize(width, height); _screen->setMouseXy(width / 2, height / 2); @@ -624,7 +621,7 @@ void OSystem_PS2::warpMouse(int x, int y) { _screen->setMouseXy(x, y); } -void OSystem_PS2::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor, int cursorTargetScale) { +void OSystem_PS2::setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) { _screen->setMouseOverlay(buf, w, h, hotspot_x, hotspot_y, keycolor); } diff --git a/backends/platform/ps2/systemps2.h b/backends/platform/ps2/systemps2.h index 24cd94f503..3fa7ce733b 100644 --- a/backends/platform/ps2/systemps2.h +++ b/backends/platform/ps2/systemps2.h @@ -58,7 +58,7 @@ class OSystem_PS2 : public BaseBackend { public: OSystem_PS2(const char *elfPath); virtual ~OSystem_PS2(void); - virtual void initSize(uint width, uint height); + virtual void initSize(uint width, uint height, const Graphics::PixelFormat *format); void init(void); @@ -88,7 +88,7 @@ public: virtual bool showMouse(bool visible); virtual void warpMouse(int x, int y); - virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, byte keycolor, int cursorTargetScale = 1); + virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspot_x, int hotspot_y, uint32 keycolor, int cursorTargetScale = 1, const Graphics::PixelFormat *format = 0); virtual uint32 getMillis(); virtual void delayMillis(uint msecs); |