[Scummvm-cvs-logs] SF.net SVN: scummvm:[44410] scummvm/trunk/backends/platform/ds/arm9/source
dhewg at users.sourceforge.net
dhewg at users.sourceforge.net
Sun Sep 27 18:06:07 CEST 2009
Revision: 44410
http://scummvm.svn.sourceforge.net/scummvm/?rev=44410&view=rev
Author: dhewg
Date: 2009-09-27 16:06:06 +0000 (Sun, 27 Sep 2009)
Log Message:
-----------
Fixed compilation of the NDS port.
Modified Paths:
--------------
scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp
scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h
Modified: scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp 2009-09-27 15:44:02 UTC (rev 44409)
+++ scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.cpp 2009-09-27 16:06:06 UTC (rev 44410)
@@ -124,7 +124,7 @@
return -1;
}
-void OSystem_DS::initSize(uint width, uint height) {
+void OSystem_DS::initSize(uint width, uint height, const Graphics::PixelFormat *format) {
// For Lost in Time, the title screen is displayed in 640x400.
// In order to support this game, the screen mode is set, but
// all draw calls are ignored until the game switches to 320x200.
@@ -489,7 +489,7 @@
void OSystem_DS::warpMouse(int x, int y) {
}
-void OSystem_DS::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor, int targetCursorScale) {
+void OSystem_DS::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, u32 keycolor, int targetCursorScale, const Graphics::PixelFormat *format) {
if ((w > 0) && (w < 64) && (h > 0) && (h < 64)) {
memcpy(_cursorImage, buf, w * h);
_cursorW = w;
Modified: scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h
===================================================================
--- scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h 2009-09-27 15:44:02 UTC (rev 44409)
+++ scummvm/trunk/backends/platform/ds/arm9/source/osystem_ds.h 2009-09-27 16:06:06 UTC (rev 44410)
@@ -88,7 +88,7 @@
virtual bool setGraphicsMode(int mode);
bool setGraphicsMode(const char *name);
virtual int getGraphicsMode() const;
- virtual void initSize(uint width, uint height);
+ virtual void initSize(uint width, uint height, const Graphics::PixelFormat *format);
virtual int16 getHeight();
virtual int16 getWidth();
virtual void setPalette(const byte *colors, uint start, uint num);
@@ -111,7 +111,7 @@
virtual bool showMouse(bool visible);
virtual void warpMouse(int x, int y);
- virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor = 255, int targetCursorScale = 1);
+ virtual void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, u32 keycolor, int targetCursorScale, const Graphics::PixelFormat *format);
virtual bool pollEvent(Common::Event &event);
virtual uint32 getMillis();
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list