diff options
| author | Sven Hesse | 2011-01-30 13:14:54 +0000 |
|---|---|---|
| committer | Sven Hesse | 2011-01-30 13:14:54 +0000 |
| commit | f8d61c9e55c4ec569a8709313d3a6aee64469f67 (patch) | |
| tree | bdbd2974a69403850789d6b51285e2ddcc0d86f6 /engines/gob | |
| parent | c88ee19478a84334dc1703212ea306ec7bc9dc1b (diff) | |
| download | scummvm-rg350-f8d61c9e55c4ec569a8709313d3a6aee64469f67.tar.gz scummvm-rg350-f8d61c9e55c4ec569a8709313d3a6aee64469f67.tar.bz2 scummvm-rg350-f8d61c9e55c4ec569a8709313d3a6aee64469f67.zip | |
GOB: Work around the unimplemented copyFile :P
svn-id: r55654
Diffstat (limited to 'engines/gob')
| -rw-r--r-- | engines/gob/inter.h | 2 | ||||
| -rw-r--r-- | engines/gob/inter_playtoons.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/engines/gob/inter.h b/engines/gob/inter.h index 4557d83437..a277e33b26 100644 --- a/engines/gob/inter.h +++ b/engines/gob/inter.h @@ -587,7 +587,7 @@ protected: 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 { diff --git a/engines/gob/inter_playtoons.cpp b/engines/gob/inter_playtoons.cpp index 06153b2dee..7c02df1f89 100644 --- a/engines/gob/inter_playtoons.cpp +++ b/engines/gob/inter_playtoons.cpp @@ -413,9 +413,13 @@ Common::String Inter_Playtoons::getFile(const char *path) { 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; |