diff options
| author | Paul Gilbert | 2016-09-04 22:37:42 -0400 |
|---|---|---|
| committer | Paul Gilbert | 2016-09-04 22:37:42 -0400 |
| commit | a520a18a0101877d11cd488c5b6f93f5b63892af (patch) | |
| tree | 313c4ea255af7aea06a66e68804e138a18c03c6a /engines | |
| parent | 1a99d8ee8d25701ad991a67d65e68d1f3d1c7f86 (diff) | |
| download | scummvm-rg350-a520a18a0101877d11cd488c5b6f93f5b63892af.tar.gz scummvm-rg350-a520a18a0101877d11cd488c5b6f93f5b63892af.tar.bz2 scummvm-rg350-a520a18a0101877d11cd488c5b6f93f5b63892af.zip | |
XEEN: Further fix identified warnings
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/xeen/dialogs_spells.cpp | 4 | ||||
| -rw-r--r-- | engines/xeen/screen.cpp | 8 |
2 files changed, 6 insertions, 6 deletions
diff --git a/engines/xeen/dialogs_spells.cpp b/engines/xeen/dialogs_spells.cpp index e5d8cd0f9a..e7bbbf5cbf 100644 --- a/engines/xeen/dialogs_spells.cpp +++ b/engines/xeen/dialogs_spells.cpp @@ -224,10 +224,10 @@ Character *SpellsDialog::execute(ButtonContainer *priorDialog, Character *c, int break; } - warning("TODO: category -> SPELLS_ALLOWED category value"); - int spellId = _spells[newSelection]._spellId; int spellIndex = _spells[newSelection]._spellIndex; + int spellId = SPELLS_ALLOWED[category][spellIndex]; int spellCost = spells.calcSpellCost(spellId, expenseFactor); + if (isCasting) { selection = newSelection; } else { diff --git a/engines/xeen/screen.cpp b/engines/xeen/screen.cpp index e1e7b50a56..03b751a6b9 100644 --- a/engines/xeen/screen.cpp +++ b/engines/xeen/screen.cpp @@ -29,11 +29,11 @@ namespace Xeen { -Window::Window() : _vm(nullptr), _enabled(false), _a(0), _border(0), - _xLo(0), _xHi(0), _ycL(0), _ycH(0) { +Window::Window() : XSurface(), _vm(nullptr), _enabled(false), + _a(0), _border(0), _xLo(0), _xHi(0), _ycL(0), _ycH(0) { } -Window::Window(const Window &src) : _vm(src._vm), _enabled(src._enabled), +Window::Window(const Window &src) : XSurface(), _vm(src._vm), _enabled(src._enabled), _a(src._a), _border(src._border), _xLo(src._xLo), _ycL(src._ycL), _xHi(src._xHi), _ycH(src._ycH) { if (src._vm) { @@ -43,7 +43,7 @@ Window::Window(const Window &src) : _vm(src._vm), _enabled(src._enabled), } Window::Window(XeenEngine *vm, const Common::Rect &bounds, int a, int border, - int xLo, int ycL, int xHi, int ycH): + int xLo, int ycL, int xHi, int ycH): XSurface(), _vm(vm), _enabled(false), _a(a), _border(border), _xLo(xLo), _ycL(ycL), _xHi(xHi), _ycH(ycH) { setBounds(bounds); |