[Scummvm-cvs-logs] SF.net SVN: scummvm: [25684] scummvm/trunk/engines/cine
chrilith at users.sourceforge.net
chrilith at users.sourceforge.net
Sun Feb 18 13:21:26 CET 2007
Revision: 25684
http://scummvm.svn.sourceforge.net/scummvm/?rev=25684&view=rev
Author: chrilith
Date: 2007-02-18 04:21:25 -0800 (Sun, 18 Feb 2007)
Log Message:
-----------
Bad hack to make this engine works on PalmOS (compiler still seems to hate some global objects)
Modified Paths:
--------------
scummvm/trunk/engines/cine/cine.cpp
scummvm/trunk/engines/cine/pal.cpp
scummvm/trunk/engines/cine/various.cpp
scummvm/trunk/engines/cine/various.h
Modified: scummvm/trunk/engines/cine/cine.cpp
===================================================================
--- scummvm/trunk/engines/cine/cine.cpp 2007-02-18 11:48:10 UTC (rev 25683)
+++ scummvm/trunk/engines/cine/cine.cpp 2007-02-18 12:21:25 UTC (rev 25684)
@@ -71,6 +71,12 @@
freePoldatDat();
freeErrmessDat();
}
+
+ if (palFileHandleP);
+ delete palFileHandleP;
+
+ if (partFileHandleP);
+ delete partFileHandleP;
}
int CineEngine::init() {
@@ -79,6 +85,9 @@
GUIErrorMessage("No valid games were found in the specified directory.");
return -1;
}
+
+ palFileHandleP = new Common::File();
+ partFileHandleP = new Common::File();
// Initialize backend
_system->beginGFXTransaction();
Modified: scummvm/trunk/engines/cine/pal.cpp
===================================================================
--- scummvm/trunk/engines/cine/pal.cpp 2007-02-18 11:48:10 UTC (rev 25683)
+++ scummvm/trunk/engines/cine/pal.cpp 2007-02-18 12:21:25 UTC (rev 25684)
@@ -34,7 +34,7 @@
uint16 palEntriesCount;
-Common::File palFileHandle;
+Common::File *palFileHandleP = NULL;
PalEntry *palPtr;
Modified: scummvm/trunk/engines/cine/various.cpp
===================================================================
--- scummvm/trunk/engines/cine/various.cpp 2007-02-18 11:48:10 UTC (rev 25683)
+++ scummvm/trunk/engines/cine/various.cpp 2007-02-18 12:21:25 UTC (rev 25684)
@@ -60,7 +60,7 @@
gfxFlipRawPage(frontBuffer);
}
-Common::File partFileHandle;
+Common::File *partFileHandleP = NULL;
void waitPlayerInput(void) {
}
Modified: scummvm/trunk/engines/cine/various.h
===================================================================
--- scummvm/trunk/engines/cine/various.h 2007-02-18 11:48:10 UTC (rev 25683)
+++ scummvm/trunk/engines/cine/various.h 2007-02-18 12:21:25 UTC (rev 25684)
@@ -79,9 +79,13 @@
extern uint16 var4;
extern uint16 var5;
-extern Common::File palFileHandle;
-extern Common::File partFileHandle;
+extern Common::File *palFileHandleP;
+extern Common::File *partFileHandleP;
+#define palFileHandle (*palFileHandleP)
+#define partFileHandle (*partFileHandleP)
+
+
void freeAnimDataTable(void);
void mainLoopSub1(void);
void setTextWindow(uint16 param1, uint16 param2, uint16 param3, uint16 param4);
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