diff options
| author | Florian Kagerer | 2009-02-16 17:17:15 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2009-02-16 17:17:15 +0000 |
| commit | a43b0bc2dc0bbad04855adf44b948e88a7a4551e (patch) | |
| tree | c081afd253155c9dc2797bc94b4f35042959b397 /engines/kyra/staticres.cpp | |
| parent | c8a3a05a5d83758582e0b89c4646476c535f84b0 (diff) | |
| download | scummvm-rg350-a43b0bc2dc0bbad04855adf44b948e88a7a4551e.tar.gz scummvm-rg350-a43b0bc2dc0bbad04855adf44b948e88a7a4551e.tar.bz2 scummvm-rg350-a43b0bc2dc0bbad04855adf44b948e88a7a4551e.zip | |
LOL: - more work on the user interface
- fixed non interactive demo
svn-id: r38374
Diffstat (limited to 'engines/kyra/staticres.cpp')
| -rw-r--r-- | engines/kyra/staticres.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/engines/kyra/staticres.cpp b/engines/kyra/staticres.cpp index 68ffa15ad4..e5b67c572a 100644 --- a/engines/kyra/staticres.cpp +++ b/engines/kyra/staticres.cpp @@ -376,7 +376,6 @@ bool StaticResource::init() { { lolMusicTrackMap, kRawData, "MUSIC.MAP" }, { lolIngameGMSfxIndex, kRawData, "SFX_GM.MAP" }, { lolIngameMT32SfxIndex, kRawData, "SFX_MT32.MAP" }, - //{ lolIngameADLSfxIndex, kRawData, "SFX_ADL.MAP" }, { lolSpellProperties, lolSpellData, "SPELLS.DEF" }, { lolGameShapeMap, kRawData, "GAMESHP.MAP" }, { lolLevelShpList, kStringList, "SHPFILES.TXT" }, @@ -1057,6 +1056,9 @@ bool StaticResource::loadCompassData(const char *filename, void *&ptr, int &size bool StaticResource::loadRawDataBe16(const char *filename, void *&ptr, int &size) { Common::SeekableReadStream *file = getFile(filename); + if (!file) + return false; + size = file->size() >> 1; uint16 *r = new uint16[size]; @@ -1072,6 +1074,9 @@ bool StaticResource::loadRawDataBe16(const char *filename, void *&ptr, int &size bool StaticResource::loadButtonDefs(const char *filename, void *&ptr, int &size) { Common::SeekableReadStream *file = getFile(filename); + if (!file) + return false; + size = file->size() / 18; ButtonDef *r = new ButtonDef[size]; @@ -1756,7 +1761,7 @@ void LoLEngine::assignButtonCallback(Button *button, int index) { cb(clickedMagicButton), cb(clickedMagicButton), cb(clickedMagicButton), - cb(clickedUnk9), + cb(clickedMagicSubmenu), cb(clickedScreen), cb(clickedPortraitLeft), cb(clickedPortraitLeft), @@ -2795,10 +2800,6 @@ const int8 KyraEngine_MR::_albumWSAY[] = { // lands of lore static res -void GUI_LoL::initStaticData() { - -} - const ScreenDim Screen_LoL::_screenDimTable[] = { { 0x00, 0x00, 0x28, 0xC8, 0xC7, 0xCF, 0x00, 0x00 }, // Taken from Intro { 0x08, 0x48, 0x18, 0x38, 0xFE, 0x01, 0x00, 0x00 }, |