[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.198,1.199 game.cpp,1.113,1.114 interface.cpp,1.156,1.157 resnames.h,1.43,1.44 rscfile.cpp,1.48,1.49 rscfile.h,1.20,1.21 scene.cpp,1.152,1.153 sprite.cpp,1.73,1.74 sprite.h,1.24,1.25
Eugene Sandulenko
sev at users.sourceforge.net
Mon Oct 10 19:23:48 CEST 2005
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6316
Modified Files:
actor.cpp game.cpp interface.cpp resnames.h rscfile.cpp
rscfile.h scene.cpp sprite.cpp sprite.h
Log Message:
Some IHNM changes:
o Fix status text color. (Though text is all ITE-specific)
o Enable inventory drawing
o Load inventory sprites
o Hid now unneeded actor loading debug output
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -d -r1.198 -r1.199
--- actor.cpp 10 Oct 2005 02:09:08 -0000 1.198
+++ actor.cpp 11 Oct 2005 02:22:53 -0000 1.199
@@ -414,7 +414,7 @@
actor = _actors[i] = new ActorData();
actor->_id = objectIndexToId(kGameObjectActor, i); //actorIndexToId(i);
actor->_index = i;
- debug(0, "init actor id=0x%x index=%d", actor->_id, actor->_index);
+ debug(4, "init actor id=0x%x index=%d", actor->_id, actor->_index);
actorS.readUint32LE(); //next displayed
actorS.readByte(); //type
actor->_flags = actorS.readByte();
@@ -427,7 +427,7 @@
actor->_screenDepth = actorS.readUint16LE();
actor->_spriteListResourceId = actorS.readUint32LE();
actor->_frameListResourceId = actorS.readUint32LE();
- debug(0, "%d: %d, %d [%d]", i, actor->_spriteListResourceId, actor->_frameListResourceId, actor->_nameIndex);
+ debug(4, "%d: %d, %d [%d]", i, actor->_spriteListResourceId, actor->_frameListResourceId, actor->_nameIndex);
actor->_scriptEntrypointNumber = actorS.readUint32LE();
actorS.readUint32LE(); // xSprite *dSpr;
actorS.readUint16LE(); //LEFT
Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.cpp,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- game.cpp 11 Oct 2005 01:42:21 -0000 1.113
+++ game.cpp 11 Oct 2005 02:22:53 -0000 1.114
@@ -534,19 +534,17 @@
{kPanelButtonVerb, 223,76, 114,30, kVerbGive,'g',0, 12,13,0},
{kPanelButtonVerb, 223,108, 114,30, kVerbPush,'p',0, 14,15,0},
{kPanelButtonArrow, 606,22, 20,25, -1,'[',0, 0,0,0}, //TODO: arrow Sprite Numbers
- {kPanelButtonArrow, 606,108, 20,25, 1,']',0, 0,0,0}
-//TODO:inventory
-/*
- {kPanelButtonInventory, 181 + 32*0,6, 27,18, 0,'-',0, 0,0,0},
- {kPanelButtonInventory, 181 + 32*1,6, 27,18, 1,'-',0, 0,0,0},
- {kPanelButtonInventory, 181 + 32*2,6, 27,18, 2,'-',0, 0,0,0},
- {kPanelButtonInventory, 181 + 32*3,6, 27,18, 3,'-',0, 0,0,0},
+ {kPanelButtonArrow, 606,108, 20,25, 1,']',0, 0,0,0},
- {kPanelButtonInventory, 181 + 32*0,27, 27,18, 4,'-',0, 0,0,0},
- {kPanelButtonInventory, 181 + 32*1,27, 27,18, 5,'-',0, 0,0,0},
- {kPanelButtonInventory, 181 + 32*2,27, 27,18, 6,'-',0, 0,0,0},
- {kPanelButtonInventory, 181 + 32*3,27, 27,18, 7,'-',0, 0,0,0}
-*/
+ {kPanelButtonInventory, 357 + 64*0,18, 54,54, 0,'-',0, 0,0,0},
+ {kPanelButtonInventory, 357 + 64*1,18, 54,54, 1,'-',0, 0,0,0},
+ {kPanelButtonInventory, 357 + 64*2,18, 54,54, 2,'-',0, 0,0,0},
+ {kPanelButtonInventory, 357 + 64*3,18, 54,54, 3,'-',0, 0,0,0},
+
+ {kPanelButtonInventory, 357 + 64*0,80, 54,54, 4,'-',0, 0,0,0},
+ {kPanelButtonInventory, 357 + 64*1,80, 54,54, 5,'-',0, 0,0,0},
+ {kPanelButtonInventory, 357 + 64*2,80, 54,54, 6,'-',0, 0,0,0},
+ {kPanelButtonInventory, 357 + 64*3,80, 54,54, 7,'-',0, 0,0,0}
};
static PanelButton IHNM_ConversePanelButtons[] = {
@@ -587,7 +585,7 @@
616, // status width
24, // status height
8, // status text y offset
- 186, // status text color
+ 253, // status text color
250, // status BG color
616, 303, // save reminder pos
24, 24, // save reminder w&h
Index: interface.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/interface.cpp,v
retrieving revision 1.156
retrieving revision 1.157
diff -u -d -r1.156 -r1.157
--- interface.cpp 11 Oct 2005 01:00:56 -0000 1.156
+++ interface.cpp 11 Oct 2005 02:22:53 -0000 1.157
@@ -1689,6 +1689,7 @@
void Interface::drawInventory(Surface *backBuffer) {
if (!isInMainMode())
return;
+
int i;
Rect rect;
int ci;
@@ -1712,7 +1713,7 @@
if (ci < _inventoryCount) {
obj = _vm->_actor->getObj(_inventory[ci]);
- _vm->_sprite->draw(backBuffer, _vm->getDisplayClip(), _vm->_sprite->_mainSprites, obj->_spriteListResourceId, rect, 256);
+ _vm->_sprite->draw(backBuffer, _vm->getDisplayClip(), _vm->_sprite->_inventorySprites, obj->_spriteListResourceId, rect, 256);
}
ci++;
Index: resnames.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/resnames.h,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- resnames.h 10 Oct 2005 17:23:28 -0000 1.43
+++ resnames.h 11 Oct 2005 02:22:53 -0000 1.44
@@ -98,7 +98,7 @@
#define RID_IHNM_CONVERSE_PANEL 10
#define RID_IHNM_HOURGLASS_CURSOR 11
#define RID_IHNM_MAIN_SPRITES 12 // TODO: verify this
-#define RID_IHNM_MAIN_PANEL_SPRITES 12 // TODO: verify this
+#define RID_IHNM_MAIN_PANEL_SPRITES 12
#define RID_IHNM_ARROW_SPRITES 13
#define RID_IHNM_SAVEREMINDER_SPRITES 14
#define RID_IHNM_OPTION_PANEL 15
Index: rscfile.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/rscfile.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- rscfile.cpp 9 Oct 2005 01:18:26 -0000 1.48
+++ rscfile.cpp 11 Oct 2005 02:22:53 -0000 1.49
@@ -469,7 +469,7 @@
_metaResource.sceneIndex = metaS.readSint16LE();
_metaResource.objectCount = metaS.readSint16LE();
_metaResource.objectsStringsResourceID = metaS.readSint32LE();
- _metaResource.field_8 = metaS.readSint32LE();
+ _metaResource.inventorySpritesID = metaS.readSint32LE();
_metaResource.mainSpritesID = metaS.readSint32LE();
_metaResource.objectsResourceID = metaS.readSint32LE();
_metaResource.actorCount = metaS.readSint16LE();
@@ -531,7 +531,8 @@
_vm->loadStrings(_vm->_actor->_actorsStrings, resourcePointer, resourceLength);
free(resourcePointer);
- // TODO: field_8. Inventory-related
+ _vm->_sprite->_inventorySprites.freeMem();
+ _vm->_sprite->loadList(_metaResource.inventorySpritesID, _vm->_sprite->_inventorySprites);
_vm->_sprite->_mainSprites.freeMem();
_vm->_sprite->loadList(_metaResource.mainSpritesID, _vm->_sprite->_mainSprites);
Index: rscfile.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/rscfile.h,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- rscfile.h 8 Oct 2005 22:09:21 -0000 1.20
+++ rscfile.h 11 Oct 2005 02:22:53 -0000 1.21
@@ -93,7 +93,7 @@
int16 sceneIndex;
int16 objectCount;
int32 objectsStringsResourceID;
- int32 field_8;
+ int32 inventorySpritesID;
int32 mainSpritesID;
int32 objectsResourceID;
int16 actorCount;
Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.cpp,v
retrieving revision 1.152
retrieving revision 1.153
diff -u -d -r1.152 -r1.153
--- scene.cpp 8 Oct 2005 16:25:18 -0000 1.152
+++ scene.cpp 11 Oct 2005 02:22:53 -0000 1.153
@@ -610,7 +610,7 @@
_vm->_interface->clearInventory();
_vm->_resource->loadGlobalResources(loadSceneParams->chapter, loadSceneParams->actorsEntrance);
- _vm->_interface->addToInventory(IHNM_OBJ_PROFILE);
+ _vm->_interface->addToInventory(0x4000); //IHNM_OBJ_PROFILE);
_vm->_interface->activate();
if (loadSceneParams->chapter == 8 || loadSceneParams->chapter == -1)
@@ -620,7 +620,7 @@
_inGame = true;
- //_vm->_script->setVerb(kVerbIHNMWalkTo); uncomment then panel will be done
+ _vm->_script->setVerb(kVerbWalkTo);
if (loadSceneParams->sceneDescriptor == -2) {
return;
Index: sprite.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sprite.cpp,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -d -r1.73 -r1.74
--- sprite.cpp 11 Oct 2005 01:42:21 -0000 1.73
+++ sprite.cpp 11 Oct 2005 02:22:53 -0000 1.74
@@ -53,7 +53,7 @@
if (_vm->getGameType() == GType_ITE) {
loadList(_vm->getResourceDescription()->mainSpritesResourceId, _mainSprites);
- _arrowSprites = _saveReminderSprites = _mainSprites;
+ _arrowSprites = _saveReminderSprites = _inventorySprites = _mainSprites;
} else {
loadList(RID_IHNM_ARROW_SPRITES, _arrowSprites);
loadList(RID_IHNM_SAVEREMINDER_SPRITES, _saveReminderSprites);
Index: sprite.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sprite.h,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -d -r1.24 -r1.25
--- sprite.h 10 Oct 2005 02:42:50 -0000 1.24
+++ sprite.h 11 Oct 2005 02:22:53 -0000 1.25
@@ -66,6 +66,7 @@
SpriteList _mainSprites;
SpriteList _saveReminderSprites;
SpriteList _arrowSprites;
+ SpriteList _inventorySprites;
Sprite(SagaEngine *vm);
~Sprite(void);
More information about the Scummvm-git-logs
mailing list