[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.108,1.109 scummvm.cpp,2.13,2.14 vars.cpp,1.12,1.13
James Brown
ender at users.sourceforge.net
Wed Dec 25 17:16:09 CET 2002
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv28742/scumm
Modified Files:
scumm.h scummvm.cpp vars.cpp
Log Message:
Don't go to the save/load screen
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.108
retrieving revision 1.109
diff -u -d -r1.108 -r1.109
--- scumm.h 26 Dec 2002 00:21:19 -0000 1.108
+++ scumm.h 26 Dec 2002 01:15:25 -0000 1.109
@@ -910,6 +910,7 @@
byte VAR_NUM_ACTOR;
byte VAR_CURRENT_LIGHTS;
byte VAR_CURRENTDRIVE;
+ byte VAR_CURRENTDISK;
byte VAR_TMR_1;
byte VAR_TMR_2;
byte VAR_TMR_3;
Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 2.13
retrieving revision 2.14
diff -u -d -r2.13 -r2.14
--- scummvm.cpp 26 Dec 2002 00:21:19 -0000 2.13
+++ scummvm.cpp 26 Dec 2002 01:15:25 -0000 2.14
@@ -357,7 +357,11 @@
} else {
_vars[VAR_V6_EMSSPACE] = 10000;
}
-}
+
+ if (_features & GF_AFTER_V8) { // Fixme: How do we deal with non-cd installs?
+ _vars[VAR_CURRENTDISK] = 1;
+ }
+}
void Scumm::checkRange(int max, int min, int no, const char *str)
{
Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- vars.cpp 26 Dec 2002 01:03:48 -0000 1.12
+++ vars.cpp 26 Dec 2002 01:15:25 -0000 1.13
@@ -220,6 +220,7 @@
VAR_CAMERA_DEST_Y = 12;
VAR_ROOM = 31;
+ VAR_CURRENTDISK = 42;
VAR_ENTRY_SCRIPT = 51;
VAR_ENTRY_SCRIPT2 = 52;
More information about the Scummvm-git-logs
mailing list