aboutsummaryrefslogtreecommitdiff
path: root/scumm/akos.cpp
diff options
context:
space:
mode:
authorMax Horn2003-01-06 13:41:29 +0000
committerMax Horn2003-01-06 13:41:29 +0000
commit37a64f5d12e0343347cffa57b7e1bbd00ec60db0 (patch)
tree1aece16d09acafb47237d3a759a48850e2aa857a /scumm/akos.cpp
parentf1d1076fd7aef2a17b37ecae1708a89e80686a86 (diff)
downloadscummvm-rg350-37a64f5d12e0343347cffa57b7e1bbd00ec60db0.tar.gz
scummvm-rg350-37a64f5d12e0343347cffa57b7e1bbd00ec60db0.tar.bz2
scummvm-rg350-37a64f5d12e0343347cffa57b7e1bbd00ec60db0.zip
cleanup; added a hack to avoid crash in the canon scene (at least it works this way for me)
svn-id: r6347
Diffstat (limited to 'scumm/akos.cpp')
-rw-r--r--scumm/akos.cpp15
1 files changed, 6 insertions, 9 deletions
diff --git a/scumm/akos.cpp b/scumm/akos.cpp
index 41d80853cf..76ebab7881 100644
--- a/scumm/akos.cpp
+++ b/scumm/akos.cpp
@@ -70,17 +70,14 @@ enum AkosOpcodes {
bool Scumm::akos_hasManyDirections(Actor *a)
{
- if (_features & GF_NEW_COSTUMES) {
- byte *akos;
- AkosHeader *akhd;
+ byte *akos;
+ AkosHeader *akhd;
- akos = getResourceAddress(rtCostume, a->costume);
- assert(akos);
+ akos = getResourceAddress(rtCostume, a->costume);
+ assert(akos);
- akhd = (AkosHeader *) findResourceData(MKID('AKHD'), akos);
- return (akhd->flags & 2) != 0;
- }
- return 0;
+ akhd = (AkosHeader *) findResourceData(MKID('AKHD'), akos);
+ return (akhd->flags & 2) != 0;
}
int Scumm::akos_frameToAnim(Actor *a, int frame)