diff options
| author | Nicola Mettifogo | 2007-03-18 10:34:41 +0000 |
|---|---|---|
| committer | Nicola Mettifogo | 2007-03-18 10:34:41 +0000 |
| commit | 13385a5f2d22870417ec07334ae0836d4fac12a7 (patch) | |
| tree | 183422444908f05171ead2c81c74ce84819a4d01 /engines/parallaction/disk.cpp | |
| parent | 8f74bc15aef1c56b29d21bf3aa7e8e51687b98ae (diff) | |
| download | scummvm-rg350-13385a5f2d22870417ec07334ae0836d4fac12a7.tar.gz scummvm-rg350-13385a5f2d22870417ec07334ae0836d4fac12a7.tar.bz2 scummvm-rg350-13385a5f2d22870417ec07334ae0836d4fac12a7.zip | |
Made loadObjects return a new Cnv instead of accepting a parameter.
svn-id: r26202
Diffstat (limited to 'engines/parallaction/disk.cpp')
| -rw-r--r-- | engines/parallaction/disk.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/parallaction/disk.cpp b/engines/parallaction/disk.cpp index 863eaada18..8e2c2dd8a2 100644 --- a/engines/parallaction/disk.cpp +++ b/engines/parallaction/disk.cpp @@ -322,7 +322,7 @@ void Disk::loadFont(const char* name, Cnv* cnv) { // loads character's icons set -void Disk::loadObjects(const char *name, Cnv* cnv) { +Cnv* Disk::loadObjects(const char *name) { if (IS_MINI_CHARACTER(name)) { name += 4; @@ -331,9 +331,9 @@ void Disk::loadObjects(const char *name, Cnv* cnv) { char path[PATH_LEN]; sprintf(path, "%sobj", name); + Cnv* cnv = new Cnv; loadExternalCnv(path, cnv); - - return; + return cnv; } |