[Scummvm-cvs-logs] CVS: scummvm/queen logic.cpp,1.187.2.1,1.187.2.2
Gregory Montoir
cyx at users.sourceforge.net
Fri Feb 27 22:52:02 CET 2004
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9658
Modified Files:
Tag: branch-0-6-0
logic.cpp
Log Message:
removed hack from loading code
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.187.2.1
retrieving revision 1.187.2.2
diff -u -d -r1.187.2.1 -r1.187.2.2
--- logic.cpp 27 Feb 2004 23:52:46 -0000 1.187.2.1
+++ logic.cpp 28 Feb 2004 06:34:17 -0000 1.187.2.2
@@ -1360,9 +1360,6 @@
}
void Logic::setupRestoredGame() {
- uint16 flag = _vm->bam()->_flag;
- _vm->bam()->_flag = BamScene::F_STOP;
-
_vm->sound()->playLastSong();
switch (gameState(VAR_DRESSING_MODE)) {
@@ -1380,19 +1377,34 @@
break;
}
- _joe.cutFacing = _joe.facing;
- joeFace();
+ BobSlot *pbs = _vm->graphics()->bob(0);
+ pbs->xflip = (joeFacing() == DIR_LEFT);
+ joePrevFacing(joeFacing());
+ joeCutFacing(joeFacing());
+ switch (joeFacing()) {
+ case DIR_FRONT:
+ pbs->frameNum = 34 + FRAMES_JOE_XTRA;
+ _vm->bankMan()->unpack(3, 29 + FRAMES_JOE_XTRA, 7);
+ break;
+ case DIR_BACK:
+ pbs->frameNum = 35 + FRAMES_JOE_XTRA;
+ _vm->bankMan()->unpack(5, 29 + FRAMES_JOE_XTRA, 7);
+ break;
+ default:
+ pbs->frameNum = 33 + FRAMES_JOE_XTRA;
+ _vm->bankMan()->unpack(1, 29 + FRAMES_JOE_XTRA, 7);
+ break;
+ }
_oldRoom = 0;
_newRoom = _currentRoom;
_entryObj = 0;
- inventoryRefresh();
-
- if (flag != BamScene::F_STOP) {
- _vm->bam()->_flag = flag;
+ if (_vm->bam()->_flag != BamScene::F_STOP) {
_vm->bam()->prepareAnimation();
}
+
+ inventoryRefresh();
}
void Logic::sceneStart() {
More information about the Scummvm-git-logs
mailing list