diff options
| author | Eugene Sandulenko | 2005-10-04 23:38:19 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2005-10-04 23:38:19 +0000 |
| commit | 62a9b56577bd015328d9b185f9a7a9450eb22147 (patch) | |
| tree | 156240422190f6814328413b1860879093246d64 /saga/interface.cpp | |
| parent | 0719a4e6c27a10af41303aa961812b3dde333045 (diff) | |
| download | scummvm-rg350-62a9b56577bd015328d9b185f9a7a9450eb22147.tar.gz scummvm-rg350-62a9b56577bd015328d9b185f9a7a9450eb22147.tar.bz2 scummvm-rg350-62a9b56577bd015328d9b185f9a7a9450eb22147.zip | |
IHNM changes:
o Latest bit of Game Object structure
o Implemented spiritual barometer
o Fixed Ethics points data type
o Implemented sf74 and sf104
svn-id: r18933
Diffstat (limited to 'saga/interface.cpp')
| -rw-r--r-- | saga/interface.cpp | 16 |
1 files changed, 11 insertions, 5 deletions
diff --git a/saga/interface.cpp b/saga/interface.cpp index 63cf221f23..048ec8da99 100644 --- a/saga/interface.cpp +++ b/saga/interface.cpp @@ -202,6 +202,8 @@ Interface::Interface(SagaEngine *vm) : _vm(vm) { _textInput = false; _statusTextInput = false; _statusTextInputState = kStatusTextInputFirstRun; + + _disableAbortSpeeches = false; } Interface::~Interface(void) { @@ -338,7 +340,8 @@ bool Interface::processAscii(uint16 ascii, bool synthetic) { if (_vm->_scene->isInIntro()) { _vm->_scene->skipScene(); } else { - _vm->_actor->abortAllSpeeches(); + if (!_disableAbortSpeeches) + _vm->_actor->abortAllSpeeches(); } return true; } @@ -591,10 +594,13 @@ void Interface::draw() { } if (_vm->getGameType() == GType_IHNM) { - _vm->_gfx->setPaletteColor(254, - _portraitBgColor.red, - _portraitBgColor.green, - _portraitBgColor.blue); + if (_vm->_spiritualBarometer > 255) + _vm->_gfx->setPaletteColor(kIHNMColorPortrait, 0xff, 0xff, 0xff); + else + _vm->_gfx->setPaletteColor(kIHNMColorPortrait, + _portraitBgColor.red, + _portraitBgColor.green, + _portraitBgColor.blue); } if (_panelMode == kPanelMain || _panelMode == kPanelConverse || |