[Scummvm-cvs-logs] CVS: scummvm/scumm script_v6he.cpp,2.152,2.153
kirben
kirben at users.sourceforge.net
Sat Apr 16 03:43:30 CEST 2005
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.430,1.431 script_v7he.cpp,2.145,2.146
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v6he.cpp,2.153,2.154 script_v7he.cpp,2.146,2.147 script_v80he.cpp,2.94,2.95 wiz_he.cpp,2.57,2.58
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17095/scumm
Modified Files:
script_v6he.cpp
Log Message:
Cleanup
Index: script_v6he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v6he.cpp,v
retrieving revision 2.152
retrieving revision 2.153
diff -u -d -r2.152 -r2.153
--- script_v6he.cpp 12 Apr 2005 02:29:50 -0000 2.152
+++ script_v6he.cpp 16 Apr 2005 10:42:19 -0000 2.153
@@ -34,6 +34,7 @@
#include "scumm/resource.h"
#include "scumm/scumm.h"
#include "scumm/sound.h"
+#include "scumm/usage_bits.h"
#include "scumm/util.h"
#include "scumm/verbs.h"
@@ -409,13 +410,12 @@
putState(obj, state);
if (_heversion >= 72)
removeObjectFromDrawQue(obj);
- return;
+ } else {
+ putState(obj, state);
+ markObjectRectAsDirty(obj);
+ if (_bgNeedsRedraw)
+ clearDrawObjectQueue();
}
-
- putState(obj, state);
- markObjectRectAsDirty(obj);
- if (_bgNeedsRedraw)
- clearDrawObjectQueue();
}
void ScummEngine_v60he::o60_roomOps() {
@@ -567,14 +567,12 @@
void ScummEngine_v60he::swapObjects(int object1, int object2) {
int idx1 = -1, idx2 = -1;
- if (_numObjectsInRoom >= 0) { // how could it be negative?
- for (int i = 0; i < _numObjectsInRoom; i++) {
- if (_objs[i].obj_nr == object1)
- idx1 = i;
+ for (int i = 0; i < _numObjectsInRoom; i++) {
+ if (_objs[i].obj_nr == object1)
+ idx1 = i;
- if (_objs[i].obj_nr == object2)
- idx2 = i;
- }
+ if (_objs[i].obj_nr == object2)
+ idx2 = i;
}
if (idx1 == -1 || idx2 == -1 || idx1 >= idx2)
@@ -816,7 +814,7 @@
void ScummEngine_v60he::virtScreenLoad(int resIdx, int x1, int y1, int x2, int y2) {
vsUnpackCtx ctx;
memset(&ctx, 0, sizeof(ctx));
- VirtScreen &vs = virtscr[kMainVirtScreen]; // XXX gdi_virtScreen = 0;
+ VirtScreen &vs = virtscr[kMainVirtScreen];
ArrayHeader *ah = (ArrayHeader *)getResourceAddress(rtString, resIdx);
virtScreenLoadUnpack(&ctx, ah->data);
@@ -832,7 +830,7 @@
}
}
}
- markRectAsDirty(kMainVirtScreen, x1, x2, y1, y2 + 1); // XXX , 0x4000);
+ markRectAsDirty(kMainVirtScreen, x1, x2, y1, y2 + 1, USAGE_BIT_RESTORED);
}
uint8 virtScreenLoadUnpack(vsUnpackCtx *ctx, byte *data) {
@@ -890,7 +888,7 @@
int ScummEngine_v60he::virtScreenSave(byte *dst, int x1, int y1, int x2, int y2) {
int packedSize = 0;
- VirtScreen &vs = virtscr[kMainVirtScreen]; // XXX gdi_virtScreen = 0;
+ VirtScreen &vs = virtscr[kMainVirtScreen];
for (int j = y1; j <= y2; ++j) {
uint8 *p = vs.getBackPixels(x1, j - vs.topline);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v6.cpp,1.430,1.431 script_v7he.cpp,2.145,2.146
- Next message: [Scummvm-cvs-logs] CVS: scummvm/scumm script_v6he.cpp,2.153,2.154 script_v7he.cpp,2.146,2.147 script_v80he.cpp,2.94,2.95 wiz_he.cpp,2.57,2.58
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list