Merged the FSNode branch with trunk r27031:27680

svn-id: r27681

1 files changed, 7 insertions, 3 deletions

diff --git a/backends/platform/null/null.cpp b/backends/platform/null/null.cpp
index 963b3429f5..250ca0fb29 100644
--- a/backends/platform/null/null.cpp
+++ b/backends/platform/null/null.cpp
@@ -63,7 +63,8 @@ public:
 	virtual void grabPalette(byte *colors, uint start, uint num);
 	virtual void copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h);
 	virtual void updateScreen();
-	virtual bool grabRawScreen(Graphics::Surface *surf);
+	virtual Graphics::Surface *lockScreen();
+	virtual void unlockScreen();
 	virtual void setShakePos(int shakeOffset);
 
 	virtual void showOverlay();
@@ -189,8 +190,11 @@ void OSystem_NULL::copyRectToScreen(const byte *buf, int pitch, int x, int y, in
 void OSystem_NULL::updateScreen() {
 }
 
-bool OSystem_NULL::grabRawScreen(Graphics::Surface *surf) {
-	return false;
+Graphics::Surface *OSystem_NULL::lockScreen() {
+	return 0;
+}
+
+void OSystem_NULL::unlockScreen() {
 }
 
 void OSystem_NULL::setShakePos(int shakeOffset) {