diff options
| author | athrxx | 2019-01-26 15:58:47 +0100 |
|---|---|---|
| committer | athrxx | 2019-03-06 20:48:20 +0100 |
| commit | f0a305316c716dfadc332eb8df4c95a5e6e6cdb6 (patch) | |
| tree | 63d337c001a042a8dbaf317fdcbb0c92a1a944d5 /engines/kyra/engine | |
| parent | 77a7f02e9ab60ded0dac5b34228272300a1e80c9 (diff) | |
| download | scummvm-rg350-f0a305316c716dfadc332eb8df4c95a5e6e6cdb6.tar.gz scummvm-rg350-f0a305316c716dfadc332eb8df4c95a5e6e6cdb6.tar.bz2 scummvm-rg350-f0a305316c716dfadc332eb8df4c95a5e6e6cdb6.zip | |
KYRA: (EOB1/Amiga) - add static resources
Diffstat (limited to 'engines/kyra/engine')
| -rw-r--r-- | engines/kyra/engine/eobcommon.cpp | 10 | ||||
| -rw-r--r-- | engines/kyra/engine/eobcommon.h | 1 | ||||
| -rw-r--r-- | engines/kyra/engine/scene_rpg.cpp | 1 |
3 files changed, 8 insertions, 4 deletions
diff --git a/engines/kyra/engine/eobcommon.cpp b/engines/kyra/engine/eobcommon.cpp index 58cc394abd..21677ac697 100644 --- a/engines/kyra/engine/eobcommon.cpp +++ b/engines/kyra/engine/eobcommon.cpp @@ -196,7 +196,7 @@ EoBCoreEngine::EoBCoreEngine(OSystem *system, const GameFlags &flags) _abortStrings = _saveLoadStrings = _mnWord = _mnPrompt = _bookNumbers = 0; _mageSpellList = _clericSpellList = _spellNames = _magicStrings1 = 0; _magicStrings2 = _magicStrings3 = _magicStrings4 = _magicStrings6 = 0; - _magicStrings7 = _magicStrings8 = _saveNamePatterns = 0; + _magicStrings7 = _magicStrings8 = _magicStrings9 = _saveNamePatterns = 0; _spellAnimBuffer = 0; _sparkEffectDefSteps = _sparkEffectDefSubSteps = _sparkEffectDefShift = 0; _sparkEffectDefAdd = _sparkEffectDefX = _sparkEffectDefY = _sparkEffectOfShift = 0; @@ -432,8 +432,12 @@ Common::Error EoBCoreEngine::init() { _debugger = new Debugger_EoB(this); assert(_debugger); - _screen->loadFont(Screen::FID_6_FNT, "FONT6.FNT"); - _screen->loadFont(Screen::FID_8_FNT, "FONT8.FNT"); + if (_flags.platform == Common::kPlatformAmiga) { + + } else { + _screen->loadFont(Screen::FID_6_FNT, "FONT6.FNT"); + _screen->loadFont(Screen::FID_8_FNT, "FONT8.FNT"); + } Common::Error err = KyraRpgEngine::init(); if (err.getCode() != Common::kNoError) diff --git a/engines/kyra/engine/eobcommon.h b/engines/kyra/engine/eobcommon.h index 9078e50409..c56a41b6a1 100644 --- a/engines/kyra/engine/eobcommon.h +++ b/engines/kyra/engine/eobcommon.h @@ -1096,6 +1096,7 @@ protected: const char *const *_magicStrings6; const char *const *_magicStrings7; const char *const *_magicStrings8; + const char *const *_magicStrings9; uint8 *_spellAnimBuffer; diff --git a/engines/kyra/engine/scene_rpg.cpp b/engines/kyra/engine/scene_rpg.cpp index 72922d4b53..0528df6db1 100644 --- a/engines/kyra/engine/scene_rpg.cpp +++ b/engines/kyra/engine/scene_rpg.cpp @@ -87,7 +87,6 @@ void KyraRpgEngine::setLevelShapesDim(int index, int16 &x1, int16 &x2, int dim) x1 += (_sceneXoffset >> 3); x2 += (_sceneXoffset >> 3); - _lvlShapeTop[index] = y1; _lvlShapeBottom[index] = y2; _lvlShapeLeftRight[index << 1] = x1; |