[Scummvm-cvs-logs] CVS: scummvm/scumm scumm.h,1.36,1.37 scummvm.cpp,1.51,1.52

[Max Horn]

Update of /cvsroot/scummvm/scummvm/scumm
In directory usw-pr-cvs1:/tmp/cvs-serv7248/scumm

Modified Files:
	scumm.h scummvm.cpp 
Log Message:
allow user to load savegames while Smush movies are playing; cleanup

Index: scumm.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scumm.h,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- scumm.h	6 Oct 2002 07:23:08 -0000	1.36
+++ scumm.h	8 Oct 2002 00:29:32 -0000	1.37
@@ -381,8 +381,8 @@
 	/* _insane vars */
 
 	int _insaneFlag;
-	int _insaneState;
-	int videoFinished;
+	bool _insaneState;
+	bool _videoFinished;
 	
 	
 	void scummInit();

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -d -r1.51 -r1.52
--- scummvm.cpp	7 Oct 2002 18:36:09 -0000	1.51
+++ scummvm.cpp	8 Oct 2002 00:29:32 -0000	1.52
@@ -417,7 +417,7 @@
 			tempMusic = 0;
 			_vars[VAR_MUSIC_FLAG]++;
 		} else {
-			tempMusic ++;
+			tempMusic++;
 		}
 	}
 
@@ -1054,7 +1054,7 @@
 
 	if (_lastKeyHit == _vars[VAR_CUTSCENEEXIT_KEY]) {
 		if (_insaneState) {
-			videoFinished = 1;
+			_videoFinished = true;
 		} else
 			exitCutscene();
 	} else if (_lastKeyHit == saveloadkey && _currentRoom != 0) {
@@ -1071,23 +1071,23 @@
 		if (_sound->_sfxMode & 2)
 			stopTalk();
 		return;
-	} else if (_lastKeyHit == '[') { // [, eg volume down
+	} else if (_lastKeyHit == '[') { // [ volume down
 		_sound->_sound_volume_master-=5;
 		if (_sound->_sound_volume_master < 0)
 			_sound->_sound_volume_master = 0;
 		_imuse->set_master_volume(_sound->_sound_volume_master);
-	} else if (_lastKeyHit == ']') { // ], eg volume down
+	} else if (_lastKeyHit == ']') { // ] volume down
 		_sound->_sound_volume_master+=5;
 		if (_sound->_sound_volume_master > 128)
 			_sound->_sound_volume_master = 128;		
 		_imuse->set_master_volume(_sound->_sound_volume_master);
-	} else if (_lastKeyHit == '-') { // -, eg text speed down
+	} else if (_lastKeyHit == '-') { // - text speed down
 		_defaultTalkDelay+=5;
 		if (_defaultTalkDelay > 90)
 			_defaultTalkDelay = 90;
 
 		_vars[VAR_CHARINC] = _defaultTalkDelay / 20;
-	} else if (_lastKeyHit == '+') { // +, eg text speed up
+	} else if (_lastKeyHit == '+') { // + text speed up
 		_defaultTalkDelay-=5;
 		if (_defaultTalkDelay < 5)
 			_defaultTalkDelay = 5;