Merged revisions 33188-33189,33191-33193,33196,33198,33202-33203,33206,33210,33212,33218-33220,33222,33224-33226,33229-33243,33246,33248-33250,33252,33258-33261,33263,33266,33270,33272-33283,33285,33287-33290,33295-33298,33321,33325-33330,33332-33335,33337-33340,33342,33345,33347,33349-33350,33352-33357,33359-33367,33369-33371,33373,33375-33377,33379-33380,33383-33385,33387-33389,33392-33394,33400-33402,33404-33405,33407-33410,33412-33416,33418-33419,33425-33427,33432,33436-33438,33444,33446,33452-33453,33455-33459,33463-33464,33466-33471,33473-33474,33478,33490,33492,33495-33496,33509-33512,33518-33519,33522-33527,33529-33530,33537,33541,33544,33546,33550,33552-33554,33556,33558,33561-33562,33565,33568,33570,33574,33576,33578-33581,33584-33587,33590,33596,33604-33611,33614-33615,33617-33618,33620-33621 via svnmerge from

https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk
 

svn-id: r33624

3 files changed, 10 insertions, 7 deletions

diff --git a/engines/agos/agos.cpp b/engines/agos/agos.cpp
index 6e04ca284b..7d03156bb6 100644
--- a/engines/agos/agos.cpp
+++ b/engines/agos/agos.cpp
@@ -577,6 +577,8 @@ int AGOSEngine::init() {
 
 
 		_midiEnabled = true;
+	} else {
+		_driver = NULL;
 	}
 
 	// allocate buffers
@@ -880,7 +882,8 @@ AGOSEngine::~AGOSEngine() {
 		delete _gameFile;
 
 	_midi.close();
-	delete _driver;
+	if (_driver)
+		delete _driver;
 
 	AudioCD.destroy();
 
diff --git a/engines/agos/debug.cpp b/engines/agos/debug.cpp
index 76a0b8e76f..2cf285d56a 100644
--- a/engines/agos/debug.cpp
+++ b/engines/agos/debug.cpp
@@ -393,11 +393,11 @@ static const byte bmp_hdr[] = {
 };
 
 void dumpBMP(const char *filename, int w, int h, const byte *bytes, const uint32 *palette) {
-	Common::File out;
+	Common::DumpFile out;
 	byte my_hdr[sizeof(bmp_hdr)];
 	int i;
 
-	out.open(filename, Common::File::kFileWriteMode);
+	out.open(filename);
 	if (!out.isOpen())
 		return;
 
diff --git a/engines/agos/saveload.cpp b/engines/agos/saveload.cpp
index 34e5f2cfeb..4a5c43e706 100644
--- a/engines/agos/saveload.cpp
+++ b/engines/agos/saveload.cpp
@@ -75,7 +75,7 @@ int AGOSEngine::countSaveGames() {
 }
 
 char *AGOSEngine::genSaveName(int slot) {
-	static char buf[15];
+	static char buf[20];
 
 	if (getGameId() == GID_DIMP) {
 		sprintf(buf, "dimp.sav");
@@ -111,7 +111,7 @@ void AGOSEngine::quickLoadOrSave() {
 	}
 
 	bool success;
-	char buf[50];
+	char buf[60];
 
 	char *filename = genSaveName(_saveLoadSlot);
 	if (_saveLoadType == 2) {
@@ -978,7 +978,7 @@ bool AGOSEngine::loadGame(const char *filename, bool restartMode) {
 	if (restartMode) {
 		// Load restart state
 		Common::File *file = new Common::File();
-		file->open(filename, Common::File::kFileReadMode);
+		file->open(filename);
 		f = file;
 	} else {
 		f = _saveFileMan->openForLoading(filename);
@@ -1154,7 +1154,7 @@ bool AGOSEngine_Elvira2::loadGame(const char *filename, bool restartMode) {
 	if (restartMode) {
 		// Load restart state
 		Common::File *file = new Common::File();
-		file->open(filename, Common::File::kFileReadMode);
+		file->open(filename);
 		f = file;
 	} else {
 		f = _saveFileMan->openForLoading(filename);