[Scummvm-cvs-logs] CVS: scummvm/queen logic.cpp,1.208,1.209
Gregory Montoir
cyx at users.sourceforge.net
Mon Oct 18 12:16:06 CEST 2004
Update of /cvsroot/scummvm/scummvm/queen
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5580/queen
Modified Files:
logic.cpp
Log Message:
minor changes
Index: logic.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/queen/logic.cpp,v
retrieving revision 1.208
retrieving revision 1.209
diff -u -d -r1.208 -r1.209
--- logic.cpp 17 Oct 2004 19:00:09 -0000 1.208
+++ logic.cpp 18 Oct 2004 19:15:00 -0000 1.209
@@ -154,7 +154,7 @@
_numFurniture = READ_BE_UINT16(ptr); ptr += 2;
_furnitureData = new FurnitureData[_numFurniture + 1];
- memset(&_furnitureData[0], 0, sizeof(_furnitureData));
+ memset(&_furnitureData[0], 0, sizeof(FurnitureData));
for (i = 1; i <= _numFurniture; i++) {
_furnitureData[i].readFromBE(ptr);
}
@@ -194,11 +194,11 @@
uint32 size;
char *buf = (char *)_vm->resource()->loadFile("QUEEN2.JAS", 0, &size);
- LineReader *queen2jas = new LineReader(buf, size);
+ LineReader queen2jas(buf, size);
_objDescription.push_back("");
for (i = 1; i <= _numDescriptions; i++) {
- _objDescription.push_back(queen2jas->nextLine());
+ _objDescription.push_back(queen2jas.nextLine());
}
// Patch for German text bug
@@ -208,22 +208,22 @@
_objName.push_back("");
for (i = 1; i <= _numNames; i++) {
- _objName.push_back(queen2jas->nextLine());
+ _objName.push_back(queen2jas.nextLine());
}
_roomName.push_back("");
for (i = 1; i <= _numRooms; i++) {
- _roomName.push_back(queen2jas->nextLine());
+ _roomName.push_back(queen2jas.nextLine());
}
_verbName.push_back("");
for (i = 1; i <= 12; i++) {
- _verbName.push_back(queen2jas->nextLine());
+ _verbName.push_back(queen2jas.nextLine());
}
_joeResponse.push_back("");
for (i = 1; i <= JOE_RESPONSE_MAX; i++) {
- _joeResponse.push_back(queen2jas->nextLine());
+ _joeResponse.push_back(queen2jas.nextLine());
}
// FIXME - the spanish version adds some space characters (0x20) at the
@@ -237,20 +237,18 @@
_aAnim.push_back("");
for (i = 1; i <= _numAAnim; i++) {
- _aAnim.push_back(queen2jas->nextLine());
+ _aAnim.push_back(queen2jas.nextLine());
}
_aName.push_back("");
for (i = 1; i <= _numAName; i++) {
- _aName.push_back(queen2jas->nextLine());
+ _aName.push_back(queen2jas.nextLine());
}
_aFile.push_back("");
for (i = 1; i <= _numAFile; i++) {
- _aFile.push_back(queen2jas->nextLine());
+ _aFile.push_back(queen2jas.nextLine());
}
-
- delete queen2jas;
_vm->command()->clear(false);
_scene = 0;
@@ -730,7 +728,7 @@
}
frame = 37;
} else if ((joeFacing() == DIR_LEFT && joePrevFacing() == DIR_RIGHT)
- || (joeFacing() == DIR_RIGHT && joePrevFacing() == DIR_LEFT)) {
+ || (joeFacing() == DIR_RIGHT && joePrevFacing() == DIR_LEFT)) {
pbs->frameNum = 36;
_vm->update();
}
@@ -1070,7 +1068,7 @@
realObject->name = ABS(realObject->name);
- if (fromState == -1)
+ if (fromState == -1)
dummyObject->name = -ABS(dummyObject->name);
for (int i = 1; i <= _numWalkOffs; i++) {
@@ -1837,7 +1835,7 @@
void Logic::asmAttemptPuzzle() {
++_puzzleAttemptCount;
- if (_puzzleAttemptCount & 4) {
+ if (_puzzleAttemptCount == 4) {
makeJoeSpeak(226, true);
_puzzleAttemptCount = 0;
}
More information about the Scummvm-git-logs
mailing list