1 files changed, 13 insertions, 15 deletions

diff --git a/engines/sludge/loadsave.cpp b/engines/sludge/loadsave.cpp
index 4cabbc79da..017be432ab 100644
--- a/engines/sludge/loadsave.cpp
+++ b/engines/sludge/loadsave.cpp
@@ -62,7 +62,6 @@ extern Floor *currentFloor;                          // In floor.cpp
 extern FILETIME fileTime;                           // In sludger.cpp
 extern byte brightnessLevel;               // "    "   "
 extern byte fadeMode;                      // In transition.cpp
-extern bool captureAllKeys;
 extern bool allowAnyFilename;
 extern uint16 saveEncoding;                 // in savedata.cpp
 
@@ -215,11 +214,11 @@ bool saveVariable(Variable *from, Common::WriteStream *stream) {
 			return saveStackRef(from->varData.theStack, stream);
 
 		case SVT_COSTUME:
-			saveCostume(from->varData.costumeHandler, stream);
+			from->varData.costumeHandler->save(stream);
 			return false;
 
 		case SVT_ANIM:
-			saveAnim(from->varData.animHandler, stream);
+			from->varData.animHandler->save(stream);
 			return false;
 
 		case SVT_NULL:
@@ -254,14 +253,14 @@ bool loadVariable(Variable *to, Common::SeekableReadStream *stream) {
 			to->varData.costumeHandler = new Persona;
 			if (!checkNew(to->varData.costumeHandler))
 				return false;
-			loadCostume(to->varData.costumeHandler, stream);
+			to->varData.costumeHandler->load(stream);
 			return true;
 
 		case SVT_ANIM:
-			to->varData.animHandler = new PersonaAnimation ;
+			to->varData.animHandler = new PersonaAnimation;
 			if (!checkNew(to->varData.animHandler))
 				return false;
-			loadAnim(to->varData.animHandler, stream);
+			to->varData.animHandler->load(stream);
 			return true;
 
 		default:
@@ -359,7 +358,7 @@ bool saveGame(const Common::String &fname) {
 	// DON'T ADD ANYTHING NEW BEFORE THIS POINT!
 
 	fp->writeByte(allowAnyFilename);
-	fp->writeByte(captureAllKeys);
+	fp->writeByte(false); // deprecated captureAllKeys
 	fp->writeByte(true);
 	g_sludge->_txtMan->saveFont(fp);
 
@@ -375,7 +374,7 @@ bool saveGame(const Common::String &fname) {
 	g_sludge->_evtMan->saveHandlers(fp);
 
 	// Save regions
-	saveRegions(fp);
+	g_sludge->_regionMan->saveRegions(fp);
 
 	g_sludge->_cursorMan->saveCursor(fp);
 
@@ -398,7 +397,7 @@ bool saveGame(const Common::String &fname) {
 		saveVariable(&globalVars[a], fp);
 	}
 
-	savePeople(fp);
+	g_sludge->_peopleMan->savePeople(fp);
 
 	if (currentFloor->numPolygons) {
 		fp->writeByte(1);
@@ -498,13 +497,12 @@ bool loadGame(const Common::String &fname) {
 	if (ssgVersion >= VERSION(1, 4)) {
 		allowAnyFilename = fp->readByte();
 	}
-	captureAllKeys = fp->readByte();
-	fp->readByte();  // updateDisplay (part of movie playing)
+	fp->readByte(); // deprecated captureAllKeys
+	fp->readByte(); // updateDisplay (part of movie playing)
 
 	g_sludge->_txtMan->loadFont(ssgVersion, fp);
 
-	killAllPeople();
-	killAllRegions();
+	g_sludge->_regionMan->kill();
 
 	int camerX = fp->readUint16BE();
 	int camerY = fp->readUint16BE();
@@ -519,7 +517,7 @@ bool loadGame(const Common::String &fname) {
 
 	g_sludge->_gfxMan->loadHSI(fp, 0, 0, true);
 	g_sludge->_evtMan->loadHandlers(fp);
-	loadRegions(fp);
+	g_sludge->_regionMan->loadRegions(fp);
 
 	if (!g_sludge->_cursorMan->loadCursor(fp)) {
 		return false;
@@ -541,7 +539,7 @@ bool loadGame(const Common::String &fname) {
 		loadVariable(&globalVars[a], fp);
 	}
 
-	loadPeople(fp);
+	g_sludge->_peopleMan->loadPeople(fp);
 
 	if (fp->readByte()) {
 		if (!setFloor(fp->readUint16BE()))