[Scummvm-cvs-logs] CVS: scummvm/saga game.cpp,1.91,1.92 ihnm_introproc.cpp,1.48,1.49 ite_introproc.cpp,1.63,1.64 scene.cpp,1.136,1.137 scene.h,1.69,1.70
Andrew Kurushin
h00ligan at users.sourceforge.net
Sat Aug 6 05:21:28 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.161,1.162 game.cpp,1.90,1.91 interface.h,1.67,1.68 resnames.h,1.34,1.35 rscfile.cpp,1.30,1.31 rscfile.h,1.16,1.17 saga.cpp,1.124,1.125 scene.cpp,1.135,1.136 scene.h,1.68,1.69 script.h,1.100,1.101
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.162,1.163 actor.h,1.87,1.88 rscfile.cpp,1.31,1.32 rscfile.h,1.17,1.18 scene.cpp,1.137,1.138 scene.h,1.70,1.71
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14202
Modified Files:
game.cpp ihnm_introproc.cpp ite_introproc.cpp scene.cpp
scene.h
Log Message:
changeChapter -> changeScene with chapter
Index: game.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/game.cpp,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -d -r1.91 -r1.92
--- game.cpp 5 Aug 2005 23:14:09 -0000 1.91
+++ game.cpp 6 Aug 2005 12:20:09 -0000 1.92
@@ -548,7 +548,7 @@
-1, -1, // right portrait x, y offset
-1, -1, // inventory Up & Down button indexies
- 0, 0, // inventory rows, columns
+ 2, 4, // inventory rows, columns
0, 149, // main panel offsets
ARRAYSIZE(IHNM_MainPanelButtons),
Index: ihnm_introproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ihnm_introproc.cpp,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -d -r1.48 -r1.49
--- ihnm_introproc.cpp 31 Jul 2005 16:51:13 -0000 1.48
+++ ihnm_introproc.cpp 6 Aug 2005 12:20:09 -0000 1.49
@@ -80,10 +80,10 @@
};
LoadSceneParams IHNM_IntroList[] = {
- {0, kLoadByDescription, &IHNM_IntroMovie1Desc, Scene::SC_IHNMIntroMovieProc1, false, kTransitionNoFade, 0, false},
- {0, kLoadByDescription, &IHNM_IntroMovie2Desc, Scene::SC_IHNMIntroMovieProc2, false, kTransitionNoFade, 0, false},
- {0, kLoadByDescription, &IHNM_IntroMovie3Desc, Scene::SC_IHNMIntroMovieProc3, false, kTransitionNoFade, 0, false},
- {0, kLoadByDescription, &IHNM_IntroMovie4Desc, Scene::SC_IHNMHateProc, false, kTransitionNoFade, 0, false}
+ {0, kLoadByDescription, &IHNM_IntroMovie1Desc, Scene::SC_IHNMIntroMovieProc1, false, kTransitionNoFade, 0, -1},
+ {0, kLoadByDescription, &IHNM_IntroMovie2Desc, Scene::SC_IHNMIntroMovieProc2, false, kTransitionNoFade, 0, -1},
+ {0, kLoadByDescription, &IHNM_IntroMovie3Desc, Scene::SC_IHNMIntroMovieProc3, false, kTransitionNoFade, 0, -1},
+ {0, kLoadByDescription, &IHNM_IntroMovie4Desc, Scene::SC_IHNMHateProc, false, kTransitionNoFade, 0, -1}
};
int Scene::IHNMStartProc() {
@@ -105,6 +105,7 @@
firstScene.sceneProc = NULL;
firstScene.transitionType = kTransitionFade;
firstScene.actorsEntrance = 0;
+ firstScene.chapter = 0;
_vm->_scene->queueScene(&firstScene);
Index: ite_introproc.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/ite_introproc.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- ite_introproc.cpp 4 Aug 2005 14:49:02 -0000 1.63
+++ ite_introproc.cpp 6 Aug 2005 12:20:09 -0000 1.64
@@ -45,15 +45,15 @@
using Common::DE_DEU;
LoadSceneParams ITE_IntroList[] = {
- {RID_ITE_INTRO_ANIM_SCENE, kLoadByResourceId, NULL, Scene::SC_ITEIntroAnimProc, false, kTransitionNoFade, 0, false},
- {RID_ITE_CAVE_SCENE_1, kLoadByResourceId, NULL, Scene::SC_ITEIntroCave1Proc, false, kTransitionFade, 0, false},
- {RID_ITE_CAVE_SCENE_2, kLoadByResourceId, NULL, Scene::SC_ITEIntroCave2Proc, false, kTransitionNoFade, 0, false},
- {RID_ITE_CAVE_SCENE_3, kLoadByResourceId, NULL, Scene::SC_ITEIntroCave3Proc, false, kTransitionNoFade, 0, false},
- {RID_ITE_CAVE_SCENE_4, kLoadByResourceId, NULL, Scene::SC_ITEIntroCave4Proc, false, kTransitionNoFade, 0, false},
- {RID_ITE_VALLEY_SCENE, kLoadByResourceId, NULL, Scene::SC_ITEIntroValleyProc, false, kTransitionFade, 0, false},
- {RID_ITE_TREEHOUSE_SCENE, kLoadByResourceId, NULL, Scene::SC_ITEIntroTreeHouseProc, false, kTransitionNoFade, 0, false},
- {RID_ITE_FAIREPATH_SCENE, kLoadByResourceId, NULL, Scene::SC_ITEIntroFairePathProc, false, kTransitionNoFade, 0, false},
- {RID_ITE_FAIRETENT_SCENE, kLoadByResourceId, NULL, Scene::SC_ITEIntroFaireTentProc, false, kTransitionNoFade, 0, false}
+ {RID_ITE_INTRO_ANIM_SCENE, kLoadByResourceId, NULL, Scene::SC_ITEIntroAnimProc, false, kTransitionNoFade, 0, -1},
+ {RID_ITE_CAVE_SCENE_1, kLoadByResourceId, NULL, Scene::SC_ITEIntroCave1Proc, false, kTransitionFade, 0, -1},
+ {RID_ITE_CAVE_SCENE_2, kLoadByResourceId, NULL, Scene::SC_ITEIntroCave2Proc, false, kTransitionNoFade, 0, -1},
+ {RID_ITE_CAVE_SCENE_3, kLoadByResourceId, NULL, Scene::SC_ITEIntroCave3Proc, false, kTransitionNoFade, 0, -1},
+ {RID_ITE_CAVE_SCENE_4, kLoadByResourceId, NULL, Scene::SC_ITEIntroCave4Proc, false, kTransitionNoFade, 0, -1},
+ {RID_ITE_VALLEY_SCENE, kLoadByResourceId, NULL, Scene::SC_ITEIntroValleyProc, false, kTransitionFade, 0, -1},
+ {RID_ITE_TREEHOUSE_SCENE, kLoadByResourceId, NULL, Scene::SC_ITEIntroTreeHouseProc, false, kTransitionNoFade, 0, -1},
+ {RID_ITE_FAIREPATH_SCENE, kLoadByResourceId, NULL, Scene::SC_ITEIntroFairePathProc, false, kTransitionNoFade, 0, -1},
+ {RID_ITE_FAIRETENT_SCENE, kLoadByResourceId, NULL, Scene::SC_ITEIntroFaireTentProc, false, kTransitionNoFade, 0, -1}
};
int Scene::ITEStartProc() {
@@ -79,6 +79,7 @@
firstScene.sceneProc = NULL;
firstScene.transitionType = kTransitionFade;
firstScene.actorsEntrance = 0;
+ firstScene.chapter = -1;
_vm->_scene->queueScene(&firstScene);
Index: scene.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.cpp,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- scene.cpp 5 Aug 2005 23:14:11 -0000 1.136
+++ scene.cpp 6 Aug 2005 12:20:09 -0000 1.137
@@ -417,7 +417,7 @@
}
};
-void Scene::changeScene(uint16 sceneNumber, int actorsEntrance, SceneTransitionType transitionType) {
+void Scene::changeScene(uint16 sceneNumber, int actorsEntrance, SceneTransitionType transitionType, int chapter) {
// This is used for latter demos where all places on world map except
// Tent Faire are substituted with LBM picture and short description
if (_vm->getFeatures() & GF_SCENE_SUBSTITUTES) {
@@ -467,37 +467,14 @@
sceneParams.transitionType = transitionType;
sceneParams.sceneProc = NULL;
sceneParams.sceneSkipTarget = false;
+ sceneParams.chapter = chapter;
- endScene();
+ if (sceneNumber != -2) {
+ endScene();
+ }
loadScene(&sceneParams);
}
-void Scene::changeChapter(int chapter, int16 sceneNumber, int actorsEntrance) {
- if (chapter == 6)
- _vm->_interface->setLeftPortrait(0);
-
- freeCutawayList();
- _vm->_script->freeModules();
- // deleteAllScenes();
-
- // installSomeAlarm()
-
- _vm->_interface->clearInventory();
- _vm->_resource->loadGlobalResources(chapter, actorsEntrance);
- _vm->_interface->addToInventory(IHNM_OBJ_PROFILE);
- _vm->_interface->activate();
-
- if (chapter == 8 || chapter == -1)
- _vm->_interface->setMode(kPanelUnknown);
- else
- _vm->_interface->setMode(kPanelMain);
-
- _vm->_script->setVerb(kVerbIHNMWalkTo);
-
- if (sceneNumber != -2)
- changeScene(sceneNumber, actorsEntrance, kTransitionFade);
-}
-
void Scene::freeCutawayList() {
// TODO
// It has to be in different class
@@ -620,6 +597,37 @@
EVENT *q_event;
static PalEntry current_pal[PAL_ENTRIES];
+ if (loadSceneParams->chapter != -1) {
+ if (loadSceneParams->loadFlag != kLoadBySceneNumber) {
+ error("loadScene wrong usage");
+ }
+
+ if (loadSceneParams->chapter == 6)
+ _vm->_interface->setLeftPortrait(0);
+
+ freeCutawayList();
+ _vm->_script->freeModules();
+ // deleteAllScenes();
+
+ // installSomeAlarm()
+
+ _vm->_interface->clearInventory();
+ _vm->_resource->loadGlobalResources(loadSceneParams->chapter, loadSceneParams->actorsEntrance);
+ _vm->_interface->addToInventory(IHNM_OBJ_PROFILE);
+ _vm->_interface->activate();
+
+ if (loadSceneParams->chapter == 8 || loadSceneParams->chapter == -1)
+ _vm->_interface->setMode(kPanelUnknown);
+ else
+ _vm->_interface->setMode(kPanelMain);
+
+ //_vm->_script->setVerb(kVerbIHNMWalkTo); uncomment then panel will be done
+
+ if (loadSceneParams->sceneDescriptor == -2) {
+ return;
+ }
+ }
+//
if (_sceneLoaded) {
error("Scene::loadScene(): Error, a scene is already loaded");
}
Index: scene.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/scene.h,v
retrieving revision 1.69
retrieving revision 1.70
diff -u -d -r1.69 -r1.70
--- scene.h 5 Aug 2005 23:14:11 -0000 1.69
+++ scene.h 6 Aug 2005 12:20:10 -0000 1.70
@@ -163,7 +163,7 @@
bool sceneSkipTarget;
SceneTransitionType transitionType;
int actorsEntrance;
- bool extended; // IHNM GotoScene_ analog
+ int chapter;
};
typedef Common::List<LoadSceneParams> SceneQueueList;
@@ -248,8 +248,7 @@
void clearSceneQueue(void) {
_sceneQueue.clear();
}
- void changeScene(uint16 sceneNumber, int actorsEntrance, SceneTransitionType transitionType);
- void changeChapter(int chapter, int16 sceneNumber, int actorsEntrance);
+ void changeScene(uint16 sceneNumber, int actorsEntrance, SceneTransitionType transitionType, int chapter = -1);
void freeCutawayList();
bool isSceneLoaded() const { return _sceneLoaded; }
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.161,1.162 game.cpp,1.90,1.91 interface.h,1.67,1.68 resnames.h,1.34,1.35 rscfile.cpp,1.30,1.31 rscfile.h,1.16,1.17 saga.cpp,1.124,1.125 scene.cpp,1.135,1.136 scene.h,1.68,1.69 script.h,1.100,1.101
- Next message: [Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.162,1.163 actor.h,1.87,1.88 rscfile.cpp,1.31,1.32 rscfile.h,1.17,1.18 scene.cpp,1.137,1.138 scene.h,1.70,1.71
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list