Merged the fs branch with trunk. r26949:27031

svn-id: r27032

1 files changed, 15 insertions, 3 deletions

diff --git a/engines/agos/draw.cpp b/engines/agos/draw.cpp
index 5b5b42cbbb..f5f7161805 100644
--- a/engines/agos/draw.cpp
+++ b/engines/agos/draw.cpp
@@ -1,6 +1,8 @@
-/* ScummVM - Scumm Interpreter
- * Copyright (C) 2001  Ludvig Strigeus
- * Copyright (C) 2001-2006 The ScummVM project
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License
@@ -306,6 +308,11 @@ void AGOSEngine::dirtyClips() {
 }
 
 void AGOSEngine::restoreBackGround() {
+	if (getGameType() == GType_ELVIRA1 && getPlatform() == Common::kPlatformAtariST &&
+		(getFeatures() & GF_DEMO)) {
+		return;
+	}
+
 	AnimTable *animTable;
 	uint images = 0;
 
@@ -361,6 +368,11 @@ void AGOSEngine::restoreBackGround() {
 }
 
 void AGOSEngine::saveBackGround(VgaSprite *vsp) {
+	if (getGameType() == GType_ELVIRA1 && getPlatform() == Common::kPlatformAtariST &&
+		(getFeatures() & GF_DEMO)) {
+		return;
+	}
+
 	if ((vsp->flags & kDFSkipStoreBG) || !vsp->image)
 		return;