From f223de1e59f8da89d06ae157bddd5b4f17e79acc Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Thu, 16 Aug 2001 14:25:52 +0000
Subject: [PATCH]

---
 source/memcard/saveload.cpp | 2 ++
 source/memcard/saveload.h   | 2 +-
 source/sound/sound.cpp      | 3 +--
 source/sound/sound.h        | 1 +
 4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/source/memcard/saveload.cpp b/source/memcard/saveload.cpp
index b904e60f8..751f00ab9 100644
--- a/source/memcard/saveload.cpp
+++ b/source/memcard/saveload.cpp
@@ -457,6 +457,7 @@ void CSaveLoadDatabase::createData()
 	m_dataBuffer.m_systemDetails.m_screenOffY=VidGetYOfs();
 	for(i=0;i<=CSoundMediator::NUM_VOLUMETYPESTOSAVE;i++)
 	{
+PAUL_DBGMSG("createData:  %d=%d",i,CSoundMediator::getVolume((CSoundMediator::VOLUMETYPE)i));
 		m_dataBuffer.m_systemDetails.m_volumes[i]=CSoundMediator::getVolume((CSoundMediator::VOLUMETYPE)i);
 	}
 	m_dataBuffer.m_systemDetails.m_controlStyle=CPadConfig::getConfig();;
@@ -485,6 +486,7 @@ void CSaveLoadDatabase::restoreData(int _loadSettingsOnly)
 	VidSetXYOfs(m_dataBuffer.m_systemDetails.m_screenOffX,m_dataBuffer.m_systemDetails.m_screenOffY);
 	for(i=0;i<=CSoundMediator::NUM_VOLUMETYPESTOSAVE;i++)
 	{
+PAUL_DBGMSG("restoreData:  %d=%d",i,m_dataBuffer.m_systemDetails.m_volumes[i]);
 		CSoundMediator::setVolume((CSoundMediator::VOLUMETYPE)i,m_dataBuffer.m_systemDetails.m_volumes[i]);
 	}
 	CPadConfig::setConfig(m_dataBuffer.m_systemDetails.m_controlStyle);
diff --git a/source/memcard/saveload.h b/source/memcard/saveload.h
index 13e74e8f6..c94bf514d 100644
--- a/source/memcard/saveload.h
+++ b/source/memcard/saveload.h
@@ -92,7 +92,7 @@ private:
 
 	enum
 	{
-		SAVELOAD_HEADERID=4,
+		SAVELOAD_HEADERID=5,
 	};
 
 
diff --git a/source/sound/sound.cpp b/source/sound/sound.cpp
index 8b26084bf..35149f069 100644
--- a/source/sound/sound.cpp
+++ b/source/sound/sound.cpp
@@ -370,8 +370,7 @@ void CSoundMediator::initialise()
 		s_targetVolume[i]=INITIAL_VOLUME;
 		s_volumeDirty[i]=true;
 	}
-//	s_targetVolume[VOL_SONG]=INITIAL_VOLUME-32;
-	s_targetVolume[VOL_SPEECH]=INITIAL_VOLUME+64;
+	s_targetVolume[VOL_SPEECH]=INITIAL_SPEECH_VOLUME;
 
 	ASSERT(CXAStream::MIN_VOLUME==0);			// Just incase someone decides to change any of these.. things in here will break ( PKG )
 	ASSERT(CXAStream::MAX_VOLUME==32767);
diff --git a/source/sound/sound.h b/source/sound/sound.h
index 12c4a2875..b42e455b3 100644
--- a/source/sound/sound.h
+++ b/source/sound/sound.h
@@ -251,6 +251,7 @@ private:
 	{
 		VOLUME_CHANGE_SPEED=2,
 		INITIAL_VOLUME=192,
+		INITIAL_SPEECH_VOLUME=255,
 	};
 
 					CSoundMediator()			{;}