[Scummvm-cvs-logs] CVS: scummvm/scumm dialogs.cpp,1.3,1.4 scummvm.cpp,1.38,1.39 sound.cpp,1.15,1.16

[Max Horn]

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

Modified Files:
	dialogs.cpp scummvm.cpp sound.cpp 
Log Message:
some fixes for the message dialog; added some comments

Index: dialogs.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/dialogs.cpp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- dialogs.cpp	22 Sep 2002 03:53:52 -0000	1.3
+++ dialogs.cpp	26 Sep 2002 12:29:10 -0000	1.4
@@ -29,11 +29,16 @@
 #include "gui/ListWidget.h"
 #include "common/config-file.h"
 
-
-#ifdef _MSC_VER
-#	pragma warning( disable : 4068 )
-#endif
-
+
+
+#ifdef _MSC_VER
+
+#	pragma warning( disable : 4068 )
+
+#endif
+
+
+
 
 struct ResString {
 	int num;
@@ -423,10 +428,10 @@
 		_scumm->_mixer->setVolume(_soundVolumeSfx);
 		_scumm->_mixer->setMusicVolume(_soundVolumeMusic);
 		
-		scummcfg->setInt("master_volume", _soundVolumeMaster);
-		scummcfg->setInt("music_volume", _soundVolumeMusic);
-		scummcfg->setInt("sfx_volume", _soundVolumeSfx);
-		scummcfg->flush();
+		g_config->setInt("master_volume", _soundVolumeMaster);
+		g_config->setInt("music_volume", _soundVolumeMusic);
+		g_config->setInt("sfx_volume", _soundVolumeSfx);
+		g_config->flush();
 		}
 	case kCancelCmd:
 		close();

Index: scummvm.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/scummvm.cpp,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -d -r1.38 -r1.39
--- scummvm.cpp	26 Sep 2002 11:44:02 -0000	1.38
+++ scummvm.cpp	26 Sep 2002 12:29:10 -0000	1.39
@@ -45,6 +45,7 @@
 // Use g_scumm from error() ONLY
 Scumm *g_scumm = 0;
 
+extern NewGui *g_gui;
 
 void autosave(void * engine)
 {
@@ -104,7 +105,7 @@
 	_gui = new Gui();
 	_gui->init(this);
 	
-	_newgui = new NewGui(_system);
+	_newgui = g_gui;
 	_bundle = new Bundle();
 	_sound = new Sound(this);
 	_timer = Engine::_timer;
@@ -165,7 +166,6 @@
 		delete _saveLoadDialog;
 
 	delete _gui;
-	delete _newgui;
 
 	delete _bundle;
 	delete _sound;
@@ -938,14 +938,14 @@
 void Scumm::pauseDialog()
 {
 	if (!_pauseDialog) {
-#if 1
+#if 0
 	// HACK HACK
 		const char *message = "This demonstrates MessageDialog's abilities.\n"
 						      "For example it supports multi line text.\n"
-						      " \n"
+						      "\n"
 						      "Well, not much more right now, really :-)\n"
-						      "And there are still some bugs in it, too\n"
-						      " ";	// <- FIXME: This is needed due to a bug...
+						      "And there are still some bugs in it, too\n";
+						      	// <- FIXME: This is needed due to a bug...
 		_pauseDialog = new MessageDialog(_newgui, message);
 #else
 		_pauseDialog = new PauseDialog(_newgui, this);

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- sound.cpp	26 Sep 2002 09:59:47 -0000	1.15
+++ sound.cpp	26 Sep 2002 12:29:10 -0000	1.16
@@ -650,9 +650,9 @@
 	if (_scumm->_imuse) {
 		_scumm->_imuse->setBase(_scumm->res.address[rtSound]);
 
-		_sound_volume_music = scummcfg->getInt("music_volume", kDefaultMusicVolume);
-		_sound_volume_master = scummcfg->getInt("master_volume", kDefaultMasterVolume);
-		_sound_volume_sfx = scummcfg->getInt("sfx_volume", kDefaultSFXVolume);
+		_sound_volume_music = g_config->getInt("music_volume", kDefaultMusicVolume);
+		_sound_volume_master = g_config->getInt("master_volume", kDefaultMasterVolume);
+		_sound_volume_sfx = g_config->getInt("sfx_volume", kDefaultSFXVolume);
 
 		_scumm->_imuse->set_master_volume(_sound_volume_master);
 		_scumm->_imuse->set_music_volume(_sound_volume_music);