aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFilippos Karapetis2007-07-28 12:26:40 +0000
committerFilippos Karapetis2007-07-28 12:26:40 +0000
commit8c1fcc3c08399d39b34ee333cc3d849252f49516 (patch)
tree3a616d8ffba25f8405941dfd0433d25cfd3ba34e
parent603bd238d11e2b4253a9a9cf74648da24b161422 (diff)
downloadscummvm-rg350-8c1fcc3c08399d39b34ee333cc3d849252f49516.tar.gz
scummvm-rg350-8c1fcc3c08399d39b34ee333cc3d849252f49516.tar.bz2
scummvm-rg350-8c1fcc3c08399d39b34ee333cc3d849252f49516.zip
The main panel is now correctly shown in the IHNM demo. Some inventory items are still wrong, though
svn-id: r28264
-rw-r--r--engines/saga/interface.cpp9
-rw-r--r--engines/saga/sagaresnames.h4
2 files changed, 9 insertions, 4 deletions
diff --git a/engines/saga/interface.cpp b/engines/saga/interface.cpp
index 74ac2155a9..150bf55111 100644
--- a/engines/saga/interface.cpp
+++ b/engines/saga/interface.cpp
@@ -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);
diff --git a/engines/saga/sagaresnames.h b/engines/saga/sagaresnames.h
index 4b4d546514..bb5a209946 100644
--- a/engines/saga/sagaresnames.h
+++ b/engines/saga/sagaresnames.h
@@ -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