diff options
| author | Nicola Mettifogo | 2007-03-04 12:55:25 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-03-04 12:55:25 +0000 |
| commit | 826b16ef714a228c8908b0f312cf342ee1216dfd (patch) | |
| tree | d4156e7c6344db301f36f204cfd7d6b0de67405c /engines/parallaction/disk.cpp | |
| parent | 61fe32066bd76ae284fe55c0db1b91cade40f427 (diff) | |
| download | scummvm-rg350-826b16ef714a228c8908b0f312cf342ee1216dfd.tar.gz scummvm-rg350-826b16ef714a228c8908b0f312cf342ee1216dfd.tar.bz2 scummvm-rg350-826b16ef714a228c8908b0f312cf342ee1216dfd.zip | |
no more overloading for loadBackground
svn-id: r25971
Diffstat (limited to 'engines/parallaction/disk.cpp')
| -rw-r--r-- | engines/parallaction/disk.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/engines/parallaction/disk.cpp b/engines/parallaction/disk.cpp index 317f8932da..10d2d197b1 100644 --- a/engines/parallaction/disk.cpp +++ b/engines/parallaction/disk.cpp @@ -420,22 +420,16 @@ void loadSlide(const char *filename) { loadBackground(path); } -void loadScenery(const char *filename) { +void loadScenery(const char *name, const char *mask) { char path[PATH_LEN]; - sprintf(path, "%s.dyn", filename); + sprintf(path, "%s.dyn", name); loadBackground(path); -} - -void loadBackground(const char* background, const char* mask) { - loadScenery(background); - - if (scumm_stricmp(background, mask)) { + if (mask != NULL) { // load external masks and paths only for certain locations loadMaskAndPath(mask); } } - } // namespace Parallaction |