[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.77,1.78 scumm.h,1.421,1.422 vars.cpp,1.86,1.87
Travis Howell
kirben at users.sourceforge.net
Sat Jul 3 16:59:02 CEST 2004
- Previous message: [Scummvm-cvs-logs] CVS: scummex akos.cpp,NONE,1.1 akos.h,NONE,1.1 Makefile,1.11,1.12 resource.h,1.29,1.30 scummex.cpp,1.27,1.28 scummex.h,1.16,1.17 wxwindows.cpp,1.37,1.38 wxwindows.h,1.18,1.19
- Next message: [Scummvm-cvs-logs] CVS: scummex Makefile.mingw,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10528/scumm
Modified Files:
scumm.cpp scumm.h vars.cpp
Log Message:
Initialise HE 7.0 sound vars
Enable VAR_NUM_GLOBAL_OBJS
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.77
retrieving revision 1.78
diff -u -d -r1.77 -r1.78
--- scumm.cpp 3 Jul 2004 13:32:56 -0000 1.77
+++ scumm.cpp 3 Jul 2004 23:58:30 -0000 1.78
@@ -598,6 +598,12 @@
_2byteFontPtr = 0;
_V1_talkingActor = 0;
+ _heSndSoundId = 0;
+ _heSndOffset = 0;
+ _heSndTimer = 0;
+ _heSndLoop = 0;
+ _heSndSoundFreq = 0;
+
//
// Init all VARS to 0xFF
//
@@ -720,6 +726,7 @@
VAR_BLAST_ABOVE_TEXT = 0xFF;
VAR_VOICE_MODE = 0xFF;
+ VAR_NUM_GLOBAL_OBJS = 0xFF;
// Use g_scumm from error() ONLY
g_scumm = this;
@@ -1286,6 +1293,7 @@
VAR(VAR_LANGUAGE) = _language;
} else if (_version >= 7) {
VAR(VAR_V6_EMSSPACE) = 10000;
+ VAR(VAR_NUM_GLOBAL_OBJS) = _numGlobalObjects;
} else if (_heversion >= 72) {
// TODO
} else {
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.421
retrieving revision 1.422
diff -u -d -r1.421 -r1.422
--- scumm.h 29 Jun 2004 12:10:08 -0000 1.421
+++ scumm.h 3 Jul 2004 23:58:30 -0000 1.422
@@ -1261,6 +1261,7 @@
byte VAR_BLAST_ABOVE_TEXT;
byte VAR_VOICE_MODE;
+ byte VAR_NUM_GLOBAL_OBJS;
};
// This is a constant lookup table of reverse bit masks
Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -d -r1.86 -r1.87
--- vars.cpp 3 Jul 2004 10:43:40 -0000 1.86
+++ vars.cpp 3 Jul 2004 23:58:30 -0000 1.87
@@ -288,7 +288,7 @@
VAR_NEW_ROOM = 35;
VAR_WALKTO_OBJ = 36;
- //VAR_NUM_GLOBAL_OBJS = 37;
+ VAR_NUM_GLOBAL_OBJS = 37;
VAR_CAMERA_DEST_X = 38;
VAR_CAMERA_DEST_Y = 39;
- Previous message: [Scummvm-cvs-logs] CVS: scummex akos.cpp,NONE,1.1 akos.h,NONE,1.1 Makefile,1.11,1.12 resource.h,1.29,1.30 scummex.cpp,1.27,1.28 scummex.h,1.16,1.17 wxwindows.cpp,1.37,1.38 wxwindows.h,1.18,1.19
- Next message: [Scummvm-cvs-logs] CVS: scummex Makefile.mingw,1.6,1.7
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the Scummvm-git-logs
mailing list