[Scummvm-cvs-logs] SF.net SVN: scummvm:[55654] scummvm/trunk/engines/gob
drmccoy at users.sourceforge.net
drmccoy at users.sourceforge.net
Sun Jan 30 14:14:54 CET 2011
Revision: 55654
http://scummvm.svn.sourceforge.net/scummvm/?rev=55654&view=rev
Author: drmccoy
Date: 2011-01-30 13:14:54 +0000 (Sun, 30 Jan 2011)
Log Message:
-----------
GOB: Work around the unimplemented copyFile :P
Modified Paths:
--------------
scummvm/trunk/engines/gob/inter.h
scummvm/trunk/engines/gob/inter_playtoons.cpp
Modified: scummvm/trunk/engines/gob/inter.h
===================================================================
--- scummvm/trunk/engines/gob/inter.h 2011-01-30 13:14:32 UTC (rev 55653)
+++ scummvm/trunk/engines/gob/inter.h 2011-01-30 13:14:54 UTC (rev 55654)
@@ -587,7 +587,7 @@
Common::String getFile(const char *path);
private:
- bool readSprite(const Common::String &file, int32 dataVar, int32 size, int32 offset);
+ bool readSprite(Common::String file, int32 dataVar, int32 size, int32 offset);
};
class Inter_v7 : public Inter_Playtoons {
Modified: scummvm/trunk/engines/gob/inter_playtoons.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_playtoons.cpp 2011-01-30 13:14:32 UTC (rev 55653)
+++ scummvm/trunk/engines/gob/inter_playtoons.cpp 2011-01-30 13:14:54 UTC (rev 55654)
@@ -413,9 +413,13 @@
return path;
}
-bool Inter_Playtoons::readSprite(const Common::String &file, int32 dataVar,
+bool Inter_Playtoons::readSprite(Common::String file, int32 dataVar,
int32 size, int32 offset) {
+ // WORKAROUND: Adibou copies TEMP.CSA to TEMP01.CSA, which isn't yet implemented
+ if (file.equalsIgnoreCase("TEMP01.CSA"))
+ file = "TEMP.CSA";
+
bool palette = false;
if (size < -1000) {
palette = true;
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