[Scummvm-cvs-logs] CVS: scummvm/scumm intern.h,2.389,2.390 script_v80he.cpp,2.77,2.78 scumm.cpp,1.358,1.359

kirben kirben at users.sourceforge.net
Fri Mar 11 20:05:45 CET 2005


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

Modified Files:
	intern.h script_v80he.cpp scumm.cpp 
Log Message:

Missing pop


Index: intern.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/intern.h,v
retrieving revision 2.389
retrieving revision 2.390
diff -u -d -r2.389 -r2.390
--- intern.h	10 Mar 2005 11:06:36 -0000	2.389
+++ intern.h	12 Mar 2005 04:05:25 -0000	2.390
@@ -647,7 +647,7 @@
 	Win32ResExtractor *_win32ResExtractor;
 	MacResExtractor *_macResExtractor;
 
-	int _heSndSoundFreq, _heSndOffset, _heSndChannel, _heSndSoundId, _heSndFlags;
+	int _heSndSoundFreq, _heSndOffset, _heSndChannel, _heSndSoundId, _heSndFlags, _heSBNGId;
 
 public:
 	ScummEngine_v70he(GameDetector *detector, OSystem *syst, const ScummGameSettings &gs, uint8 md5sum[16]);

Index: script_v80he.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/script_v80he.cpp,v
retrieving revision 2.77
retrieving revision 2.78
diff -u -d -r2.77 -r2.78
--- script_v80he.cpp	11 Mar 2005 01:10:02 -0000	2.77
+++ script_v80he.cpp	12 Mar 2005 04:05:25 -0000	2.78
@@ -380,17 +380,20 @@
 
 	switch (subOp) {
 	case 27:
-		pop();
 		//loadSBNG(_heSBNGId, pop();
+		pop();
 		break;
 	case 217:
 		//loadSBNG(_heSBNGId, -1);
 		break;
 	case 232:
-		//_heSBNGId = pop();
+		_heSBNGId = pop();
+		break;
+	case 255:
+		// dummy case
 		break;
 	default:
-		warning("o80_loadSBNG: default case %d", subOp);
+		error("o80_loadSBNG: default case %d", subOp);
 	}
 	debug(1,"o80_loadSBNG stub (%d)",subOp);
 }

Index: scumm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.cpp,v
retrieving revision 1.358
retrieving revision 1.359
diff -u -d -r1.358 -r1.359
--- scumm.cpp	12 Mar 2005 00:47:15 -0000	1.358
+++ scumm.cpp	12 Mar 2005 04:05:26 -0000	1.359
@@ -1175,6 +1175,7 @@
 	_heSndChannel = 0;
 	_heSndFlags = 0;
 	_heSndSoundFreq = 0;
+	_heSBNGId = 0;
 }
 
 #pragma mark -





More information about the Scummvm-git-logs mailing list