aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/graphics/portrait.h
diff options
context:
space:
mode:
authorFilippos Karapetis2010-01-11 10:59:52 +0000
committerFilippos Karapetis2010-01-11 10:59:52 +0000
commit51afa7b0b65d484d77c72468f5025735d4828d87 (patch)
tree17f52417e0dd00a40d901ec26eecd0fe284b124d /engines/sci/graphics/portrait.h
parentfc8fc3a664321b4cfce9f311fe9fb955372a74e3 (diff)
downloadscummvm-rg350-51afa7b0b65d484d77c72468f5025735d4828d87.tar.gz
scummvm-rg350-51afa7b0b65d484d77c72468f5025735d4828d87.tar.bz2
scummvm-rg350-51afa7b0b65d484d77c72468f5025735d4828d87.zip
- Set the palette inside doit() again
- Removed a now obsolete TODO - Portrait animations are now stopped when the Esc key is pressed, or when the engine should quit svn-id: r47247
Diffstat (limited to 'engines/sci/graphics/portrait.h')
-rw-r--r--engines/sci/graphics/portrait.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/engines/sci/graphics/portrait.h b/engines/sci/graphics/portrait.h
index 4bcaeb2654..dab009bfa1 100644
--- a/engines/sci/graphics/portrait.h
+++ b/engines/sci/graphics/portrait.h
@@ -44,13 +44,14 @@ public:
void doit(Common::Point position, uint16 resourceId, uint16 noun, uint16 verb, uint16 cond, uint16 seq);
private:
- void init(Common::String resourceName, SciPalette *palette);
+ void init(Common::String resourceName);
void drawBitmap(uint16 bitmapNr);
void bitsShow();
ResourceManager *_resMan;
SciEvent *_event;
SciGui *_gui;
+ SciPalette *_palette;
Screen *_screen;
AudioPlayer *_audio;