[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.cpp,1.186,1.187 scumm.h,1.474,1.475 vars.cpp,1.99,1.100
Travis Howell
kirben at users.sourceforge.net
Fri Sep 10 05:33:11 CEST 2004
Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1314/scumm
Modified Files:
scumm.cpp scumm.h vars.cpp
Log Message:
Add HE vars
Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -d -r1.186 -r1.187
--- scumm.cpp 10 Sep 2004 03:36:39 -0000 1.186
+++ scumm.cpp 10 Sep 2004 10:38:56 -0000 1.187
@@ -822,6 +822,10 @@
VAR_MUSIC_BUNDLE_LOADED = 0xFF;
VAR_VOICE_BUNDLE_LOADED = 0xFF;
+ VAR_NUM_SOUND_CHANNELS = 0xFF;
+ VAR_MUSIC_CHANNEL = 0xFF;
+ VAR_SOUND_CHANNEL = 0xFF;
+
VAR_NUM_ROOMS = 0xFF;
VAR_NUM_SCRIPTS = 0xFF;
VAR_NUM_SOUNDS = 0xFF;
@@ -829,7 +833,7 @@
VAR_NUM_IMAGES = 0xFF;
VAR_NUM_CHARSETS = 0xFF;
VAR_NUM_GLOBAL_OBJS = 0xFF;
- VAR_NUM_SOUND_CHANNELS = 0xFF;
+ VAR_NUM_SPRITES = 0xFF;
VAR_WINDOWS_VERSION = 0xFF;
// Use g_scumm from error() ONLY
@@ -1413,21 +1417,24 @@
} else if (_version >= 7) {
VAR(VAR_V6_EMSSPACE) = 10000;
VAR(VAR_NUM_GLOBAL_OBJS) = _numGlobalObjects - 1;
- } else if (_heversion >= 72) {
+ } else if (_heversion >= 71) {
VAR(VAR_NUM_SOUND_CHANNELS) = 3;
+ VAR(VAR_MUSIC_CHANNEL) = 1;
+ VAR(VAR_SOUND_CHANNEL) = 2;
- VAR(VAR_NUM_ROOMS) = _numRooms - 1;
- VAR(VAR_NUM_SCRIPTS) = _numScripts - 1;
- VAR(VAR_NUM_SOUNDS) = _numSounds - 1;
- VAR(VAR_NUM_COSTUMES) = _numCostumes - 1;
- VAR(VAR_NUM_IMAGES) = _numImages - 1;
- VAR(VAR_NUM_CHARSETS) = _numCharsets - 1;
- VAR(VAR_NUM_GLOBAL_OBJS) = _numGlobalObjects - 1;
-
+ if (_heversion >= 72) {
+ VAR(VAR_NUM_ROOMS) = _numRooms - 1;
+ VAR(VAR_NUM_SCRIPTS) = _numScripts - 1;
+ VAR(VAR_NUM_SOUNDS) = _numSounds - 1;
+ VAR(VAR_NUM_COSTUMES) = _numCostumes - 1;
+ VAR(VAR_NUM_IMAGES) = _numImages - 1;
+ VAR(VAR_NUM_CHARSETS) = _numCharsets - 1;
+ VAR(VAR_NUM_GLOBAL_OBJS) = _numGlobalObjects - 1;
+ }
if (_heversion >= 80)
VAR(VAR_WINDOWS_VERSION) = 40;
- } else if (_heversion >= 70) {
- VAR(VAR_NUM_SOUND_CHANNELS) = 3;
+ if (_heversion >= 90)
+ VAR(VAR_NUM_SPRITES) = _numSprites - 1;
} else {
VAR(VAR_CURRENTDRIVE) = 0;
switch (_midiDriver) {
Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.474
retrieving revision 1.475
diff -u -d -r1.474 -r1.475
--- scumm.h 8 Sep 2004 05:58:36 -0000 1.474
+++ scumm.h 10 Sep 2004 10:38:56 -0000 1.475
@@ -1301,6 +1301,10 @@
byte VAR_MUSIC_BUNDLE_LOADED;
byte VAR_VOICE_BUNDLE_LOADED;
+ byte VAR_NUM_SOUND_CHANNELS;
+ byte VAR_MUSIC_CHANNEL;
+ byte VAR_SOUND_CHANNEL;
+
byte VAR_NUM_ROOMS;
byte VAR_NUM_SCRIPTS;
byte VAR_NUM_SOUNDS;
@@ -1308,7 +1312,7 @@
byte VAR_NUM_IMAGES;
byte VAR_NUM_CHARSETS;
byte VAR_NUM_GLOBAL_OBJS;
- byte VAR_NUM_SOUND_CHANNELS;
+ byte VAR_NUM_SPRITES;
byte VAR_WINDOWS_VERSION;
};
Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.99
retrieving revision 1.100
diff -u -d -r1.99 -r1.100
--- vars.cpp 10 Sep 2004 09:22:31 -0000 1.99
+++ vars.cpp 10 Sep 2004 10:39:10 -0000 1.100
@@ -37,7 +37,6 @@
VAR_MACHINE_SPEED = 6;
VAR_ME = 7;
VAR_NUM_ACTOR = 8;
- VAR_CURRENTDRIVE = 10;
VAR_TMR_1 = 11;
VAR_TMR_2 = 12;
VAR_TMR_3 = 13;
@@ -166,10 +165,13 @@
VAR_V6_EMSSPACE = 76;
VAR_RANDOM_NR = 118;
- if (_heversion >= 70)
+ if (_heversion >= 70) {
VAR_NUM_SOUND_CHANNELS = 9;
- else
+ VAR_SOUND_CHANNEL = 10;
+ VAR_MUSIC_CHANNEL = 14;
+ } else {
VAR_V6_SOUNDMODE = 9;
+ }
VAR_TIMEDATE_YEAR = 119;
VAR_TIMEDATE_MONTH = 129;
@@ -229,8 +231,8 @@
VAR_CHARINC = 48;
VAR_TALK_ACTOR = 49;
VAR_LAST_SOUND = 50;
- //VAR_SOUND_CHANNEL = 51;
- //VAR_MUSIC_CHANNEL = 52;
+ VAR_SOUND_CHANNEL = 51;
+ VAR_MUSIC_CHANNEL = 52;
VAR_NUM_SOUND_CHANNELS = 56;
VAR_MEMORY_PERFORMANCE = 57;
@@ -253,9 +255,10 @@
VAR_NUM_CHARSETS = 73;
VAR_NUM_GLOBAL_OBJS = 74;
- if (_heversion >= 80) {
+ if (_heversion >= 80)
VAR_WINDOWS_VERSION = 79;
- }
+ if (_heversion >= 90)
+ VAR_NUM_SPRITES = 106;
}
void ScummEngine_v7::setupScummVars() {
More information about the Scummvm-git-logs
mailing list