[Scummvm-cvs-logs] SF.net SVN: scummvm: [28264] scummvm/trunk/engines/saga

[thebluegr at users.sourceforge.net]

Revision: 28264
          http://scummvm.svn.sourceforge.net/scummvm/?rev=28264&view=rev
Author:   thebluegr
Date:     2007-07-28 05:26:40 -0700 (Sat, 28 Jul 2007)

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

Modified Paths:
--------------
    scummvm/trunk/engines/saga/interface.cpp
    scummvm/trunk/engines/saga/sagaresnames.h

Modified: scummvm/trunk/engines/saga/interface.cpp
===================================================================
--- scummvm/trunk/engines/saga/interface.cpp	2007-07-28 12:10:37 UTC (rev 28263)
+++ scummvm/trunk/engines/saga/interface.cpp	2007-07-28 12:26:40 UTC (rev 28264)
@@ -389,6 +389,9 @@
 	} 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 @@
 
 	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 @@
 	}
 
 	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);

Modified: scummvm/trunk/engines/saga/sagaresnames.h
===================================================================
--- scummvm/trunk/engines/saga/sagaresnames.h	2007-07-28 12:10:37 UTC (rev 28263)
+++ scummvm/trunk/engines/saga/sagaresnames.h	2007-07-28 12:26:40 UTC (rev 28264)
@@ -112,7 +112,7 @@
 #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 @@
 #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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.