[Scummvm-cvs-logs] CVS: scummvm/queen structs.h,1.13,1.14 graphics.h,1.27,1.28 logic.h,1.35,1.36 logic.cpp,1.49,1.50 queen.cpp,1.18,1.19
Gregory Montoir
cyx at users.sourceforge.net
Sun Oct 19 12:39:08 CEST 2003
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1:/tmp/cvs-serv32600
Modified Files:
structs.h graphics.h logic.h logic.cpp queen.cpp
Log Message:
minor cleanup / comments update
Index: structs.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/structs.h,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- structs.h 18 Oct 2003 17:12:50 -0000 1.13
+++ structs.h 19 Oct 2003 18:52:28 -0000 1.14
@@ -109,6 +109,26 @@
//! coordinates of object
uint16 x, y;
//! bank bobframes
+ /*!
+ <table>
+ <tr>
+ <td>lastFrame == 0</td>
+ <td>non-animated bob (one frame)</td>
+ </tr>
+ <tr>
+ <td>lastFrame < 0</td>
+ <td>rebound animation</td>
+ </tr>
+ <tr>
+ <td>firstFrame < 0</td>
+ <td>bobAnimString (animation is described by a string)</td>
+ </tr>
+ <tr>
+ <td>firstFrame > 0</td>
+ <td>bobAnimNormal (animation is a sequence of frames)</td>
+ </tr>
+ </table>
+ */
int16 firstFrame, lastFrame;
//! moving speed of object
uint16 speed;
@@ -414,7 +434,23 @@
struct FurnitureData {
//! room in which the furniture are
int16 room;
- //! value to store in GAMESTATE
+ //! type of furniture (stored in GAMESTATE)
+ /*!
+ <table>
+ <tr>
+ <td>value</td>
+ <td>description</td>
+ </tr>
+ <tr>
+ <td>]0..5000]</td>
+ <td>static or animated</td>
+ </tr>
+ <tr>
+ <td>]5000..[</td>
+ <td>paste down</td>
+ </tr>
+ </table>
+ */
int16 gameStateValue;
void readFrom(byte *&ptr) {
Index: graphics.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/graphics.h,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- graphics.h 18 Oct 2003 19:40:11 -0000 1.27
+++ graphics.h 19 Oct 2003 18:52:28 -0000 1.28
@@ -101,14 +101,6 @@
};
-//struct Dynalum {
-// uint8 msk[50 * 160]; // mask
-// int8 lum[8 * 3]; // rgb
-// int8 oldColMask;
-// Dynalum(): oldColMask(-1) {}
-//};
-
-
class Display;
class Graphics {
Index: logic.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -d -r1.35 -r1.36
--- logic.h 18 Oct 2003 14:01:43 -0000 1.35
+++ logic.h 19 Oct 2003 18:52:28 -0000 1.36
@@ -225,13 +225,22 @@
int16 _gameState[GAME_STATE_COUNT];
- uint16 _numFurnitureAnimated; // FMAXA
+ //! Number of animated furniture in current room (FMAXA)
+ uint16 _numFurnitureAnimated;
+
+ //! Number of static furniture in current room (FMAX)
uint16 _numFurnitureStatic; // FMAX
- uint16 _numFurnitureAnimatedLen; // FMAXLEN
- uint16 _numFrames; // FRAMES
+
+ //! Total number of frames for the animated furniture (FMAXLEN)
+ uint16 _numFurnitureAnimatedLen;
+
+ //! Current number of frames unpacked (FRAMES)
+ uint16 _numFrames;
+
+ //! Last frame number used for person animation
uint16 _personFrames[4];
- //! contains the animation frames (max 30) to use for a bob (whose number must be < 17)
+ //! Describe an string based animation (30 frames maximum, bob number must be < 17)
AnimFrame _newAnim[17][30];
Resource *_resource;
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- logic.cpp 18 Oct 2003 17:42:24 -0000 1.49
+++ logic.cpp 19 Oct 2003 18:52:28 -0000 1.50
@@ -855,7 +855,6 @@
void Logic::roomSetupObjects() {
- warning("Logic::roomSetupObjects() not fully implemented");
uint16 i;
// furniture frames are reserved in ::roomSetupFurniture(), we append objects
@@ -997,7 +996,7 @@
uint16 Logic::roomRefreshObject(uint16 obj) {
- warning("Logic::roomRefreshObject() not fully implemented");
+
uint16 curImage = _numFrames;
ObjectData *pod = &_objectData[obj];
@@ -1452,20 +1451,18 @@
_graphics->bankUnpack(ABS(tempFrames[i]), firstImage + i, 15);
}
if (paf != NULL) {
- uint16 frameNr = 0;
for (i = 1; i <= _numGraphicAnim; ++i) {
const GraphicAnim *pga = &_graphicAnim[i];
if (pga->keyFrame == gd->firstFrame) {
+ uint16 frameNr = 0;
for (j = 1; j <= gd->lastFrame; ++j) {
- int16 f = pga->frame;
- if (f > 500) {
- f -= 500;
+ if (pga->frame > 500) {
+ if (pga->frame - 500 == tempFrames[j - 1]) {
+ frameNr = j + firstImage - 1 + 500;
+ }
}
- if (f == tempFrames[j - 1]) {
+ else if (pga->frame == tempFrames[j - 1]) {
frameNr = j + firstImage - 1;
- }
- if (pga->frame > 500) {
- frameNr += 500;
}
}
paf->frame = frameNr;
Index: queen.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/queen.cpp,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- queen.cpp 18 Oct 2003 17:09:13 -0000 1.18
+++ queen.cpp 19 Oct 2003 18:52:28 -0000 1.19
@@ -126,7 +126,7 @@
// XXX R_MAP();
// XXX fadeout(0,223);
}
- else if (_logic->currentRoom() == 95 && _logic->gameState(117) == 0) {
+ else if (_logic->currentRoom() == 95 && _logic->gameState(VAR_INTRO_PLAYED) == 0) {
char nextFilename[20];
_logic->roomDisplay(_logic->roomName(_logic->currentRoom()), RDM_FADE_NOJOE, 100, 2, true);
@@ -157,7 +157,7 @@
_logic->roomDisplay(_logic->roomName(_logic->currentRoom()), RDM_FADE_JOE, 100, 2, true);
Cutaway::run("c70d.cut", nextFilename, _graphics, _logic, _resource);
- _logic->gameState(117, 1);
+ _logic->gameState(VAR_INTRO_PLAYED, 1);
// XXX setupItems();
// XXX inventory();
More information about the Scummvm-git-logs
mailing list