thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Allow part of the IHNM intro to run again. I haven't verified that these

Browse source 
resource numbers are correct.

svn-id: r18366
This commit is contained in:
Torbjörn Andersson 2005-06-08 14:41:57 +00:00
parent 064bfed378
commit 8c82d94c40
3 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
saga/game.cpp
View file

@ -393,9 +393,9 @@ static GameResourceDescription IHNM_Resources = {
RID_IHNM_SCRIPT_LUT, // Script lookup table RN
RID_IHNM_MAIN_PANEL,
RID_IHNM_CONVERSE_PANEL,
0,
0,
0,
RID_IHNM_OPTION_PANEL,
RID_IHNM_MAIN_SPRITES,
RID_IHNM_MAIN_PANEL_SPRITES,
0,
RID_IHNM_MAIN_STRINGS,
0

18
saga/interface.cpp
View file

@ -126,11 +126,14 @@ Interface::Interface(SagaEngine *vm) : _vm(vm), _initialized(false) {
error("Interface::Interface(): Unable to load sprite list");
}
if (_vm->_sprite->loadList(_vm->getResourceDescription()->defaultPortraitsResourceId, _defPortraits) != SUCCESS) {
error("Interface::Interface(): Unable to load sprite list");
if (_vm->getGameType() == GType_ITE) {
if (_vm->_sprite->loadList(_vm->getResourceDescription()->defaultPortraitsResourceId, _defPortraits) != SUCCESS) {
error("Interface::Interface(): Unable to load sprite list");
}
} else {
// TODO
}
_mainPanel.x = _vm->getDisplayInfo().mainPanelXOffset;
_mainPanel.y = _vm->getDisplayInfo().mainPanelYOffset;
_mainPanel.currentButton = NULL;
@ -553,11 +556,10 @@ void Interface::draw() {
if (_panelMode == kPanelMain || _panelMode == kPanelConverse ||
_lockedMode == kPanelMain || _lockedMode == kPanelConverse) {
leftPortraitPoint.x = _mainPanel.x + _vm->getDisplayInfo().leftPortraitXOffset;
leftPortraitPoint.y = _mainPanel.y + _vm->getDisplayInfo().leftPortraitYOffset;
_vm->_sprite->draw(backBuffer, _defPortraits, _leftPortrait, leftPortraitPoint, 256);
}
leftPortraitPoint.x = _mainPanel.x + _vm->getDisplayInfo().leftPortraitXOffset;
leftPortraitPoint.y = _mainPanel.y + _vm->getDisplayInfo().leftPortraitYOffset;
_vm->_sprite->draw(backBuffer, _defPortraits, _leftPortrait, leftPortraitPoint, 256);
}
if (!_inMainMode && _vm->getDisplayInfo().rightPortraitXOffset >= 0) { //FIXME: should we change !_inMainMode to _panelMode == kPanelConverse ?
rightPortraitPoint.x = _mainPanel.x + _vm->getDisplayInfo().rightPortraitXOffset;

3
saga/resnames.h
View file

@ -68,6 +68,9 @@ namespace Saga {
#define RID_IHNM_MAIN_PANEL 9
#define RID_IHNM_CONVERSE_PANEL 10
#define RID_IHNM_OPTION_PANEL 11 // TODO: verify this
#define RID_IHNM_MAIN_SPRITES 12 // TODO: verify this
#define RID_IHNM_MAIN_PANEL_SPRITES 13 // TODO: verify this
#define RID_IHNM_MAIN_STRINGS 21
// Puzzle portraits