From 55cda3aa258e2c214e0442ad726d964bb787cd0e Mon Sep 17 00:00:00 2001
From: Max Lingua
Date: Sun, 12 Jul 2009 05:38:08 +0000
Subject: ScummVM/PS2 bugs fixed by this commit:

 - general file write corruption (eg. ScummVM.ini, etc.)

 - COMI specific save crash / corruption
   (added option in engines/scumm/saveload.cpp to disable
    thumbnails on PS2, as emergency fallback in case the
    fix should prove to be insufficient)

 - implemented _screenChange logic
   (fixes grabOverlay & COMI popup menu)

 - fixed higher pitch (chipmunk fx)

 - made NET IRXs optional to allow it to work on fat PS2 without net+hd

 - fixed cursor restore on RTL

 - added "." as R2 to skip single lines of dialog

 - added write cache

svn-id: r42404
---
 engines/scumm/saveload.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'engines/scumm')

diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp
index cef13341b5..d474a43b05 100644
--- a/engines/scumm/saveload.cpp
+++ b/engines/scumm/saveload.cpp
@@ -137,7 +137,7 @@ bool ScummEngine::saveState(Common::OutSaveFile *out, bool writeHeader) {
 		memcpy(hdr.name, _saveLoadName, sizeof(hdr.name));
 		saveSaveGameHeader(out, hdr);
 	}
-#if !defined(__DS__)
+#if !defined(__DS__) /* && !defined(__PLAYSTATION2__) */
 	Graphics::saveThumbnail(*out);
 #endif
 	saveInfos(out);
-- 
cgit v1.2.3


From 810bbca93c54bed741dd6f4f626c4845e65ac0ba Mon Sep 17 00:00:00 2001
From: Kostas Nakos
Date: Sun, 12 Jul 2009 15:59:56 +0000
Subject: fix build with arm-asm routines

svn-id: r42420
---
 engines/scumm/gfx.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 mode change 100644 => 100755 engines/scumm/gfx.cpp

(limited to 'engines/scumm')

diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
old mode 100644
new mode 100755
index 07640ca551..5961ec4013
--- a/engines/scumm/gfx.cpp
+++ b/engines/scumm/gfx.cpp
@@ -36,7 +36,7 @@
 #include "scumm/util.h"
 
 #ifdef USE_ARM_GFX_ASM
-extern "C" void asmDrawStripToScreen(int height, int width, byte const* text, byte const* src, byte* dst,
+extern "C" void asmDrawStripToScreen(int height, int width, void const* text, void const* src, byte* dst,
 	int vsPitch, int vmScreenWidth, int textSurfacePitch);
 extern "C" void asmCopy8Col(byte* dst, int dstPitch, const byte* src, int height);
 #endif /* USE_ARM_GFX_ASM */
-- 
cgit v1.2.3


From b0b12b60ed9c1d744ce2247b2de327c7c55bc07a Mon Sep 17 00:00:00 2001
From: Kostas Nakos
Date: Sun, 12 Jul 2009 16:40:10 +0000
Subject: oops, fix props

svn-id: r42421
---
 engines/scumm/gfx.cpp | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 mode change 100755 => 100644 engines/scumm/gfx.cpp

(limited to 'engines/scumm')

diff --git a/engines/scumm/gfx.cpp b/engines/scumm/gfx.cpp
old mode 100755
new mode 100644
-- 
cgit v1.2.3