[Scummvm-cvs-logs] CVS: scummvm/saga actor.cpp,1.142,1.143 actor.h,1.78,1.79 puzzle.cpp,1.6,1.7 resnames.h,1.30,1.31 script.h,1.86,1.87 sthread.cpp,1.82,1.83
Andrew Kurushin
h00ligan at users.sourceforge.net
Wed Jun 15 12:27:56 CEST 2005
Update of /cvsroot/scummvm/scummvm/saga
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5425
Modified Files:
actor.cpp actor.h puzzle.cpp resnames.h script.h sthread.cpp
Log Message:
some renames
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.cpp,v
retrieving revision 1.142
retrieving revision 1.143
diff -u -d -r1.142 -r1.143
--- actor.cpp 14 Jun 2005 00:31:54 -0000 1.142
+++ actor.cpp 15 Jun 2005 19:26:30 -0000 1.143
@@ -1178,7 +1178,11 @@
}
-int Actor::direct(int msec) {
+void Actor::direct(int msec) {
+
+ if (_vm->_scene->_entryList.entryListCount == 0) {
+ return;
+ }
// FIXME: HACK. This should be turned into cycle event.
_lastTickMsec += msec;
@@ -1191,7 +1195,6 @@
//process speech
handleSpeech(msec);
- return SUCCESS;
}
@@ -1315,6 +1318,10 @@
return;
}
+ if (_vm->_scene->_entryList.entryListCount == 0) {
+ return;
+ }
+
CommonObjectOrderList::iterator drawOrderIterator;
CommonObjectDataPointer drawObject;
int frameNumber;
Index: actor.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/actor.h,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- actor.h 12 Jun 2005 15:58:37 -0000 1.78
+++ actor.h 15 Jun 2005 19:26:30 -0000 1.79
@@ -487,7 +487,7 @@
return (objectType == kGameObjectObject) ? getObj(id)->flags : getActor(id)->flags;
}
- int direct(int msec);
+ void direct(int msec);
void drawActors();
void updateActorsScene(int actorsEntrance); // calls from scene loading to update Actors info
Index: puzzle.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/puzzle.cpp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- puzzle.cpp 31 May 2005 01:03:13 -0000 1.6
+++ puzzle.cpp 15 Jun 2005 19:26:31 -0000 1.7
@@ -242,7 +242,7 @@
}
void Puzzle::initPieces(void) {
- ActorData *puzzle = _vm->_actor->getActor(_vm->_actor->actorIndexToId(RID_ITE_ACTOR_PUZZLE));
+ ActorData *puzzle = _vm->_actor->getActor(_vm->_actor->actorIndexToId(ITE_ACTOR_PUZZLE));
SpriteInfo *spI;
for (int i = 0; i < PUZZLE_PIECES; i++) {
@@ -260,7 +260,7 @@
}
void Puzzle::showPieces(void) {
- ActorData *puzzle = _vm->_actor->getActor(_vm->_actor->actorIndexToId(RID_ITE_ACTOR_PUZZLE));
+ ActorData *puzzle = _vm->_actor->getActor(_vm->_actor->actorIndexToId(ITE_ACTOR_PUZZLE));
SURFACE *backBuffer = _vm->_gfx->getBackBuffer();
for (int j = PUZZLE_PIECES - 1 ; j >= 0; j--) {
@@ -273,7 +273,7 @@
}
void Puzzle::drawCurrentPiece() {
- ActorData *puzzle = _vm->_actor->getActor(_vm->_actor->actorIndexToId(RID_ITE_ACTOR_PUZZLE));
+ ActorData *puzzle = _vm->_actor->getActor(_vm->_actor->actorIndexToId(ITE_ACTOR_PUZZLE));
SURFACE *backBuffer = _vm->_gfx->getBackBuffer();
_vm->_sprite->draw(backBuffer, puzzle->spriteList, _puzzlePiece,
@@ -402,7 +402,7 @@
// if the center is within the box quantize within
// else move it back to its original start point
if (mousePt.x >= boxx && mousePt.x < boxw && mousePt.y >= boxy && mousePt.y <= boxh) {
- ActorData *puzzle = _vm->_actor->getActor(_vm->_actor->actorIndexToId(RID_ITE_ACTOR_PUZZLE));
+ ActorData *puzzle = _vm->_actor->getActor(_vm->_actor->actorIndexToId(ITE_ACTOR_PUZZLE));
SpriteInfo *spI;
int newx = mousePt.x - _pieceInfo[_puzzlePiece].offX;
int newy = mousePt.y - _pieceInfo[_puzzlePiece].offY;
Index: resnames.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/resnames.h,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -d -r1.30 -r1.31
--- resnames.h 8 Jun 2005 14:41:57 -0000 1.30
+++ resnames.h 15 Jun 2005 19:26:32 -0000 1.31
@@ -43,10 +43,15 @@
//obj names
#define ITE_OBJ_MAP 14
+//actor names
+#define ITE_ACTOR_PUZZLE 176
+
// SCENES
#define ITE_SCENE_INV -1
#define ITE_SCENE_PUZZLE 26
#define ITE_SCENE_LODGE 21
+#define ITE_SCENE_ENDCREDIT1 295
+
#define ITE_DEFAULT_SCENE 32
#define IHNM_DEFAULT_SCENE 152
@@ -114,10 +119,6 @@
#define RID_ITE_INTRO_IMG_3 1561
#define RID_ITE_INTRO_IMG_4 1565
-#define RID_ITE_ENDCREDIT_SCENE_1 1802
-
-#define RID_ITE_ACTOR_PUZZLE 176
-
// ITE_VOICES
#define RID_CAVE_VOICE_0 0
#define RID_CAVE_VOICE_1 1
Index: script.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/script.h,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- script.h 15 Jun 2005 14:42:40 -0000 1.86
+++ script.h 15 Jun 2005 19:26:32 -0000 1.87
@@ -521,7 +521,7 @@
void sfScriptClimb(SCRIPTFUNC_PARAMS);
void sfSetDoorState(SCRIPTFUNC_PARAMS);
void sfSetActorZ(SCRIPTFUNC_PARAMS);
- void SF_text(SCRIPTFUNC_PARAMS);
+ void sfScriptText(SCRIPTFUNC_PARAMS);
void sfGetActorX(SCRIPTFUNC_PARAMS);
void sfGetActorY(SCRIPTFUNC_PARAMS);
void sfEraseDelta(SCRIPTFUNC_PARAMS);
Index: sthread.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/saga/sthread.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- sthread.cpp 13 Jun 2005 13:40:28 -0000 1.82
+++ sthread.cpp 15 Jun 2005 19:26:32 -0000 1.83
@@ -341,7 +341,7 @@
error("Script::runThread() Invalid script function number (%d)", functionNumber);
}
- debug(8, "Calling 0x%X %s", functionNumber, _scriptFunctionsList[functionNumber].scriptFunctionName);
+ debug(8, "Calling 0x%X %s argCount=%i", functionNumber, _scriptFunctionsList[functionNumber].scriptFunctionName, argumentsCount);
scriptFunction = _scriptFunctionsList[functionNumber].scriptFunction;
checkStackTopIndex = thread->_stackTopIndex + argumentsCount;
More information about the Scummvm-git-logs
mailing list