[Scummvm-cvs-logs] CVS: scummvm/queen walk.h,1.9,1.10 walk.cpp,1.16,1.17 logic.h,1.52,1.53 logic.cpp,1.68,1.69
Gregory Montoir
cyx at users.sourceforge.net
Sun Nov 2 08:49:04 CET 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen xref.txt,1.28,1.29
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword2 build_display.cpp,1.40,1.41 controls.cpp,1.43,1.44 debug.cpp,1.20,1.21 function.cpp,1.33,1.34 layers.cpp,1.17,1.18 layers.h,1.6,1.7 mouse.cpp,1.33,1.34 save_rest.cpp,1.31,1.32 scroll.cpp,1.9,1.10 speech.cpp,1.38,1.39 sword2.cpp,1.72,1.73 sword2.h,1.30,1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv3889
Modified Files:
walk.h walk.cpp logic.h logic.cpp
Log Message:
cleanup/remaining Walk cutaway calls
Index: walk.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/walk.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- walk.h 21 Oct 2003 09:05:15 -0000 1.9
+++ walk.h 2 Nov 2003 16:47:31 -0000 1.10
@@ -28,9 +28,6 @@
namespace Queen {
-#define MAX_AREAS 11
-
-
struct MovePersonAnim {
int16 firstFrame;
int16 lastFrame;
@@ -48,7 +45,7 @@
// int16 sign; // never used
int16 dx, dy;
const Area *area;
- uint16 areaNum; // extra stuff for joeMoveBlock
+ uint16 areaNum; // extra stuff for customMoveJoe
MovePersonAnim anim;
};
@@ -72,65 +69,66 @@
class Walk {
public:
- Walk(Logic* logic, Graphics* graphics);
+ Walk(Logic *logic, Graphics *graphics);
- //! MOVE_JOE()
int16 joeMove(int direction, uint16 endx, uint16 endy, bool inCutaway);
- //! MOVE_OTHER
int16 personMove(const Person *pp, uint16 endx, uint16 endy, uint16 curImage, int direction);
+ enum {
+ MAX_WALK_DATA = 16
+ };
private:
- void joeMoveBlock(int facing, uint16 areaNum, uint16 walkDataNum);
-
void animateJoePrepare();
bool animateJoe();
void animatePersonPrepare(const MovePersonData *mpd, int direction);
void animatePerson(const MovePersonData *mpd, uint16 image, uint16 bobNum, uint16 bankNum, int direction);
- //! CALC_X, CALC_Y
+ //! compute transition coordinate
static uint16 calcC(uint16 c1, uint16 c2, uint16 c3, uint16 c4, uint16 lastc);
- //! FIND_OLDP, FIND_NEWP
+ //! find area for position
int16 findAreaPosition(uint16 *x, uint16 *y, bool recalibrate);
- //! FIND_FREE_AREA, find an area not already struck
+ //! find an area not already struck
uint16 findFreeArea(uint16 area) const;
- //!
+ //! return true if the area is already on the walking path
bool isAreaStruck(uint16 area) const;
- //! CALC_PATH, calculates the path list from oldArea to newArea
+ //! calculates the path list from oldArea to newArea
bool calcPath(uint16 oldArea, uint16 newArea);
//! resets path computed in calcPath()
void initWalkData();
- //! CALC_WALK
+ //! add an area to the path
void incWalkData(uint16 px, uint16 py, uint16 x, uint16 y, uint16 area);
- //! equivalent to l.2432,2469 MOVE_OTHER() and l.2696,2744 MOVE_JOE()
+ //! compute path (and populates _walkData) from current position to the new one
void calc(uint16 oldPos, uint16 newPos, uint16 oldx, uint16 oldy, uint16 x, uint16 y);
- static const MovePersonData _moveData[];
+ WalkData _walkData[MAX_WALK_DATA];
uint16 _walkDataCount;
- WalkData _walkData[16];
+ uint16 _areaStrike[MAX_WALK_DATA];
uint16 _areaStrikeCount;
- uint16 _areaStrike[MAX_AREAS + 1];
+
+ uint16 _areaList[MAX_WALK_DATA];
uint16 _areaListCount;
- uint16 _areaList[MAX_AREAS + 1];
- //! set if joeMoveBlock() is called in joeAnimate()
+ //! set if customMoveJoe() is called in joeAnimate()
bool _joeMoveBlock;
Logic *_logic;
Graphics *_graphics;
+
+ static const MovePersonData MOVE_DATA[];
};
Index: walk.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/walk.cpp,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- walk.cpp 31 Oct 2003 13:47:28 -0000 1.16
+++ walk.cpp 2 Nov 2003 16:47:31 -0000 1.17
@@ -28,28 +28,28 @@
namespace Queen {
-const MovePersonData Walk::_moveData[] = {
- {"COMPY", -1, -6, 1, 6, 0, 0, 0, 0,12,12,1,14},
- {"DEINO", -1, -8, 1, 8, 0, 0, 0, 0,11,11,1,10},
- {"FAYE", -1, -6, 1, 6,13,18, 7,12,19,22,2, 5},
- {"GUARDS", -1, -6, 1, 6, 0, 0, 0, 0, 7, 7,2, 5},
- {"PRINCESS1", -1, -6, 1, 6,13,18, 7,12,19,21,2, 5},
- {"PRINCESS2", -1, -6, 1, 6,13,18, 7,12,19,21,2, 5},
- {"AMGUARD", -1, -6, 1, 6,13,18, 7,12,19,21,2, 5},
- {"SPARKY", -1, -6, 1, 6,13,18, 7,12,21,20,2, 5},
- {"LOLA_SHOWER", -1, -6,55,60, 0, 0, 0, 0, 7, 7,2, 5},
- {"LOLA", -24,-29,24,29, 0, 0, 0, 0,30,30,2, 5},
- {"BOB", -15,-20,15,20,21,26, 0, 0,27,29,2, 5},
- {"CHEF", -1, -4, 1, 4, 0, 0, 0, 0, 1, 5,2, 4},
- {"HENRY", -1, -6, 1, 6, 0, 0, 0, 0, 7, 7,2, 6},
- {"ANDERSON", -1, -6, 1, 6, 0, 0, 0, 0, 7, 7,2, 5},
- {"JASPAR", -4, -9, 4, 9,16,21,10,15, 1, 3,1,10},
- {"PYGMY", -7,-12, 7,12, 0, 0, 0, 0,27,27,2, 5},
- {"FRANK", 7, 12, 1, 6, 0, 0, 0, 0,13,13,2, 4},
- {"WEDGEWOOD", -20,-25,20,25, 0, 0, 0, 0, 1, 1,1, 5},
- {"TMPD", -1, -6, 1, 6,13,18, 7,12,19,21,2, 5},
- {"IAN", -1, -6, 1, 6, 0, 0, 0, 0, 7, 7,2, 6},
- {"*", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,0, 0}
+const MovePersonData Walk::MOVE_DATA[] = {
+ {"COMPY", -1, -6, 1, 6, 0, 0, 0, 0, 12, 12, 1, 14},
+ {"DEINO", -1, -8, 1, 8, 0, 0, 0, 0, 11, 11, 1, 10},
+ {"FAYE", -1, -6, 1, 6, 13, 18, 7, 12, 19, 22, 2, 5},
+ {"GUARDS", -1, -6, 1, 6, 0, 0, 0, 0, 7, 7, 2, 5},
+ {"PRINCESS1", -1, -6, 1, 6, 13, 18, 7, 12, 19, 21, 2, 5},
+ {"PRINCESS2", -1, -6, 1, 6, 13, 18, 7, 12, 19, 21, 2, 5},
+ {"AMGUARD", -1, -6, 1, 6, 13, 18, 7, 12, 19, 21, 2, 5},
+ {"SPARKY", -1, -6, 1, 6, 13, 18, 7, 12, 21, 20, 2, 5},
+ {"LOLA_SHOWER", -1, -6, 55, 60, 0, 0, 0, 0, 7, 7, 2, 5},
+ {"LOLA", -24, -29, 24, 29, 0, 0, 0, 0, 30, 30, 2, 5},
+ {"BOB", -15, -20, 15, 20, 21, 26, 0, 0, 27, 29, 2, 5},
+ {"CHEF", -1, -4, 1, 4, 0, 0, 0, 0, 1, 5, 2, 4},
+ {"HENRY", -1, -6, 1, 6, 0, 0, 0, 0, 7, 7, 2, 6},
+ {"ANDERSON", -1, -6, 1, 6, 0, 0, 0, 0, 7, 7, 2, 5},
+ {"JASPAR", -4, -9, 4, 9, 16, 21, 10, 15, 1, 3, 1, 10},
+ {"PYGMY", -7, -12, 7, 12, 0, 0, 0, 0, 27, 27, 2, 5},
+ {"FRANK", 7, 12, 1, 6, 0, 0, 0, 0, 13, 13, 2, 4},
+ {"WEDGEWOOD", -20, -25, 20, 25, 0, 0, 0, 0, 1, 1, 1, 5},
+ {"TMPD", -1, -6, 1, 6, 13, 18, 7, 12, 19, 21, 2, 5},
+ {"IAN", -1, -6, 1, 6, 0, 0, 0, 0, 7, 7, 2, 6},
+ {"*", 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
};
@@ -59,23 +59,6 @@
}
-void Walk::joeMoveBlock(int facing, uint16 areaNum, uint16 walkDataNum) {
-
- warning("Walk::moveJoeBlock() partially implemented");
- _graphics->bob(0)->animating = false;
-
- // Make Joe face the right direction
- _joeMoveBlock = true;
- _logic->joeFacing(facing);
- _logic->joeFace();
-
- _logic->newRoom(0);
- _logic->entryObj(0);
-
- // XXX cutaway calls
-}
-
-
void Walk::animateJoePrepare() {
// queen.c l.2748-2788
uint16 i;
@@ -133,7 +116,9 @@
// area has been turned off, see if we should execute a cutaway
if (pwd->area->mapNeighbours < 0) {
- joeMoveBlock(pwd->anim.facing, pwd->areaNum, i);
+ // queen.c l.2838-2911
+ _logic->customMoveJoe(pwd->anim.facing, pwd->areaNum, i);
+ _joeMoveBlock = true;
return interrupted;
}
if (lastDirection != pwd->anim.facing) {
@@ -157,7 +142,7 @@
pbs->speed = 1;
}
_logic->checkPlayer();
- if (_logic->joeWalk() == 2) { // || cutQuit
+ if (_logic->joeWalk() == 2) { // XXX || cutQuit
// we are about to do something else, so stop walking
interrupted = true;
pbs->moving = false;
@@ -299,7 +284,7 @@
else {
pbs->speed = scale * (mpd->moveSpeed / 2) / 100;
}
-// if (cutQuit)
+ // XXX if (cutQuit)
}
}
}
@@ -386,7 +371,7 @@
calc(oldPos, newPos, oldx, oldy, endx, endy);
// find MovePersonData associated to Person
- const MovePersonData *mpd = _moveData;
+ const MovePersonData *mpd = MOVE_DATA;
while (mpd->name[0] != '*') {
if (scumm_stricmp(mpd->name, pp->name) == 0) {
break;
Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.h,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -d -r1.52 -r1.53
--- logic.h 2 Nov 2003 14:49:50 -0000 1.52
+++ logic.h 2 Nov 2003 16:47:31 -0000 1.53
@@ -226,18 +226,13 @@
//! GRAB_DIR
void joeGrabDirection(StateGrab grab, uint16 speed);
- //! USE_DRESS
void joeUseDress(bool showCut);
-
- //! USE_CLOTHES
void joeUseClothes(bool showCut);
-
- //! USE_UNDERWEAR
void joeUseUnderwear();
void joeSpeak(uint16 descNum, bool objectType = false);
- void playCutaway(const char* cutFile);
+ void playCutaway(const char *cutFile, char *next = NULL);
const char* objectOrItemName(int16 obj) const;
@@ -268,6 +263,8 @@
void objectCopy(int dummyObjectIndex, int objectIndex);
void checkPlayer();
+
+ void customMoveJoe(int facing, uint16 areaNum, uint16 walkDataNum);
void update();
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- logic.cpp 2 Nov 2003 14:49:50 -0000 1.68
+++ logic.cpp 2 Nov 2003 16:47:31 -0000 1.69
@@ -1923,9 +1923,12 @@
}
-void Logic::playCutaway(const char* cutFile) {
+void Logic::playCutaway(const char *cutFile, char *next) {
- char next[20];
+ char nextFile[20];
+ if (next == NULL) {
+ next = nextFile;
+ }
Cutaway::run(cutFile, next, _graphics, _input, this, _resource, _sound);
}
@@ -2189,6 +2192,127 @@
void Logic::checkPlayer() {
update();
_cmd->updatePlayer();
+}
+
+
+void Logic::customMoveJoe(int facing, uint16 areaNum, uint16 walkDataNum) {
+
+ // queen.c l.2838-2911
+ debug(9, "customMoveJoe(%d, %d, %d)\n", facing, areaNum, walkDataNum);
+
+ // Stop animating Joe
+ _graphics->bob(0)->animating = false;
+
+ // Make Joe face the right direction
+ joeFacing(facing);
+ joeFace();
+
+ _newRoom = 0;
+ _entryObj = 0;
+
+ char nextCut[20];
+ memset(nextCut, 0, sizeof(nextCut));
+
+ switch (_currentRoom) {
+ case 4:
+ joeSpeak(16);
+ break;
+ case 6:
+ playCutaway("c6c.CUT", nextCut);
+ break;
+ case 14:
+ playCutaway("c14b.CUT", nextCut);
+ break;
+ case 16:
+ if (areaNum == 3) {
+ playCutaway("c16a.CUT", nextCut);
+ }
+ break;
+ case 17:
+ if (walkDataNum == 4) {
+ playCutaway("c17a.CUT", nextCut);
+ }
+ else if (walkDataNum == 2) {
+ playCutaway("c17b.CUT", nextCut);
+ }
+ break;
+ case 22:
+ playCutaway("c22a.CUT", nextCut);
+ break;
+ case 26:
+ playCutaway("c26b.CUT", nextCut);
+ break;
+ case 30:
+ playCutaway("c30a.CUT", nextCut);
+ break;
+ case 32:
+ playCutaway("c32c.CUT", nextCut);
+ break;
+ case 50:
+ if (areaNum == 6) {
+ if (_gameState[21] == 0) {
+ playCutaway("c50d.CUT", nextCut);
+ while (nextCut[0] != '\0') {
+ playCutaway(nextCut, nextCut);
+ }
+ _gameState[21] = 1;
+ } else {
+ playCutaway("c50h.CUT", nextCut);
+ }
+ }
+ break;
+ case 53:
+ playCutaway("c53b.CUT", nextCut);
+ break;
+ case 55:
+ joeSpeak(19);
+ break;
+ case 71:
+ joeSpeak(21);
+ break;
+ case 73:
+ // don't play next Cutaway
+ if (_gameState[VAR_ROOM73_CUTAWAY] == 0) {
+ playCutaway("c73a.CUT");
+ _gameState[VAR_ROOM73_CUTAWAY] = 1;
+ joeUseUnderwear();
+ joeFace();
+ }
+ else if (_gameState[VAR_ROOM73_CUTAWAY] == 1) {
+ playCutaway("c73b.CUT");
+ _gameState[VAR_ROOM73_CUTAWAY] = 2;
+ }
+ else if (_gameState[VAR_ROOM73_CUTAWAY] == 2) {
+ playCutaway("c73c.CUT");
+ }
+ break;
+ case 100:
+ if (areaNum == 7) {
+ joeSpeak(17);
+ }
+ break;
+ case 101:
+ if (areaNum == 5 && _gameState[187] == 0) {
+ playCutaway("c101b.CUT", nextCut);
+ }
+ break;
+ case 103:
+ if (areaNum == 3) {
+ if (_gameState[35] == 1) {
+ playCutaway("c103e.CUT", nextCut);
+ }
+ else if (_gameState[35] == 0) {
+ playCutaway("c103b.CUT", nextCut);
+ _gameState[35] = 1;
+ }
+ }
+ break;
+ }
+
+ while (strlen(nextCut) > 4 &&
+ scumm_stricmp(nextCut + strlen(nextCut) - 4, ".cut") == 0) {
+ playCutaway(nextCut, nextCut);
+ }
}
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/queen xref.txt,1.28,1.29
- Next message: [Scummvm-cvs-logs] CVS: scummvm/sword2 build_display.cpp,1.40,1.41 controls.cpp,1.43,1.44 debug.cpp,1.20,1.21 function.cpp,1.33,1.34 layers.cpp,1.17,1.18 layers.h,1.6,1.7 mouse.cpp,1.33,1.34 save_rest.cpp,1.31,1.32 scroll.cpp,1.9,1.10 speech.cpp,1.38,1.39 sword2.cpp,1.72,1.73 sword2.h,1.30,1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list