aboutsummaryrefslogtreecommitdiff
path: root/sky/compact.cpp
diff options
context:
space:
mode:
authorRobert Göffringmann2005-02-20 18:33:36 +0000
committerRobert Göffringmann2005-02-20 18:33:36 +0000
commitc81fa31a5cce9e6f153ed378b2efebce6390cd2a (patch)
treefbc84e3f3d8977873bbde7b320173b89437152ca /sky/compact.cpp
parent807b33ec29797006dd13e4627102166344cc8901 (diff)
downloadscummvm-rg350-c81fa31a5cce9e6f153ed378b2efebce6390cd2a.tar.gz
scummvm-rg350-c81fa31a5cce9e6f153ed378b2efebce6390cd2a.tar.bz2
scummvm-rg350-c81fa31a5cce9e6f153ed378b2efebce6390cd2a.zip
fix missing speech animations. I introduced that bug when I moved the compacts out of the scummvm executable.
svn-id: r16828
Diffstat (limited to 'sky/compact.cpp')
-rw-r--r--sky/compact.cpp5
1 files changed, 2 insertions, 3 deletions
diff --git a/sky/compact.cpp b/sky/compact.cpp
index 199e2a5462..de9b5c7b3b 100644
--- a/sky/compact.cpp
+++ b/sky/compact.cpp
@@ -288,10 +288,9 @@ uint16 *SkyCompact::getSub(Compact *cpt, uint16 mode) {
uint16 *SkyCompact::getGrafixPtr(Compact *cpt) {
uint16 *gfxBase = (uint16*)fetchCpt(cpt->grafixProgId);
- if ((gfxBase == NULL) && cpt->grafixProgPos) {
- debug(1, "SkyCompact::getGrafixPtr: got offset for null ptr");
+ if (gfxBase == NULL)
return NULL;
- }
+
return gfxBase + cpt->grafixProgPos;
}