From 3ea8f70792b62c70bfcae97b970e3830d85c5d72 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 2 Sep 2008 13:11:54 +0000
Subject: Handle OSystem::lockScreen fail in default OSystem::clearScreen
 implementation.

svn-id: r34276
---
 common/system.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'common/system.cpp')

diff --git a/common/system.cpp b/common/system.cpp
index d0548cdd2d..863f395671 100644
--- a/common/system.cpp
+++ b/common/system.cpp
@@ -115,7 +115,8 @@ Common::EventManager *OSystem::getEventManager() {
 
 void OSystem::clearScreen() {
 	Graphics::Surface *screen = lockScreen();
-	memset(screen->pixels, 0, screen->h * screen->pitch);
+	if (screen && screen->pixels)
+		memset(screen->pixels, 0, screen->h * screen->pitch);
 	unlockScreen();
 }
 
-- 
cgit v1.2.3


From 531bcf847ceef2b9eca82e0b3ef8473612889632 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Wed, 3 Sep 2008 11:22:51 +0000
Subject: Moved FilesystemNode / FSList to namespace Common; also got rid of
 some 'typedef Common::String String;' name aliases

svn-id: r34302
---
 common/system.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'common/system.cpp')

diff --git a/common/system.cpp b/common/system.cpp
index 863f395671..6ed9d46e12 100644
--- a/common/system.cpp
+++ b/common/system.cpp
@@ -164,7 +164,7 @@ static Common::String getDefaultConfigFileName() {
 }
 
 Common::SeekableReadStream *OSystem::openConfigFileForReading() {
-	FilesystemNode file(getDefaultConfigFileName());
+	Common::FilesystemNode file(getDefaultConfigFileName());
 	return file.openForReading();
 }
 
@@ -172,7 +172,7 @@ Common::WriteStream *OSystem::openConfigFileForWriting() {
 #ifdef __DC__
 	return 0;
 #else
-	FilesystemNode file(getDefaultConfigFileName());
+	Common::FilesystemNode file(getDefaultConfigFileName());
 	return file.openForWriting();
 #endif
 }
-- 
cgit v1.2.3


From 12106a159912055d77668f8436c1a1e87d6c0f4e Mon Sep 17 00:00:00 2001
From: Nicola Mettifogo
Date: Fri, 5 Sep 2008 11:41:39 +0000
Subject: Removed useless dependencies from common/file.h in common code. When
 complete removal was not possibile, dependency has been pushed to the cpp
 files from the headers.

svn-id: r34343
---
 common/system.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'common/system.cpp')

diff --git a/common/system.cpp b/common/system.cpp
index 6ed9d46e12..d9bc027e91 100644
--- a/common/system.cpp
+++ b/common/system.cpp
@@ -126,10 +126,9 @@ FIXME: The config file loading code below needs to be cleaned up.
  Port specific variants should be pushed into the respective ports.
 
  Ideally, the default OSystem::openConfigFileForReading/Writing methods
- should be removed completely. 
+ should be removed completely.
 */
 
-#include "common/file.h"
 
 #ifdef __PLAYSTATION2__
 #include "backends/platform/ps2/systemps2.h"
-- 
cgit v1.2.3