From bb4f8b88faa81cde614961db9b44e9ac45c0de2e Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Mon, 2 Jul 2001 16:03:27 +0000
Subject: [PATCH]

---
 source/frontend/options.cpp | 25 ++++++++++++++++++-------
 source/frontend/options.h   |  1 +
 2 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/source/frontend/options.cpp b/source/frontend/options.cpp
index dc1aec0e6..6a12d4029 100644
--- a/source/frontend/options.cpp
+++ b/source/frontend/options.cpp
@@ -446,13 +446,7 @@ void CFrontEndOptions::init()
 		}
 	}
 
-	m_bgmVolume=CSoundMediator::getVolume(CSoundMediator::VOL_SONG);
-	m_sfxVolume=CSoundMediator::getVolume(CSoundMediator::VOL_SFX);
-	m_speechVolume=CSoundMediator::getVolume(CSoundMediator::VOL_SPEECH);
-	m_controlStyle=CPadConfig::getConfig();
-	m_vibrationStatus=m_lastVibrationStatus=PadGetVibrationIsTurnedOn(0);
-	m_screenXOff=VidGetXOfs();
-	m_screenYOff=VidGetYOfs();
+	getValues();
 
 	m_saveLoadDatabase=NULL;
 }
@@ -740,6 +734,7 @@ void CFrontEndOptions::think(int _frames)
 					int stat=m_saveLoadDatabase->getLoadStatus();
 					if(stat==CSaveLoadDatabase::FINISHED_OK)
 					{
+						getValues();
 						setLoadMode(LOADMODE__LOADOK);
 					}
 					else if(stat==CSaveLoadDatabase::FAILED)
@@ -815,6 +810,22 @@ CFrontEndScene::FrontEndMode CFrontEndOptions::getNextMode()
 	return CFrontEndScene::MODE__MAIN_TITLES;
 }
 
+/*----------------------------------------------------------------------
+	Function:
+	Purpose:
+	Params:
+	Returns:
+  ---------------------------------------------------------------------- */
+void	CFrontEndOptions::getValues()
+{
+	m_bgmVolume=CSoundMediator::getVolume(CSoundMediator::VOL_SONG);
+	m_sfxVolume=CSoundMediator::getVolume(CSoundMediator::VOL_SFX);
+	m_speechVolume=CSoundMediator::getVolume(CSoundMediator::VOL_SPEECH);
+	m_controlStyle=CPadConfig::getConfig();
+	m_vibrationStatus=m_lastVibrationStatus=PadGetVibrationIsTurnedOn(0);
+	m_screenXOff=VidGetXOfs();
+	m_screenYOff=VidGetYOfs();
+}
 
 /*----------------------------------------------------------------------
 	Function:
diff --git a/source/frontend/options.h b/source/frontend/options.h
index f0f6a8bbf..7cd44e427 100644
--- a/source/frontend/options.h
+++ b/source/frontend/options.h
@@ -52,6 +52,7 @@ public:
 
 
 private:
+	void	getValues();
 	void	setLoadMode(int _newMode);