From 2237dbd79b53abb643452b1ef3576a5c07d23397 Mon Sep 17 00:00:00 2001
From: Paul <paul@localhost>
Date: Mon, 16 Jul 2001 21:39:50 +0000
Subject: [PATCH]

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

diff --git a/source/memcard/saveload.cpp b/source/memcard/saveload.cpp
index cd182a039..bf373b610 100644
--- a/source/memcard/saveload.cpp
+++ b/source/memcard/saveload.cpp
@@ -455,7 +455,7 @@ void CSaveLoadDatabase::createData()
 	// System details
 	m_dataBuffer.m_systemDetails.m_screenOffX=VidGetXOfs();
 	m_dataBuffer.m_systemDetails.m_screenOffY=VidGetYOfs();
-	for(i=0;i<CSoundMediator::NUM_VOLUMETYPES;i++)
+	for(i=0;i<CSoundMediator::NUM_VOLUMETYPESTOSAVE;i++)
 	{
 		m_dataBuffer.m_systemDetails.m_volumes[i]=CSoundMediator::getVolume((CSoundMediator::VOLUMETYPE)i);
 	}
@@ -483,7 +483,7 @@ void CSaveLoadDatabase::restoreData()
 
 	// System details
 	VidSetXYOfs(m_dataBuffer.m_systemDetails.m_screenOffX,m_dataBuffer.m_systemDetails.m_screenOffY);
-	for(i=0;i<CSoundMediator::NUM_VOLUMETYPES;i++)
+	for(i=0;i<CSoundMediator::NUM_VOLUMETYPESTOSAVE;i++)
 	{
 		CSoundMediator::setVolume((CSoundMediator::VOLUMETYPE)i,m_dataBuffer.m_systemDetails.m_volumes[i]);
 	}
diff --git a/source/memcard/saveload.h b/source/memcard/saveload.h
index 0554fe1b8..78065cfb0 100644
--- a/source/memcard/saveload.h
+++ b/source/memcard/saveload.h
@@ -41,7 +41,7 @@
 struct SaveLoad_SystemDetails
 {
 	char						m_screenOffX,m_screenOffY;
-	unsigned char				m_volumes[CSoundMediator::NUM_VOLUMETYPES];
+	unsigned char				m_volumes[CSoundMediator::NUM_VOLUMETYPESTOSAVE];
 	unsigned char				m_controlStyle,m_vibrationIsTurnedOn;
 	unsigned char				m_language;
 };
@@ -92,7 +92,7 @@ private:
 
 	enum
 	{
-		SAVELOAD_HEADERID=2,
+		SAVELOAD_HEADERID=3,
 	};
 
 
diff --git a/source/sound/sound.h b/source/sound/sound.h
index 4f84f4df8..6d8b834dc 100644
--- a/source/sound/sound.h
+++ b/source/sound/sound.h
@@ -169,6 +169,7 @@ public:
 		VOL_FADE,
 
 		NUM_VOLUMETYPES,
+		NUM_VOLUMETYPESTOSAVE=VOL_SPEECH,
 	};
 
 	typedef enum