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_hof.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_hof.h')
| -rw-r--r-- | engines/kyra/kyra_hof.h | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/engines/kyra/kyra_hof.h b/engines/kyra/kyra_hof.h index 916cac0c9d..182854cdf1 100644 --- a/engines/kyra/kyra_hof.h +++ b/engines/kyra/kyra_hof.h @@ -95,18 +95,18 @@ enum NestedSequencesDemo { }; #ifdef ENABLE_LOL -enum SequencesLolDemo { - kSequenceLolDemoScene1 = 0, - kSequenceLolDemoText1, - kSequenceLolDemoScene2, - kSequenceLolDemoText2, - kSequenceLolDemoScene3, - kSequenceLolDemoText3, - kSequenceLolDemoScene4, - kSequenceLolDemoText4, - kSequenceLolDemoScene5, - kSequenceLolDemoText5, - kSequenceLolDemoScene6 +enum SequencesLoLDemo { + kSequenceLoLDemoScene1 = 0, + kSequenceLoLDemoText1, + kSequenceLoLDemoScene2, + kSequenceLoLDemoText2, + kSequenceLoLDemoScene3, + kSequenceLoLDemoText3, + kSequenceLoLDemoScene4, + kSequenceLoLDemoText4, + kSequenceLoLDemoScene5, + kSequenceLoLDemoText5, + kSequenceLoLDemoScene6 }; #endif // ENABLE_LOL @@ -874,8 +874,8 @@ protected: const char * const *_ingameTimJpStr; int _ingameTimJpStrSize; const HofSeqData *_sequences; - const ItemAnimData_v2 *_itemAnimData; - int _itemAnimDataSize; + const ItemAnimDefinition *_itemAnimDefinition; + int _itemAnimDefinitionSize; const ItemAnimData_v1 *_demoAnimData; int _demoAnimSize; |