diff options
| author | Willem Jan Palenstijn | 2013-04-18 23:35:23 +0200 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2013-05-08 20:40:58 +0200 |
| commit | 9c2341678ef4984bf92b3878295250faf980b066 (patch) | |
| tree | 2fb4805e05e16b9924e80c9947e6bad723b28c4b /engines/kyra/kyra_hof.h | |
| parent | 8172d679df5148a4a32f46074b20cb6caf91844f (diff) | |
| parent | a5f4ff36ffc386d48f2da49387a9655ce9295a4d (diff) | |
| download | scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.gz scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.tar.bz2 scummvm-rg350-9c2341678ef4984bf92b3878295250faf980b066.zip | |
Merge branch 'master'
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; |