[Scummvm-cvs-logs] SF.net SVN: scummvm:[47769] scummvm/trunk/backends/platform/PalmOS/Src
chrilith at users.sourceforge.net
chrilith at users.sourceforge.net
Sun Jan 31 19:14:21 CET 2010
Revision: 47769
http://scummvm.svn.sourceforge.net/scummvm/?rev=47769&view=rev
Author: chrilith
Date: 2010-01-31 18:14:20 +0000 (Sun, 31 Jan 2010)
Log Message:
-----------
Updated so that code compiles again
Modified Paths:
--------------
scummvm/trunk/backends/platform/PalmOS/Src/base_gfx.cpp
scummvm/trunk/backends/platform/PalmOS/Src/base_mouse.cpp
scummvm/trunk/backends/platform/PalmOS/Src/be_base.h
scummvm/trunk/backends/platform/PalmOS/Src/be_os5.cpp
Modified: scummvm/trunk/backends/platform/PalmOS/Src/base_gfx.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/base_gfx.cpp 2010-01-31 18:14:19 UTC (rev 47768)
+++ scummvm/trunk/backends/platform/PalmOS/Src/base_gfx.cpp 2010-01-31 18:14:20 UTC (rev 47769)
@@ -73,7 +73,7 @@
*
*/
-void OSystem_PalmBase::initSize(uint w, uint h) {
+void OSystem_PalmBase::initSize(uint w, uint h, const Graphics::PixelFormat *format) {
_screenWidth = w;
_screenHeight = h;
Modified: scummvm/trunk/backends/platform/PalmOS/Src/base_mouse.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/base_mouse.cpp 2010-01-31 18:14:19 UTC (rev 47768)
+++ scummvm/trunk/backends/platform/PalmOS/Src/base_mouse.cpp 2010-01-31 18:14:20 UTC (rev 47769)
@@ -42,7 +42,7 @@
return last;
}
-void OSystem_PalmBase::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor, int cursorTargetScale) {
+void OSystem_PalmBase::setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format) {
if (w == 0 || h == 0)
return;
@@ -55,9 +55,12 @@
_mouseCurState.w = w;
_mouseCurState.h = h;
- free(_mouseDataP);
- free(_mouseBackupP);
+ if (_mouseDataP)
+ free(_mouseDataP);
+ if (_mouseBackupP)
+ free(_mouseBackupP);
+
_mouseDataP = (byte *)malloc(w * h);
_mouseBackupP = (byte *)malloc(w * h * 2); // if 16bit = *2
}
Modified: scummvm/trunk/backends/platform/PalmOS/Src/be_base.h
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/be_base.h 2010-01-31 18:14:19 UTC (rev 47768)
+++ scummvm/trunk/backends/platform/PalmOS/Src/be_base.h 2010-01-31 18:14:20 UTC (rev 47769)
@@ -212,7 +212,7 @@
virtual int getDefaultGraphicsMode() const;
virtual bool setGraphicsMode(int mode);
- void initSize(uint w, uint h);
+ void initSize(uint w, uint h, const Graphics::PixelFormat *format);
int16 getWidth() { return _screenWidth; }
int16 getHeight() { return _screenHeight; }
@@ -222,7 +222,7 @@
bool showMouse(bool visible);
void warpMouse(int x, int y);
- void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, byte keycolor, int cursorTargetScale);
+ void setMouseCursor(const byte *buf, uint w, uint h, int hotspotX, int hotspotY, uint32 keycolor, int cursorTargetScale, const Graphics::PixelFormat *format);
virtual void showOverlay() = 0;
virtual void hideOverlay() = 0;
@@ -239,7 +239,8 @@
bool pollEvent(Common::Event &event);
- void getTimeAndDate(TimeDate &t) const;
+
+ void getTimeAndDate(TimeDate& td) const;
virtual uint32 getMillis();
virtual void delayMillis(uint msecs);
Modified: scummvm/trunk/backends/platform/PalmOS/Src/be_os5.cpp
===================================================================
--- scummvm/trunk/backends/platform/PalmOS/Src/be_os5.cpp 2010-01-31 18:14:19 UTC (rev 47768)
+++ scummvm/trunk/backends/platform/PalmOS/Src/be_os5.cpp 2010-01-31 18:14:20 UTC (rev 47769)
@@ -115,10 +115,11 @@
}
void OSystem_PalmOS5::setWindowCaption(const char *caption) {
+/*
FIXME/TODO: Convert caption from ISO Latin 1 to "right" encoding ?
If the output encoding is unclear or conversion impossible,
then one could just skip over any chars > 0x7F and display the rest
-
+*/
Err e;
Char buf[64];
Coord w, y, h = FntLineHeight() + 2;
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