[Scummvm-cvs-logs] scummvm master -> 9f40bdcd2c355115ad1da29ad35e19840c619d54

[fingolfin]

This automated email contains information about 3 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0b7f475e35 BACKENDS: Add OSystem::resetGraphicsScale() default implementation
83f8f33c40 BACKENDS: cleanup
9f40bdcd2c DS: Prevent OSystem destructor from deleting _savefileManager


Commit: 0b7f475e3506e69ed7ad8904ea0be28fd030726a
    https://github.com/scummvm/scummvm/commit/0b7f475e3506e69ed7ad8904ea0be28fd030726a
Author: Max Horn (max at quendi.de)
Date: 2011-06-08T03:10:49-07:00

Commit Message:
BACKENDS: Add OSystem::resetGraphicsScale() default implementation

Changed paths:
    backends/base-backend.cpp
    backends/base-backend.h
    common/system.h



diff --git a/backends/base-backend.cpp b/backends/base-backend.cpp
index 156871e..a1027e0 100644
--- a/backends/base-backend.cpp
+++ b/backends/base-backend.cpp
@@ -51,6 +51,3 @@ void BaseBackend::fillScreen(uint32 col) {
 		memset(screen->pixels, col, screen->h * screen->pitch);
 	unlockScreen();
 }
-
-void BaseBackend::resetGraphicsScale() {
-}
diff --git a/backends/base-backend.h b/backends/base-backend.h
index 6b19b7a..bae77d4 100644
--- a/backends/base-backend.h
+++ b/backends/base-backend.h
@@ -32,8 +32,6 @@ public:
 
 	virtual void displayMessageOnOSD(const char *msg);
 	virtual void fillScreen(uint32 col);
-
-	virtual void resetGraphicsScale();
 };
 
 
diff --git a/common/system.h b/common/system.h
index 0d0ffda..bea4634 100644
--- a/common/system.h
+++ b/common/system.h
@@ -456,7 +456,7 @@ public:
 	 * reset the scale to x1 so the screen will not be too big when starting
 	 * the game.
 	 */
-	virtual void resetGraphicsScale() = 0;
+	virtual void resetGraphicsScale() {}
 
 #ifdef USE_RGB_COLOR
 	/**


Commit: 83f8f33c409aefd4fcae3fef5075a04f5a7eb74d
    https://github.com/scummvm/scummvm/commit/83f8f33c409aefd4fcae3fef5075a04f5a7eb74d
Author: Max Horn (max at quendi.de)
Date: 2011-06-08T03:13:10-07:00

Commit Message:
BACKENDS: cleanup

Changed paths:
    backends/base-backend.h
    backends/modular-backend.cpp



diff --git a/backends/base-backend.h b/backends/base-backend.h
index bae77d4..b0dddf9 100644
--- a/backends/base-backend.h
+++ b/backends/base-backend.h
@@ -24,7 +24,7 @@
 #define BACKENDS_BASE_BACKEND_H
 
 #include "common/system.h"
-#include "backends/events/default/default-events.h"
+#include "common/events.h"
 
 class BaseBackend : public OSystem, Common::EventSource {
 public:
diff --git a/backends/modular-backend.cpp b/backends/modular-backend.cpp
index e36348a..525170d 100644
--- a/backends/modular-backend.cpp
+++ b/backends/modular-backend.cpp
@@ -24,15 +24,10 @@
 
 #include "backends/modular-backend.h"
 
-#include "backends/fs/fs-factory.h"
 #include "backends/graphics/graphics.h"
 #include "backends/mutex/mutex.h"
 
 #include "audio/mixer.h"
-#include "common/events.h"
-#include "common/timer.h"
-#include "common/savefile.h"
-#include "gui/message.h"
 #include "graphics/pixelformat.h"
 
 ModularBackend::ModularBackend()


Commit: 9f40bdcd2c355115ad1da29ad35e19840c619d54
    https://github.com/scummvm/scummvm/commit/9f40bdcd2c355115ad1da29ad35e19840c619d54
Author: Max Horn (max at quendi.de)
Date: 2011-06-08T05:14:54-07:00

Commit Message:
DS: Prevent OSystem destructor from deleting _savefileManager

Changed paths:
    backends/platform/ds/arm9/source/osystem_ds.cpp



diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp
index 8fbe5ac..47e93cf 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.cpp
+++ b/backends/platform/ds/arm9/source/osystem_ds.cpp
@@ -95,6 +95,12 @@ OSystem_DS::OSystem_DS()
 
 OSystem_DS::~OSystem_DS() {
 	delete _mixer;
+	_mixer = 0;
+
+	// If _savefileManager is not 0, then it points to the OSystem_DS
+	// member variable mpSaveManager. Hence we set _savefileManager to
+	// 0, to prevent the OSystem destructor from trying to delete it.
+	_savefileManager = 0;
 }
 
 int OSystem_DS::timerHandler(int t) {