[Scummvm-cvs-logs] CVS: scummvm script.cpp,1.63,1.64 actor.cpp,1.82,1.83 akos.cpp,1.25,1.26 object.cpp,1.75,1.76 verbs.cpp,1.28,1.29 string.cpp,1.47,1.48
Max Horn
fingolfin at users.sourceforge.net
Sun Jul 7 13:22:02 CEST 2002
- Previous message: [Scummvm-cvs-logs] CVS: scummvm .indent.pro,1.1,1.2
- Next message: [Scummvm-cvs-logs] CVS: scummvm sys.cpp,1.15,1.16 2xsai.cpp,1.6,1.7 boxes.cpp,1.32,1.33 saveload.cpp,1.53,1.54 costume.cpp,1.35,1.36 debug.cpp,1.30,1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm
In directory usw-pr-cvs1:/tmp/cvs-serv13341
Modified Files:
script.cpp actor.cpp akos.cpp object.cpp verbs.cpp string.cpp
Log Message:
indent run
Index: script.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/script.cpp,v
retrieving revision 1.63
retrieving revision 1.64
diff -u -d -r1.63 -r1.64
--- script.cpp 7 Jul 2002 13:14:34 -0000 1.63
+++ script.cpp 7 Jul 2002 20:21:41 -0000 1.64
@@ -80,8 +80,7 @@
ss = &vm.slot[1];
for (i = 1; i < NUM_SCRIPT_SLOT; i++, ss++) {
- if (script != ss->number ||
- ss->where != WIO_GLOBAL && ss->where != WIO_LOCAL || ss->status == 0)
+ if (script != ss->number || ss->where != WIO_GLOBAL && ss->where != WIO_LOCAL || ss->status == 0)
continue;
if (ss->cutsceneOverride)
@@ -99,8 +98,7 @@
num = _numNestedScripts;
do {
- if (nest->number == script
- && (nest->where == WIO_GLOBAL || nest->where == WIO_LOCAL)) {
+ if (nest->number == script && (nest->where == WIO_GLOBAL || nest->where == WIO_LOCAL)) {
nest->number = 0xFF;
nest->slot = 0xFF;
nest->where = 0xFF;
@@ -122,8 +120,7 @@
for (i = 1; i < NUM_SCRIPT_SLOT; i++, ss++) {
if (script == ss->number && (ss->where == WIO_ROOM ||
- ss->where == WIO_INVENTORY
- || ss->where == WIO_FLOBJECT)
+ ss->where == WIO_INVENTORY || ss->where == WIO_FLOBJECT)
&& ss->status != 0) {
if (ss->cutsceneOverride)
error("Object %d stopped with active cutscene/override", script);
@@ -142,8 +139,7 @@
do {
if (nest->number == script &&
- (nest->where == WIO_ROOM || nest->where == WIO_FLOBJECT
- || nest->where == WIO_INVENTORY)) {
+ (nest->where == WIO_ROOM || nest->where == WIO_FLOBJECT || nest->where == WIO_INVENTORY)) {
nest->number = 0xFF;
nest->slot = 0xFF;
nest->where = 0xFF;
@@ -250,8 +246,7 @@
case WIO_FLOBJECT: /* flobject script */
idx = getObjectIndex(ss->number);
- _scriptOrgPointer =
- getResourceAddress(rtFlObject, _objs[idx].fl_object_index);
+ _scriptOrgPointer = getResourceAddress(rtFlObject, _objs[idx].fl_object_index);
_lastCodePtr = &_baseFLObject[ss->number];
break;
default:
@@ -276,8 +271,7 @@
_opcode = fetchScriptByte();
_scriptPointerStart = _scriptPointer;
vm.slot[_currentScript].didexec = 1;
- debug(8, "Script %d: [%X] %s()", vm.slot[_currentScript].number, _opcode,
- _opcodes_lookup[_opcode]);
+ debug(8, "Script %d: [%X] %s()", vm.slot[_currentScript].number, _opcode, _opcodes_lookup[_opcode]);
op = getOpcode(_opcode);
(this->*op) ();
}
@@ -368,8 +362,7 @@
if ((_varwatch == (int)var) || (_varwatch == 0)) {
if (vm.slot[_currentScript].number < 100)
- debug(0, "vars[%d] = %d (via script-%d)", var, value,
- vm.slot[_currentScript].number);
+ debug(0, "vars[%d] = %d (via script-%d)", var, value, vm.slot[_currentScript].number);
else
debug(0, "vars[%d] = %d (via room-%d-%d)", var, value, _currentRoom,
vm.slot[_currentScript].number);
@@ -383,8 +376,7 @@
/* FIXME: Enable Indy4 mousefighting by default.
is there a better place to put this? */
- if (_gameId == GID_INDY4 && var == 107
- && vm.slot[_currentScript].number == 1)
+ if (_gameId == GID_INDY4 && var == 107 && vm.slot[_currentScript].number == 1)
value = 1;
if (value)
@@ -466,9 +458,7 @@
if (color == -1) {
if (vs->number != 0)
error("can only copy bg to main window");
- bgbuff =
- getResourceAddress(rtBuffer,
- vs->number + 5) + vs->xstart + (y - top) * 320 + x;
+ bgbuff = getResourceAddress(rtBuffer, vs->number + 5) + vs->xstart + (y - top) * 320 + x;
blit(backbuff, bgbuff, x2 - x, y2 - y);
} else {
count = y2 - y;
@@ -498,8 +488,7 @@
}
} else {
if (ss->cutsceneOverride) {
- warning("Script %d ending with active cutscene/override (%d)",
- ss->number, ss->cutsceneOverride);
+ warning("Script %d ending with active cutscene/override (%d)", ss->number, ss->cutsceneOverride);
ss->cutsceneOverride = 0;
}
}
@@ -536,8 +525,7 @@
int i;
for (i = 1; i < NUM_SCRIPT_SLOT; i++) {
- if (_currentScript != i && vm.slot[i].status != ssDead
- && (vm.slot[i].unk1 == 0 || flag >= 0x80)) {
+ if (_currentScript != i && vm.slot[i].status != ssDead && (vm.slot[i].unk1 == 0 || flag >= 0x80)) {
vm.slot[i].status |= 0x80;
vm.slot[i].freezeCount++;
}
@@ -578,8 +566,7 @@
_currentScript = 0xFF;
for (_curExecScript = 0; _curExecScript < NUM_SCRIPT_SLOT; _curExecScript++) {
- if (vm.slot[_curExecScript].status == ssRunning
- && vm.slot[_curExecScript].didexec == 0) {
+ if (vm.slot[_curExecScript].status == ssRunning && vm.slot[_curExecScript].didexec == 0) {
_currentScript = (char)_curExecScript;
getScriptBaseAddress();
getScriptEntryPoint();
@@ -636,13 +623,11 @@
for (i = 1; i < NUM_SCRIPT_SLOT; i++, ss++) {
if (ss->where == WIO_ROOM || ss->where == WIO_FLOBJECT) {
if (ss->cutsceneOverride)
- error("Object %d stopped with active cutscene/override in exit",
- ss->number);
+ error("Object %d stopped with active cutscene/override in exit", ss->number);
ss->status = 0;
} else if (ss->where == WIO_LOCAL) {
if (ss->cutsceneOverride)
- error("Script %d stopped with active cutscene/override in exit",
- ss->number);
+ error("Script %d stopped with active cutscene/override in exit", ss->number);
ss->status = 0;
}
}
@@ -675,8 +660,7 @@
if (isScriptInUse(_vars[VAR_SENTENCE_SCRIPT])) {
ss = vm.slot;
for (i = 0; i < NUM_SCRIPT_SLOT; i++, ss++)
- if (ss->number == _vars[VAR_SENTENCE_SCRIPT] && ss->status != 0
- && ss->freezeCount == 0)
+ if (ss->number == _vars[VAR_SENTENCE_SCRIPT] && ss->status != 0 && ss->freezeCount == 0)
return;
}
@@ -686,8 +670,7 @@
_sentenceNum--;
if (!(_features & GF_AFTER_V7))
- if (sentence[_sentenceNum].unk2
- && sentence[_sentenceNum].unk3 == sentence[_sentenceNum].unk4)
+ if (sentence[_sentenceNum].unk2 && sentence[_sentenceNum].unk3 == sentence[_sentenceNum].unk4)
return;
_localParamList[0] = sentence[_sentenceNum].unk5;
@@ -815,15 +798,13 @@
void Scumm::push(int a)
{
- assert(_scummStackPos >= 0
- && (unsigned int)_scummStackPos <= ARRAYSIZE(_scummStack));
+ assert(_scummStackPos >= 0 && (unsigned int)_scummStackPos <= ARRAYSIZE(_scummStack));
_scummStack[_scummStackPos++] = a;
}
int Scumm::pop()
{
- assert(_scummStackPos > 0
- && (unsigned int)_scummStackPos <= ARRAYSIZE(_scummStack));
+ assert(_scummStackPos > 0 && (unsigned int)_scummStackPos <= ARRAYSIZE(_scummStack));
return _scummStack[--_scummStackPos];
}
@@ -859,8 +840,7 @@
int scr = _currentScript;
vm.slot[scr].cutsceneOverride++;
- if (++vm.cutSceneStackPointer >
- sizeof(vm.cutSceneData) / sizeof(vm.cutSceneData[0]))
+ if (++vm.cutSceneStackPointer > sizeof(vm.cutSceneData) / sizeof(vm.cutSceneData[0]))
error("Cutscene stack overflow");
vm.cutSceneData[vm.cutSceneStackPointer] = args[0];
@@ -903,8 +883,7 @@
int i;
ScriptSlot *ss = vm.slot;
for (i = 0; i < NUM_SCRIPT_SLOT; i++, ss++)
- if (ss->number == script
- && (ss->where == WIO_GLOBAL || ss->where == WIO_LOCAL) && ss->status)
+ if (ss->number == script && (ss->where == WIO_GLOBAL || ss->where == WIO_LOCAL) && ss->status)
return true;
return false;
}
Index: actor.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/actor.cpp,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- actor.cpp 7 Jul 2002 19:31:50 -0000 1.82
+++ actor.cpp 7 Jul 2002 20:21:42 -0000 1.83
@@ -515,7 +515,7 @@
needBgReset = true;
}
-void Scumm::putActor(Actor * a, int dstX, int dstY, byte room)
+void Scumm::putActor(Actor *a, int dstX, int dstY, byte room)
{
if (a->visible && _currentRoom != room && _vars[VAR_TALK_ACTOR] == a->number) {
clearMsgQueue();
@@ -547,7 +547,7 @@
}
}
-int Scumm::getActorXYPos(Actor * a)
+int Scumm::getActorXYPos(Actor *a)
{
if (!a)
return -1;
Index: akos.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/akos.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- akos.cpp 7 Jul 2002 19:31:50 -0000 1.25
+++ akos.cpp 7 Jul 2002 20:21:42 -0000 1.26
@@ -24,7 +24,7 @@
#include "actor.h"
#include "akos.h"
-bool Scumm::akos_hasManyDirections(Actor * a)
+bool Scumm::akos_hasManyDirections(Actor *a)
{
if (_features & GF_NEW_COSTUMES) {
byte *akos;
@@ -39,7 +39,7 @@
return 0;
}
-int Scumm::akos_frameToAnim(Actor * a, int frame)
+int Scumm::akos_frameToAnim(Actor *a, int frame)
{
if (akos_hasManyDirections(a))
return toSimpleDir(1, a->facing) + frame * 8;
@@ -47,7 +47,7 @@
return newDirToOldDir(a->facing) + frame * 4;
}
-void Scumm::akos_decodeData(Actor * a, int frame, uint usemask)
+void Scumm::akos_decodeData(Actor *a, int frame, uint usemask)
{
uint anim;
byte *akos, *r;
@@ -153,7 +153,7 @@
codec = READ_LE_UINT16(&akhd->codec);
}
-void AkosRenderer::setFacing(Actor * a)
+void AkosRenderer::setFacing(Actor *a)
{
mirror = (Scumm::newDirToOldDir(a->facing) != 0 || akhd->flags & 1);
if (a->flip)
@@ -786,8 +786,7 @@
#if 0
- switch (((byte)y_clipping << 3) | ((byte)use_scaling << 2) |
- ((byte)masking << 1) | (byte)charsetmask) {
+ switch (((byte)y_clipping << 3) | ((byte)use_scaling << 2) | ((byte)masking << 1) | (byte)charsetmask) {
case 0:
akos_c1_0_decode(this);
break;
@@ -923,7 +922,7 @@
}
-bool Scumm::akos_increaseAnims(byte *akos, Actor * a)
+bool Scumm::akos_increaseAnims(byte *akos, Actor *a)
{
byte *aksq, *akfo;
int i;
@@ -948,7 +947,7 @@
#define GUW(o) READ_LE_UINT16(aksq+curpos+(o))
#define GB(o) aksq[curpos+(o)]
-bool Scumm::akos_increaseAnim(Actor * a, int chan, byte *aksq, uint16 *akfo, int numakfo)
+bool Scumm::akos_increaseAnim(Actor *a, int chan, byte *aksq, uint16 *akfo, int numakfo)
{
byte active;
uint old_curpos, curpos, end;
@@ -1175,7 +1174,7 @@
return curpos != old_curpos;
}
-void Scumm::akos_queCommand(byte cmd, Actor * a, int param_1, int param_2)
+void Scumm::akos_queCommand(byte cmd, Actor *a, int param_1, int param_2)
{
// warning("akos_queCommand(%d,%d,%d,%d)", cmd, a->number, param_1, param_2);
}
Index: object.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/object.cpp,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -d -r1.75 -r1.76
--- object.cpp 3 Jul 2002 23:35:50 -0000 1.75
+++ object.cpp 7 Jul 2002 20:21:42 -0000 1.76
@@ -26,8 +26,7 @@
bool Scumm::getClass(int obj, int cls)
{
- checkRange(_numGlobalObjects - 1, 0, obj,
- "Object %d out of range in getClass");
+ checkRange(_numGlobalObjects - 1, 0, obj, "Object %d out of range in getClass");
cls &= 0x7F;
checkRange(32, 1, cls, "Class %d out of range in getClass");
@@ -43,8 +42,7 @@
void Scumm::putClass(int obj, int cls, bool set)
{
- checkRange(_numGlobalObjects - 1, 0, obj,
- "Object %d out of range in putClass");
+ checkRange(_numGlobalObjects - 1, 0, obj, "Object %d out of range in putClass");
cls &= 0x7F;
checkRange(32, 1, cls, "Class %d out of range in getClass");
@@ -65,38 +63,33 @@
int Scumm::getOwner(int obj)
{
- checkRange(_numGlobalObjects - 1, 0, obj,
- "Object %d out of range in getOwner");
+ checkRange(_numGlobalObjects - 1, 0, obj, "Object %d out of range in getOwner");
return _objectOwnerTable[obj];
}
void Scumm::putOwner(int obj, int owner)
{
- checkRange(_numGlobalObjects - 1, 0, obj,
- "Object %d out of range in putOwner");
+ checkRange(_numGlobalObjects - 1, 0, obj, "Object %d out of range in putOwner");
checkRange(0xFF, 0, owner, "Owner %d out of range in putOwner");
_objectOwnerTable[obj] = owner;
}
int Scumm::getState(int obj)
{
- checkRange(_numGlobalObjects - 1, 0, obj,
- "Object %d out of range in getState");
+ checkRange(_numGlobalObjects - 1, 0, obj, "Object %d out of range in getState");
return _objectStateTable[obj];
}
void Scumm::putState(int obj, int state)
{
- checkRange(_numGlobalObjects - 1, 0, obj,
- "Object %d out of range in putState");
+ checkRange(_numGlobalObjects - 1, 0, obj, "Object %d out of range in putState");
checkRange(0xFF, 0, state, "State %d out of range in putState");
_objectStateTable[obj] = state;
}
int Scumm::getObjectRoom(int obj)
{
- checkRange(_numGlobalObjects - 1, 0, obj,
- "Object %d out of range in getObjectRoom");
+ checkRange(_numGlobalObjects - 1, 0, obj, "Object %d out of range in getObjectRoom");
return _objectRoomTable[obj];
}
@@ -152,9 +145,7 @@
return -1;
case WIO_INVENTORY:
if (_objectOwnerTable[object] < NUM_ACTORS)
- return
- getActorXYPos(derefActorSafe
- (_objectOwnerTable[object], "getObjectOrActorXY(2)"));
+ return getActorXYPos(derefActorSafe(_objectOwnerTable[object], "getObjectOrActorXY(2)"));
else
return 0xFF;
}
@@ -189,11 +180,11 @@
assert(ptr);
imhd = (ImageHeader *)findResourceData(MKID('IMHD'), ptr);
if (_features & GF_AFTER_V7) {
- x = od->x_pos + (int16) READ_LE_UINT16(&imhd->v7.hotspot[state].x);
- y = od->y_pos + (int16) READ_LE_UINT16(&imhd->v7.hotspot[state].y);
+ x = od->x_pos + (int16)READ_LE_UINT16(&imhd->v7.hotspot[state].x);
+ y = od->y_pos + (int16)READ_LE_UINT16(&imhd->v7.hotspot[state].y);
} else {
- x = od->x_pos + (int16) READ_LE_UINT16(&imhd->old.hotspot[state].x);
- y = od->y_pos + (int16) READ_LE_UINT16(&imhd->old.hotspot[state].y);
+ x = od->x_pos + (int16)READ_LE_UINT16(&imhd->old.hotspot[state].x);
+ y = od->y_pos + (int16)READ_LE_UINT16(&imhd->old.hotspot[state].y);
}
} else {
x = od->walk_x;
@@ -224,8 +215,7 @@
if (b < NUM_ACTORS)
actb = derefActorSafe(b, "getObjActToObjActDist(2)");
- if (acta && actb && acta->getRoom() == actb->getRoom() && acta->getRoom() &&
- !acta->isInCurrentRoom())
+ if (acta && actb && acta->getRoom() == actb->getRoom() && acta->getRoom() && !acta->isInCurrentRoom())
return 0;
if (getObjectOrActorXY(a) == -1)
@@ -347,8 +337,7 @@
width = od->width >> 3;
height = od->height &= 0xF8; // Ender
- if (width == 0 || xpos > _screenEndStrip
- || xpos + width < _screenStartStrip)
+ if (width == 0 || xpos > _screenEndStrip || xpos + width < _screenStartStrip)
return;
if (od->fl_object_index) {
@@ -386,8 +375,7 @@
byte flags = Gdi::dbAllowMaskOr;
if (_features & GF_AFTER_V7 && getClass(od->obj_nr, 22))
flags |= Gdi::dbDrawMaskOnBoth;
- gdi.drawBitmap(ptr, _curVirtScreen, x, ypos, height, x - xpos, numstrip,
- flags);
+ gdi.drawBitmap(ptr, _curVirtScreen, x, ypos, height, x - xpos, numstrip, flags);
}
}
@@ -529,8 +517,7 @@
setupRoomObject(od, room);
}
- CHECK_HEAP
-}
+CHECK_HEAP}
void Scumm::setupRoomObject(ObjectData *od, byte *room)
{
@@ -567,8 +554,7 @@
return;
}
- cdhd = (CodeHeader *)findResourceData(MKID('CDHD'),
- room + od->offs_obcd_to_room);
+ cdhd = (CodeHeader *)findResourceData(MKID('CDHD'), room + od->offs_obcd_to_room);
if (_features & GF_AFTER_V7)
od->obj_nr = READ_LE_UINT16(&(cdhd->v7.obj_id));
else if (_features & GF_AFTER_V6)
@@ -580,8 +566,8 @@
if (_features & GF_AFTER_V6) {
od->width = READ_LE_UINT16(&cdhd->v6.w);
od->height = READ_LE_UINT16(&cdhd->v6.h);
- od->x_pos = ((int16) READ_LE_UINT16(&cdhd->v6.x));
- od->y_pos = ((int16) READ_LE_UINT16(&cdhd->v6.y));
+ od->x_pos = ((int16)READ_LE_UINT16(&cdhd->v6.x));
+ od->y_pos = ((int16)READ_LE_UINT16(&cdhd->v6.y));
if (cdhd->v6.flags == 0x80) {
od->parentstate = 1;
} else {
@@ -608,9 +594,7 @@
od->parent = cdhd->v7.parent;
od->parentstate = cdhd->v7.parentstate;
- imhd =
- (ImageHeader *)findResourceData(MKID('IMHD'),
- room + od->offs_obim_to_room);
+ imhd = (ImageHeader *)findResourceData(MKID('IMHD'), room + od->offs_obim_to_room);
od->x_pos = READ_LE_UINT16(&imhd->v7.x_pos);
od->y_pos = READ_LE_UINT16(&imhd->v7.y_pos);
od->width = READ_LE_UINT16(&imhd->v7.width);
@@ -706,8 +690,7 @@
void Scumm::addObjectToDrawQue(int object)
{
_drawObjectQue[_drawObjectQueNr++] = object;
- if ((unsigned int)_drawObjectQueNr >
- sizeof(_drawObjectQue) / sizeof(_drawObjectQue[0]))
+ if ((unsigned int)_drawObjectQueNr > sizeof(_drawObjectQue) / sizeof(_drawObjectQue[0]))
error("Draw Object Que overflow");
}
@@ -780,8 +763,7 @@
if (_objs[i].obj_nr == obj) {
if (_objs[i].fl_object_index)
return getResourceAddress(rtFlObject, _objs[i].fl_object_index) + 8;
- return getResourceAddress(rtRoom,
- _roomResource) + _objs[i].offs_obcd_to_room;
+ return getResourceAddress(rtRoom, _roomResource) + _objs[i].offs_obcd_to_room;
}
}
}
@@ -821,8 +803,7 @@
CHECK_HEAP}
-void Scumm::findObjectInRoom(FindObjectInRoom * fo, byte findWhat, uint id,
- uint room)
+void Scumm::findObjectInRoom(FindObjectInRoom *fo, byte findWhat, uint id, uint room)
{
CodeHeader *cdhd;
int i, numobj;
@@ -835,8 +816,7 @@
if (findWhat & foCheckAlreadyLoaded && getObjectIndex(id) != -1) {
fo->obcd = obcdptr = getOBCDFromObject(id);
assert((byte *)obcdptr > (byte *)256);
- fo->obim = obimptr =
- obcdptr + READ_BE_UINT32_UNALIGNED(&((ResHdr *)obcdptr)->size);
+ fo->obim = obimptr = obcdptr + READ_BE_UINT32_UNALIGNED(&((ResHdr *)obcdptr)->size);
fo->cdhd = (CodeHeader *)findResourceData(MKID('CDHD'), obcdptr);
fo->imhd = (ImageHeader *)findResourceData(MKID('IMHD'), obimptr);
return;
@@ -856,8 +836,7 @@
if (numobj == 0)
error("findObjectInRoom: No object found in room %d", room);
if (numobj > _numLocalObjects)
- error("findObjectInRoom: More (%d) than %d objects in room %d", numobj,
- _numLocalObjects, room);
+ error("findObjectInRoom: More (%d) than %d objects in room %d", numobj, _numLocalObjects, room);
if (findWhat & foCodeHeader) {
searchptr = roomptr;
@@ -923,8 +902,7 @@
}
}
if (++i == numobj)
- error("findObjectInRoom: Object %d image not found in room %d", id,
- room);
+ error("findObjectInRoom: Object %d image not found in room %d", id, room);
searchptr = NULL;
}
}
@@ -1077,8 +1055,7 @@
return b;
}
-int Scumm::getDistanceBetween(bool is_obj_1, int b, int c, bool is_obj_2,
- int e, int f)
+int Scumm::getDistanceBetween(bool is_obj_1, int b, int c, bool is_obj_2, int e, int f)
{
int i, j;
int x, y;
@@ -1123,8 +1100,7 @@
if (room == (uint) - 1)
room = getObjectRoom(img);
- findObjectInRoom(&foir, foCodeHeader | foImageHeader | foCheckAlreadyLoaded,
- img, room);
+ findObjectInRoom(&foir, foCodeHeader | foImageHeader | foCheckAlreadyLoaded, img, room);
if (_features & GF_AFTER_V7)
setCursorHotspot2(READ_LE_UINT16(&foir.imhd->v7.hotspot[0].x),
@@ -1172,8 +1148,8 @@
}
}
-void Scumm::enqueueObject(int objectNumber, int objectX, int objectY, int objectWidth, int objectHeight, int f, int g,
- int image, int mode)
+void Scumm::enqueueObject(int objectNumber, int objectX, int objectY, int objectWidth,
+ int objectHeight, int f, int g, int image, int mode)
{
BlastObject *eo;
ObjectData *od;
@@ -1221,7 +1197,7 @@
}
-void Scumm::drawBlastObject(BlastObject * eo)
+void Scumm::drawBlastObject(BlastObject *eo)
{
VirtScreen *vs;
byte *bomp, *ptr, *img;
@@ -1232,11 +1208,11 @@
_lastXstart = vs->xstart;
- checkRange(_numGlobalObjects - 1, 30, eo->number, "Illegal Blast object %d");
+ checkRange(_numGlobalObjects - 1, 30, eo->number, "Illegal Blast object %d");
idx = _objs[getObjectIndex(eo->number)].fl_object_index;
- if(idx) {
+ if (idx) {
ptr = getResourceAddress(rtFlObject, idx);
ptr = findResource(MKID('OBIM'), ptr);
} else {
@@ -1244,18 +1220,18 @@
assert(idx != -1);
ptr = getResourceAddress(1, _roomResource) + _objs[idx].offs_obim_to_room;
}
- if(!ptr)
- error("BlastObject object %d image not found",eo->number);
+ if (!ptr)
+ error("BlastObject object %d image not found", eo->number);
img = findResource(IMxx_tags[eo->image], ptr);
- if(!img)
- img = findResource(IMxx_tags[1], ptr); // Backward compatibility with samnmax blast objects
- if(!img)
- error("blast-object %d invalid image %d (1-x)",eo->number,eo->image);
+ if (!img)
+ img = findResource(IMxx_tags[1], ptr); // Backward compatibility with samnmax blast objects
+ if (!img)
+ error("blast-object %d invalid image %d (1-x)", eo->number, eo->image);
bomp = findResourceData(MKID('BOMP'), img);
- if(!bomp)
- error("object %d is not a blast object",eo->number);
+ if (!bomp)
+ error("object %d is not a blast object", eo->number);
bdd.srcwidth = READ_LE_UINT16(&((BompHeader *)bomp)->width);
bdd.srcheight = READ_LE_UINT16(&((BompHeader *)bomp)->height);
@@ -1270,8 +1246,7 @@
bdd.scale_y = (unsigned char)eo->unk4;
drawBomp(&bdd, 0, bdd.dataptr, 1, 0);
- updateDirtyRect(vs->number, bdd.x, bdd.x + bdd.srcwidth, bdd.y,
- bdd.y + bdd.srcheight, 0);
+ updateDirtyRect(vs->number, bdd.x, bdd.x + bdd.srcwidth, bdd.y, bdd.y + bdd.srcheight, 0);
}
void Scumm::removeBlastObjects()
@@ -1287,7 +1262,7 @@
clearEnqueue();
}
-void Scumm::removeBlastObject(BlastObject * eo)
+void Scumm::removeBlastObject(BlastObject *eo)
{
restoreBG(eo->posX, eo->posY, eo->posX + eo->width, eo->posY + eo->height);
}
Index: verbs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/verbs.cpp,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -d -r1.28 -r1.29
--- verbs.cpp 27 Jun 2002 10:40:37 -0000 1.28
+++ verbs.cpp 7 Jul 2002 20:21:42 -0000 1.29
@@ -53,8 +53,7 @@
runInputScript(4, _mouseButStat, 1);
} else if (_mouseButStat & MBS_MOUSE_MASK) {
byte code = _mouseButStat & MBS_LEFT_CLICK ? 1 : 2;
- if (mouse.y >= virtscr[0].topline
- && mouse.y < virtscr[0].topline + virtscr[0].height) {
+ if (mouse.y >= virtscr[0].topline && mouse.y < virtscr[0].topline + virtscr[0].height) {
over = checkMouseOver(mouse.x, mouse.y);
if (over != 0) {
runInputScript(1, _verbs[over].verbid, code);
@@ -63,12 +62,12 @@
runInputScript(2, 0, code);
} else {
over = checkMouseOver(mouse.x, mouse.y);
-
+
// FIXME For the future: Indy3 and under inv scrolling
/*
- if (over >= 31 && over <= 36)
- over += _inventoryOffset;
- */
+ if (over >= 31 && over <= 36)
+ over += _inventoryOffset;
+ */
runInputScript(1, over != 0 ? _verbs[over].verbid : 0, code);
}
}
@@ -97,8 +96,7 @@
vs = &_verbs[i];
do {
- if (vs->curmode != 1 || !vs->verbid || vs->saveid ||
- y < vs->y || y >= vs->bottom)
+ if (vs->curmode != 1 || !vs->verbid || vs->saveid || y < vs->y || y >= vs->bottom)
continue;
if (vs->center) {
if (x < -(vs->right - vs->x - vs->x) || x >= vs->right)
@@ -145,9 +143,9 @@
// FIXME For the future: Indy3 and under inv scrolling
/*
- if (vrb >= 31 && vrb <= 36)
- vrb += _inventoryOffset;
- */
+ if (vrb >= 31 && vrb <= 36)
+ vrb += _inventoryOffset;
+ */
_messagePtr = getResourceAddress(rtVerb, vrb);
if (!_messagePtr)
@@ -240,7 +238,7 @@
vst = &_verbs[vrb];
vst->right = vst->x + imgw * 8 - 1;
- vst->bottom = vst->y + imgh * 8 - 1;
+ vst->bottom = vst->y + imgh * 8 - 1;
vst->oldleft = vst->x;
vst->oldright = vst->right;
vst->oldtop = vst->y;
Index: string.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/string.cpp,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -d -r1.47 -r1.48
--- string.cpp 1 Jul 2002 02:18:01 -0000 1.47
+++ string.cpp 7 Jul 2002 20:21:42 -0000 1.48
@@ -171,9 +171,7 @@
uint32 a, b;
a = buffer[2] | (buffer[3] << 8) | (buffer[6] << 16) | (buffer[7] << 24);
- b =
- buffer[10] | (buffer[11] << 8) | (buffer[14] << 16) | (buffer[15] <<
- 24);
+ b = buffer[10] | (buffer[11] << 8) | (buffer[14] << 16) | (buffer[15] << 24);
// if (_saveSound != 1)
talkSound(a, b, 1);
}
@@ -206,8 +204,7 @@
return;
if (!(_features & GF_AFTER_V7)) {
- if ((camera._dest.x >> 3) != (camera._cur.x >> 3) ||
- camera._cur.x != camera._last.x)
+ if ((camera._dest.x >> 3) != (camera._cur.x >> 3) || camera._cur.x != camera._last.x)
return;
}
@@ -221,8 +218,7 @@
if (_vars[VAR_V5_TALK_STRING_Y] < 0) {
s = (a->scaley * (int)_vars[VAR_V5_TALK_STRING_Y]) / 0xFF;
- string[0].ypos =
- ((_vars[VAR_V5_TALK_STRING_Y] - s) >> 1) + s - a->elevation + a->y;
+ string[0].ypos = ((_vars[VAR_V5_TALK_STRING_Y] - s) >> 1) + s - a->elevation + a->y;
} else {
string[0].ypos = _vars[VAR_V5_TALK_STRING_Y];
}
@@ -401,14 +397,11 @@
} else if (c == 10) {
uint32 tmpA, tmpB;
- tmpA =
- buffer[0] | (buffer[1] << 8) | (buffer[4] << 16) | (buffer[5] << 24);
- tmpB =
- buffer[8] | (buffer[9] << 8) | (buffer[12] << 16) | (buffer[13] <<
- 24);
+ tmpA = buffer[0] | (buffer[1] << 8) | (buffer[4] << 16) | (buffer[5] << 24);
+ tmpB = buffer[8] | (buffer[9] << 8) | (buffer[12] << 16) | (buffer[13] << 24);
talkSound(tmpA, tmpB, 2);
buffer += 14;
-
+
// Set flag that speech variant exist of this msg
if (_haveMsg == 0xFF)
_haveMsg = 0xFE;
@@ -422,8 +415,7 @@
charset._colorMap[i] = _charsetData[charset._curId][i - 12];
else
charset._colorMap[i] = _charsetData[charset._curId][i];
- charset._ypos2 -=
- getResourceAddress(rtCharset, charset._curId)[30] - oldy;
+ charset._ypos2 -= getResourceAddress(rtCharset, charset._curId)[30] - oldy;
} else if (c == 12) {
int color;
color = *buffer++;
@@ -594,7 +586,7 @@
} else {
if (a == 1 && (_features & GF_AFTER_V6))
- if(string[a].no_talk_anim==0)
+ if (string[a].no_talk_anim == 0)
charset._blitAlso = true;
if (_features & GF_OLD256)
charset.printCharOld(chr);
@@ -800,8 +792,7 @@
unsigned int buffer = 0, mask = 0, x = 0, y = 0;
unsigned char color;
- _vm->checkRange(_vm->_maxCharsets - 1, 0, _curId,
- "Printing with bad charset %d");
+ _vm->checkRange(_vm->_maxCharsets - 1, 0, _curId, "Printing with bad charset %d");
if ((vs = _vm->findVirtScreen(_top)) == NULL)
return;
@@ -818,8 +809,7 @@
}
char_ptr = _vm->getResourceAddress(rtCharset, _curId) + 224 + (chr + 1) * 8;
dest_ptr = vs->screenPtr + vs->xstart + (_top - vs->topline) * 320 + _left;
- _vm->updateDirtyRect(vs->number, _left, _left + 8, _top - vs->topline,
- _top - vs->topline + 8, 0);
+ _vm->updateDirtyRect(vs->number, _left, _left + 8, _top - vs->topline, _top - vs->topline + 8, 0);
for (y = 0; y < 8; y++) {
for (x = 0; x < 8; x++) {
@@ -849,8 +839,7 @@
int d, right;
VirtScreen *vs;
- _vm->checkRange(_vm->_maxCharsets - 1, 1, _curId,
- "Printing with bad charset %d");
+ _vm->checkRange(_vm->_maxCharsets - 1, 1, _curId, "Printing with bad charset %d");
if ((vs = _vm->findVirtScreen(_top)) == NULL)
return;
@@ -943,8 +932,7 @@
_hasMask = true;
#endif
- _dest_ptr = _backbuff_ptr = vs->screenPtr
- + vs->xstart + _drawTop * 320 + _left;
+ _dest_ptr = _backbuff_ptr = vs->screenPtr + vs->xstart + _drawTop * 320 + _left;
#if !defined(OLD)
if (_blitAlso) {
- Previous message: [Scummvm-cvs-logs] CVS: scummvm .indent.pro,1.1,1.2
- Next message: [Scummvm-cvs-logs] CVS: scummvm sys.cpp,1.15,1.16 2xsai.cpp,1.6,1.7 boxes.cpp,1.32,1.33 saveload.cpp,1.53,1.54 costume.cpp,1.35,1.36 debug.cpp,1.30,1.31
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list