[Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.105,1.106 interface.cpp,1.151,1.152 resnames.h,1.40,1.41 sprite.cpp,1.70,1.71 sprite.h,1.23,1.24

[Eugene Sandulenko]

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

Modified Files:
	game.cpp interface.cpp resnames.h sprite.cpp sprite.h 
Log Message:
Show save reminder in IHNM correctly.


Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.cpp,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- game.cpp	10 Oct 2005 02:02:58 -0000	1.105
+++ game.cpp	10 Oct 2005 02:42:50 -0000	1.106
@@ -578,7 +578,7 @@
 	250,		// status BG color
 	616, 304,	// save reminder pos
 	24, 24,		// save reminder w&h
-	0,0,		// save reminder sprite numbers
+	0,1,		// save reminder sprite numbers
 
 	253,		// verb text color
 	15,			// verb text shadow color FIXME

Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.151
retrieving revision 1.152
diff -u -d -r1.151 -r1.152
--- interface.cpp	10 Oct 2005 02:02:58 -0000	1.151
+++ interface.cpp	10 Oct 2005 02:42:50 -0000	1.152
@@ -1505,7 +1505,7 @@
 
 		rect.right = rect.left + _vm->getDisplayInfo().saveReminderWidth;
 		rect.bottom = rect.top + _vm->getDisplayInfo().saveReminderHeight;
-		_vm->_sprite->draw(backBuffer, _vm->getDisplayClip(),  _vm->_sprite->_mainSprites,
+		_vm->_sprite->draw(backBuffer, _vm->getDisplayClip(),  _vm->_sprite->_saveReminderSprites,
 			_saveReminderState == 1 ? _vm->getDisplayInfo().saveReminderFirstSpriteNumber : _vm->getDisplayInfo().saveReminderSecondSpriteNumber,
 			rect, 256);
 

Index: resnames.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/resnames.h,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -d -r1.40 -r1.41
--- resnames.h	10 Oct 2005 02:02:58 -0000	1.40
+++ resnames.h	10 Oct 2005 02:42:50 -0000	1.41
@@ -82,15 +82,16 @@
 
 #define RID_IHNM_MAIN_PANEL  9
 #define RID_IHNM_CONVERSE_PANEL 10
-#define RID_IHNM_OPTION_PANEL 15
 #define RID_IHNM_HOURGLASS_CURSOR 11
-#define RID_IHNM_WARNING_PANEL 17
 #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
-#define RID_IHNM_PROFILE_BG 20
-
+#define RID_IHNM_ARROW_SPRITES 13
+#define RID_IHNM_SAVEREMINDER_SPRITES 14
+#define RID_IHNM_OPTION_PANEL 15
+#define RID_IHNM_WARNING_PANEL 17
 #define RID_IHNM_BOSS_SCREEN 19
+#define RID_IHNM_PROFILE_BG 20
+#define RID_IHNM_MAIN_STRINGS 21
 
 // Puzzle portraits
 #define RID_ITE_SAKKA_APPRAISING	6

Index: sprite.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sprite.cpp,v
retrieving revision 1.70
retrieving revision 1.71
diff -u -d -r1.70 -r1.71
--- sprite.cpp	10 Oct 2005 02:02:58 -0000	1.70
+++ sprite.cpp	10 Oct 2005 02:42:50 -0000	1.71
@@ -26,8 +26,8 @@
 
 #include "saga/gfx.h"
 #include "saga/scene.h"
+#include "saga/resnames.h"
 #include "saga/rscfile.h"
-
 #include "saga/font.h"
 
 #include "saga/sprite.h"
@@ -51,8 +51,13 @@
 		memoryError("Sprite::Sprite");
 	}
 
-	if (_vm->getGameType() == GType_ITE)
+	if (_vm->getGameType() == GType_ITE) {
 		loadList(_vm->getResourceDescription()->mainSpritesResourceId, _mainSprites);
+		_arrowSprites = _saveReminderSprites = _mainSprites;
+	} else {
+		loadList(RID_IHNM_ARROW_SPRITES, _arrowSprites);
+		loadList(RID_IHNM_SAVEREMINDER_SPRITES, _saveReminderSprites);
+	}
 }
 
 Sprite::~Sprite(void) {
@@ -84,6 +89,8 @@
 
 	spriteCount = readS.readUint16();
 
+	debug(9, "Sprites: %d", spriteCount);
+
 	oldSpriteCount = spriteList.spriteCount;
 	newSpriteCount = spriteList.spriteCount + spriteCount;
 

Index: sprite.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sprite.h,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- sprite.h	30 Jul 2005 21:11:21 -0000	1.23
+++ sprite.h	10 Oct 2005 02:42:50 -0000	1.24
@@ -64,8 +64,8 @@
 class Sprite {
 public:
 	SpriteList _mainSprites;
-
-
+	SpriteList _saveReminderSprites;
+	SpriteList _arrowSprites;
 
 	Sprite(SagaEngine *vm);
 	~Sprite(void);