diff options
| author | Matthew Hoops | 2012-03-20 14:18:57 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2012-03-20 14:49:16 -0400 |
| commit | 71756bdf4eae5ba9cc3f329b85e894f04640aaef (patch) | |
| tree | 40d464262da107ab5eed82f198685209161ebac1 /engines/kyra/kyra_v2.h | |
| parent | 03eba05b09e5c9e5a351f8111185934b92a3fed3 (diff) | |
| parent | 3c3576a224b92c703b4e8ea20008ac8a069980dd (diff) | |
| download | scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.gz scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.tar.bz2 scummvm-rg350-71756bdf4eae5ba9cc3f329b85e894f04640aaef.zip | |
Merge remote branch 'upstream/master' into pegasus
Diffstat (limited to 'engines/kyra/kyra_v2.h')
| -rw-r--r-- | engines/kyra/kyra_v2.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/kyra_v2.h b/engines/kyra/kyra_v2.h index 56391d151a..563416bf1e 100644 --- a/engines/kyra/kyra_v2.h +++ b/engines/kyra/kyra_v2.h @@ -24,7 +24,7 @@ #define KYRA_KYRA_V2_H #include "kyra/kyra_v1.h" -#include "kyra/gui.h" +#include "kyra/gui_v1.h" #include "kyra/wsamovie.h" #include "kyra/item.h" @@ -38,7 +38,7 @@ struct FrameControl { uint16 delay; }; -struct ItemAnimData_v2 { +struct ItemAnimDefinition { Item itemIndex; uint8 numFrames; const FrameControl *frames; @@ -46,7 +46,7 @@ struct ItemAnimData_v2 { struct ActiveItemAnim { uint16 currentFrame; - uint32 nextFrame; + uint32 nextFrameTime; }; class Screen_v2; @@ -224,7 +224,7 @@ protected: // Sequences EMCData _animationScriptData; EMCState _animationScriptState; - Common::Array<const Opcode*> _opcodesAnimation; + Common::Array<const Opcode *> _opcodesAnimation; void runAnimationScript(const char *filename, int allowSkip, int resetChar, int newShapes, int shapeUnload); |