The main panel is now correctly shown in the IHNM demo. Some inventory items are still wrong, though

svn-id: r28264
This commit is contained in:
Filippos Karapetis 2007-07-28 12:26:40 +00:00
parent 603bd238d1
commit 8c1fcc3c08
2 changed files with 9 additions and 4 deletions

View File

@ -389,6 +389,9 @@ void Interface::setMode(int mode) {
} else if (mode == kPanelChapterSelection) {
if (_vm->getGameId() != GID_IHNM_DEMO)
_saveReminderState = 1;
} else if (mode == kPanelNull) {
if (_vm->getGameId() == GID_IHNM_DEMO)
_inMainMode = true;
} else {
if (mode == kPanelConverse) {
_inMainMode = false;
@ -726,7 +729,8 @@ void Interface::draw() {
drawStatusBar();
if (_panelMode == kPanelMain || _panelMode == kPanelMap) {
if (_panelMode == kPanelMain || _panelMode == kPanelMap ||
(_panelMode == kPanelNull && _vm->getGameId() == GID_IHNM_DEMO)) {
_mainPanel.getRect(rect);
backBuffer->blit(rect, _mainPanel.image);
@ -752,7 +756,8 @@ void Interface::draw() {
}
if (_panelMode == kPanelMain || _panelMode == kPanelConverse ||
_lockedMode == kPanelMain || _lockedMode == kPanelConverse) {
_lockedMode == kPanelMain || _lockedMode == kPanelConverse ||
(_panelMode == kPanelNull && _vm->getGameId() == GID_IHNM_DEMO)) {
leftPortraitPoint.x = _mainPanel.x + _vm->getDisplayInfo().leftPortraitXOffset;
leftPortraitPoint.y = _mainPanel.y + _vm->getDisplayInfo().leftPortraitYOffset;
_vm->_sprite->draw(backBuffer, _vm->getDisplayClip(), _defPortraits, _leftPortrait, leftPortraitPoint, 256);

View File

@ -112,7 +112,7 @@ namespace Saga {
#define RID_IHNM_PROFILE_BG 20
#define RID_IHNM_MAIN_STRINGS 21
#define RID_IHNMDEMO_MAIN_PANEL 4 // TODO: Verify this
#define RID_IHNMDEMO_MAIN_PANEL 5
#define RID_IHNMDEMO_CONVERSE_PANEL 5 // TODO: Verify this
#define RID_IHNMDEMO_HOURGLASS_CURSOR 6 // Does not exist in the demo
#define RID_IHNMDEMO_MAIN_SPRITES 7
@ -124,7 +124,7 @@ namespace Saga {
#define RID_IHNMDEMO_WARNING_PANEL 12 // TODO: Verify this
#define RID_IHNMDEMO_BOSS_SCREEN 13 // Does not exist in the demo
#define RID_IHNMDEMO_PROFILE_BG 14 // TODO: Verify this
#define RID_IHNMDEMO_MAIN_STRINGS 15 // TODO: Verify this
#define RID_IHNMDEMO_MAIN_STRINGS 16
// Puzzle portraits
#define RID_ITE_SAKKA_APPRAISING 6