[Scummvm-cvs-logs] CVS: scummvm/scumm scummvm.cpp,2.386,2.387
Max Horn
fingolfin at users.sourceforge.net
Fri Sep 12 12:16:25 CEST 2003
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/bs2 maketext.cpp,1.6,1.7 mouse.cpp,1.9,1.10 protocol.cpp,1.6,1.7 resman.cpp,1.20,1.21 resman.h,1.1,1.2
- Next message: [Scummvm-cvs-logs] CVS: tools descumm6.cpp,1.115,1.116
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv24467
Modified Files:
scummvm.cpp
Log Message:
oops
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.386
retrieving revision 2.387
diff -u -d -r2.386 -r2.387
--- scummvm.cpp 11 Sep 2003 10:32:14 -0000 2.386
+++ scummvm.cpp 11 Sep 2003 13:02:13 -0000 2.387
@@ -1948,29 +1948,30 @@
else
loadRoomObjects();
- if (!(_features & GF_NEW_CAMERA)) {
- camera._mode = CM_NORMAL;
- camera._cur.x = camera._dest.x = _screenWidth / 2;
- camera._cur.y = camera._dest.y = _screenHeight / 2;
+ if (_version > 2) {
+
+ if (VAR_V6_SCREEN_WIDTH != 0xFF && VAR_V6_SCREEN_HEIGHT != 0xFF) {
+ VAR(VAR_V6_SCREEN_WIDTH) = _roomWidth;
+ VAR(VAR_V6_SCREEN_HEIGHT) = _roomHeight;
+ }
+
+ if (_features & GF_NEW_CAMERA) {
+ VAR(VAR_CAMERA_MIN_Y) = _screenHeight / 2;
+ VAR(VAR_CAMERA_MAX_Y) = _roomHeight - (_screenHeight / 2);
+ setCameraAt(_screenWidth / 2, _screenHeight / 2);
+ } else {
+ camera._mode = CM_NORMAL;
+ camera._cur.x = camera._dest.x = _screenWidth / 2;
+ camera._cur.y = camera._dest.y = _screenHeight / 2;
+ }
}
- if (VAR_V6_SCREEN_WIDTH != 0xFF && VAR_V6_SCREEN_HEIGHT != 0xFF) {
- VAR(VAR_V6_SCREEN_WIDTH) = _roomWidth;
- VAR(VAR_V6_SCREEN_HEIGHT) = _roomHeight;
- }
+ if (_roomResource == 0)
+ return;
VAR(VAR_CAMERA_MIN_X) = _screenWidth / 2;
VAR(VAR_CAMERA_MAX_X) = _roomWidth - (_screenWidth / 2);
- if (_features & GF_NEW_CAMERA) {
- VAR(VAR_CAMERA_MIN_Y) = _screenHeight / 2;
- VAR(VAR_CAMERA_MAX_Y) = _roomHeight - (_screenHeight / 2);
- setCameraAt(_screenWidth / 2, _screenHeight / 2);
- }
-
- if (_roomResource == 0)
- return;
-
memset(gfxUsageBits, 0, sizeof(gfxUsageBits));
if (a) {
@@ -1991,8 +1992,9 @@
runEntryScript();
if (_version <= 2)
runScript(5, 0, 0, 0);
-
- if (_version < 7) {
+ else if (_version <= 4 && _version <= 6) {
+ // FIXME: The check above maybe should only trigger for V5&V6 games (i.e. not
+ // for V4). More investigation (ASM) needed. See also o5_loadRoomWithEgo().
if (a && !_egoPositioned) {
int x, y;
getObjectXYPos(objectNr, x, y);
- Previous message: [Scummvm-cvs-logs] CVS: scummvm/bs2 maketext.cpp,1.6,1.7 mouse.cpp,1.9,1.10 protocol.cpp,1.6,1.7 resman.cpp,1.20,1.21 resman.h,1.1,1.2
- Next message: [Scummvm-cvs-logs] CVS: tools descumm6.cpp,1.115,1.116
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list