[Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.70,1.71 interface.cpp,1.103,1.104 resnames.h,1.29,1.30

Torbjörn Andersson eriktorbjorn at users.sourceforge.net
Wed Jun 8 07:42:46 CEST 2005


Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv8910

Modified Files:
	game.cpp interface.cpp resnames.h 
Log Message:
Allow part of the IHNM intro to run again. I haven't verified that these
resource numbers are correct.


Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- game.cpp	8 Jun 2005 13:49:56 -0000	1.70
+++ game.cpp	8 Jun 2005 14:41:57 -0000	1.71
@@ -393,9 +393,9 @@
 	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

Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -d -r1.103 -r1.104
--- interface.cpp	4 Jun 2005 15:02:17 -0000	1.103
+++ interface.cpp	8 Jun 2005 14:41:57 -0000	1.104
@@ -125,11 +125,14 @@
 	if (_vm->_sprite->loadList(_vm->getResourceDescription()->mainPanelSpritesResourceId, _mainPanel.sprites) != SUCCESS) {
 		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;
@@ -553,11 +556,10 @@
 
 	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;

Index: resnames.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/resnames.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -d -r1.29 -r1.30
--- resnames.h	8 Jun 2005 13:49:56 -0000	1.29
+++ resnames.h	8 Jun 2005 14:41:57 -0000	1.30
@@ -68,6 +68,9 @@
 
 #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





More information about the Scummvm-git-logs mailing list