[Scummvm-cvs-logs] CVS: scummvm/scumm script_v72he.cpp,2.208,2.209 scumm.cpp,1.344,1.345 scumm.h,1.536,1.537 vars.cpp,1.116,1.117

kirben kirben at users.sourceforge.net
Wed Mar 2 15:14:54 CET 2005


Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv28926/scumm

Modified Files:
	script_v72he.cpp scumm.cpp scumm.h vars.cpp 
Log Message:

Add two more VARs for HE89+
Minor cleanup


Index: script_v72he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v72he.cpp,v
retrieving revision 2.208
retrieving revision 2.209
diff -u -d -r2.208 -r2.209
--- script_v72he.cpp	2 Mar 2005 08:42:42 -0000	2.208
+++ script_v72he.cpp	2 Mar 2005 23:14:05 -0000	2.209
@@ -1620,9 +1620,7 @@
 	writeVar(0, 0);
 	ArrayHeader *ah = defineArray(0, kByteArray, 0, 0, 0, size);
 
-	size = (FROM_LE_32(ah->dim1end) - FROM_LE_32(ah->dim1start) + 1) *
-		(FROM_LE_32(ah->dim2end) - FROM_LE_32(ah->dim2start) + 1);
-	_hFileTable[slot].read(ah->data, size);
+	_hFileTable[slot].read(ah->data, size + 1);
 
 	return readVar(0);
 }

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.344
retrieving revision 1.345
diff -u -d -r1.344 -r1.345
--- scumm.cpp	2 Mar 2005 21:46:50 -0000	1.344
+++ scumm.cpp	2 Mar 2005 23:14:06 -0000	1.345
@@ -967,6 +967,7 @@
 	VAR_MUSIC_BUNDLE_LOADED = 0xFF;
 	VAR_VOICE_BUNDLE_LOADED = 0xFF;
 
+	VAR_NUM_ACTIVE_SOUND_CHANNELS = 0xFF;
 	VAR_NUM_SOUND_CHANNELS = 0xFF;
 	VAR_MUSIC_CHANNEL = 0xFF;
 	VAR_SOUND_CHANNEL = 0xFF;
@@ -981,6 +982,7 @@
 	VAR_NUM_IMAGES = 0xFF;
 	VAR_NUM_CHARSETS = 0xFF;
 	VAR_NUM_GLOBAL_OBJS = 0xFF;
+	VAR_NUM_SPRITE_GROUPS = 0xFF;
 	VAR_NUM_SPRITES = 0xFF;
 	VAR_NUM_PALETTES = 0xFF;
 	VAR_NUM_UNK = 0xFF;

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.536
retrieving revision 1.537
diff -u -d -r1.536 -r1.537
--- scumm.h	28 Feb 2005 13:23:10 -0000	1.536
+++ scumm.h	2 Mar 2005 23:14:06 -0000	1.537
@@ -1293,6 +1293,7 @@
 	byte VAR_MUSIC_BUNDLE_LOADED;
 	byte VAR_VOICE_BUNDLE_LOADED;
 
+	byte VAR_NUM_ACTIVE_SOUND_CHANNELS;
 	byte VAR_NUM_SOUND_CHANNELS;
 	byte VAR_MUSIC_CHANNEL;
 	byte VAR_SOUND_CHANNEL;
@@ -1307,6 +1308,7 @@
 	byte VAR_NUM_IMAGES;
 	byte VAR_NUM_CHARSETS;
 	byte VAR_NUM_GLOBAL_OBJS;
+	byte VAR_NUM_SPRITE_GROUPS;
 	byte VAR_NUM_SPRITES;
 	byte VAR_NUM_PALETTES;
 	byte VAR_NUM_UNK;

Index: vars.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/vars.cpp,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- vars.cpp	2 Mar 2005 21:46:51 -0000	1.116
+++ vars.cpp	2 Mar 2005 23:14:06 -0000	1.117
@@ -265,9 +265,12 @@
 		VAR_WINDOWS_VERSION = 79;
 		VAR_KEY_STATE = 86;
 	if (_heversion >= 90) {
+		VAR_NUM_ACTIVE_SOUND_CHANNELS = 88;
+
 		VAR_SCRIPT_CYCLE = 103;
 		VAR_NUM_SCRIPT_CYCLES = 104;
 
+		VAR_NUM_SPRITE_GROUPS = 105;
 		VAR_NUM_SPRITES = 106;
 		VAR_WIZ_TCOLOR = 117;
 	}
@@ -511,10 +514,14 @@
 		if (_heversion >= 80)
 			VAR(VAR_WINDOWS_VERSION) = 40;
 		if (_heversion >= 90) {
+			VAR(VAR_NUM_ACTIVE_SOUND_CHANNELS) = 8;
+
 			VAR(VAR_SCRIPT_CYCLE) = 1;
 			VAR(VAR_NUM_SCRIPT_CYCLES) = 1;
-			VAR(VAR_WIZ_TCOLOR) = 5;
+
+			VAR(VAR_NUM_SPRITE_GROUPS) = MAX(64, _numSprites / 4) - 1;
 			VAR(VAR_NUM_SPRITES) = _numSprites - 1;
+			VAR(VAR_WIZ_TCOLOR) = 5;
 		}
 		if (_heversion >= 99) {
 			VAR(VAR_NUM_PALETTES) = _numPalettes;





More information about the Scummvm-git-logs mailing list