diff options
author | Norbert Lange | 2009-08-16 16:39:34 +0000 |
---|---|---|
committer | Norbert Lange | 2009-08-16 16:39:34 +0000 |
commit | c96affd0c1e5480fe1a4a3d3e82583c795570d21 (patch) | |
tree | 3f3a71bc02976024345c5c3e44534055d9c9c4cd /engines/kyra/resource.h | |
parent | 2b147c57161cdacf3cdc5bc572ce46160cbd6b5e (diff) | |
parent | ce30a513acdaab2ca5eacd136cc80ade1beabb3a (diff) | |
download | scummvm-rg350-c96affd0c1e5480fe1a4a3d3e82583c795570d21.tar.gz scummvm-rg350-c96affd0c1e5480fe1a4a3d3e82583c795570d21.tar.bz2 scummvm-rg350-c96affd0c1e5480fe1a4a3d3e82583c795570d21.zip |
merge with trunk
svn-id: r43443
Diffstat (limited to 'engines/kyra/resource.h')
-rw-r--r-- | engines/kyra/resource.h | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/engines/kyra/resource.h b/engines/kyra/resource.h index 07fb2e05b7..3dc6c5ff2f 100644 --- a/engines/kyra/resource.h +++ b/engines/kyra/resource.h @@ -282,16 +282,18 @@ enum kKyraResources { kLolButtonList7, kLolButtonList8, - lolLegendData, - lolMapCursorOvl, - lolMapStringId, - //lolMapPal, - - lolSpellbookAnim, - lolSpellbookCoords, - lolHealShapeFrames, - lolLightningDefs, - lolFireballCoords, + kLolLegendData, + kLolMapCursorOvl, + kLolMapStringId, + //kLolMapPal, + + kLolSpellbookAnim, + kLolSpellbookCoords, + kLolHealShapeFrames, + kLolLightningDefs, + kLolFireballCoords, + + kLolHistory, #endif // ENABLE_LOL kMaxResIDs |