diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:37:54 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:46:44 +0200 |
| commit | 02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0 (patch) | |
| tree | 72b64a67ebeca41e9b83593da80850e848a99e2e /engines/agi/loader_v1.cpp | |
| parent | 1539023834a2ad7cf8942711d60983891a10a82a (diff) | |
| parent | 1e200620d673af4acdd2d128ed6e390df001aacf (diff) | |
| download | scummvm-rg350-02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0.tar.gz scummvm-rg350-02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0.tar.bz2 scummvm-rg350-02c5cc75a7cb8885d2a0fa141fbc0e763c5b31a0.zip | |
Merge branch 'master'
Conflicts:
configure
base/plugins.cpp
Diffstat (limited to 'engines/agi/loader_v1.cpp')
| -rw-r--r-- | engines/agi/loader_v1.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/engines/agi/loader_v1.cpp b/engines/agi/loader_v1.cpp index c6a3e66705..189c98ee98 100644 --- a/engines/agi/loader_v1.cpp +++ b/engines/agi/loader_v1.cpp @@ -64,7 +64,7 @@ int AgiLoader_v1::detectGame() { int AgiLoader_v1::loadDir_DDP(AgiDir *agid, int offset, int max) { Common::File fp; - + if (!fp.open(_filenameDisk0)) return errBadFileOpen; @@ -73,13 +73,13 @@ int AgiLoader_v1::loadDir_DDP(AgiDir *agid, int offset, int max) { agid[i].volume = 0xFF; agid[i].offset = _EMPTY; } - + fp.seek(offset, SEEK_SET); for (int i = 0; i <= max; i++) { int b0 = fp.readByte(); int b1 = fp.readByte(); int b2 = fp.readByte(); - + if (b0 == 0xFF && b1 == 0xFF && b2 == 0xFF) { agid[i].volume = 0xFF; agid[i].offset = _EMPTY; @@ -98,7 +98,7 @@ int AgiLoader_v1::loadDir_DDP(AgiDir *agid, int offset, int max) { int AgiLoader_v1::loadDir_BC(AgiDir *agid, int offset, int max) { Common::File fp; - + if (!fp.open(_filenameDisk0)) return errBadFileOpen; @@ -107,13 +107,13 @@ int AgiLoader_v1::loadDir_BC(AgiDir *agid, int offset, int max) { agid[i].volume = 0xFF; agid[i].offset = _EMPTY; } - + fp.seek(offset, SEEK_SET); for (int i = 0; i <= max; i++) { int b0 = fp.readByte(); int b1 = fp.readByte(); int b2 = fp.readByte(); - + if (b0 == 0xFF && b1 == 0xFF && b2 == 0xFF) { agid[i].volume = 0xFF; agid[i].offset = _EMPTY; @@ -171,7 +171,7 @@ uint8 *AgiLoader_v1::loadVolRes(struct AgiDir *agid) { if (offset == _EMPTY) return NULL; - + if (offset > IMAGE_SIZE) { fp.open(_filenameDisk1); offset -= IMAGE_SIZE; @@ -191,7 +191,7 @@ uint8 *AgiLoader_v1::loadVolRes(struct AgiDir *agid) { agid->len = fp.readUint16LE(); data = (uint8 *)calloc(1, agid->len + 32); fp.read(data, agid->len); - + fp.close(); return data; |