[Scummvm-cvs-logs] SF.net SVN: scummvm: [26697] scummvm/trunk/engines/cruise

chrilith at users.sourceforge.net chrilith at users.sourceforge.net
Tue May 1 11:53:28 CEST 2007


Revision: 26697
          http://scummvm.svn.sourceforge.net/scummvm/?rev=26697&view=rev
Author:   chrilith
Date:     2007-05-01 02:53:27 -0700 (Tue, 01 May 2007)

Log Message:
-----------
Fixed PalmOS ARM global object allocation

Modified Paths:
--------------
    scummvm/trunk/engines/cruise/cruise.cpp
    scummvm/trunk/engines/cruise/vars.cpp
    scummvm/trunk/engines/cruise/vars.h

Modified: scummvm/trunk/engines/cruise/cruise.cpp
===================================================================
--- scummvm/trunk/engines/cruise/cruise.cpp	2007-05-01 09:51:53 UTC (rev 26696)
+++ scummvm/trunk/engines/cruise/cruise.cpp	2007-05-01 09:53:27 UTC (rev 26697)
@@ -45,6 +45,11 @@
 CruiseEngine *g_cruise;
 
 CruiseEngine::CruiseEngine(OSystem * syst) : Engine(syst) {
+
+#ifdef PALMOS_MODE
+	_currentVolumeFile = new Common::File();
+#endif
+
 	Common::addSpecialDebugLevel(kCruiseDebugScript, "Script",
 	    "Script debug level");
 
@@ -62,6 +67,9 @@
 }
 
 CruiseEngine::~CruiseEngine() {
+#ifdef PALMOS_MODE
+	delete _currentVolumeFile;
+#endif
 }
 
 int CruiseEngine::init() {

Modified: scummvm/trunk/engines/cruise/vars.cpp
===================================================================
--- scummvm/trunk/engines/cruise/vars.cpp	2007-05-01 09:51:53 UTC (rev 26696)
+++ scummvm/trunk/engines/cruise/vars.cpp	2007-05-01 09:53:27 UTC (rev 26697)
@@ -64,7 +64,11 @@
 
 int16 currentDiskNumber = 1;
 
+#ifdef PALMOS_MODE
+Common::File *_currentVolumeFile;
+#else
 Common::File currentVolumeFile;
+#endif
 
 int16 currentCursor;
 

Modified: scummvm/trunk/engines/cruise/vars.h
===================================================================
--- scummvm/trunk/engines/cruise/vars.h	2007-05-01 09:51:53 UTC (rev 26696)
+++ scummvm/trunk/engines/cruise/vars.h	2007-05-01 09:53:27 UTC (rev 26697)
@@ -190,7 +190,12 @@
 
 extern int16 currentDiskNumber;
 
+#ifdef PALMOS_MODE
+extern Common::File *_currentVolumeFile;
+#define currentVolumeFile	(*_currentVolumeFile)
+#else
 extern Common::File currentVolumeFile;
+#endif
 
 extern int16 currentCursor;
 


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