Merged revisions 42398,42402-42406,42418-42421,42423,42428-42430 via svnmerge from

https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

........
  r42398 | thebluegr | 2009-07-12 09:45:54 +1000 (Sun, 12 Jul 2009) | 1 line
  
  Moved the kernel and the vocabulary outside of the engine state (they're static data, which never changes during a game)
........
  r42402 | sunmax | 2009-07-12 15:34:46 +1000 (Sun, 12 Jul 2009) | 8 lines
  
  Added a temporary work-around for PS2 backend in common/array.h
  cause its vintage compiler does not support "new T[newCapacity]()"
  but only "new T[newCapacity]", this will let it compile through.
  
  It's ifdef'd as __PLAYSTATION2__, so it won't make a difference
  for other backends with more modern tools.
........
  r42403 | sunmax | 2009-07-12 15:35:56 +1000 (Sun, 12 Jul 2009) | 5 lines
  
  I am re-commiting the FORCE_RTL as a temporary solution
  in trunk, so that trunk/1.0rc is au pair feature-wise
  with 0.13.x.
........
  r42404 | sunmax | 2009-07-12 15:38:08 +1000 (Sun, 12 Jul 2009) | 24 lines
  
  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
........
  r42405 | dreammaster | 2009-07-12 17:23:50 +1000 (Sun, 12 Jul 2009) | 1 line
  
  Added support for sub-relation message types - this fixes trying to attach the chain to the hook on the deck
........
  r42406 | lordhoto | 2009-07-12 18:51:57 +1000 (Sun, 12 Jul 2009) | 1 line
  
  Add missing quotation mark to error message.
........
  r42418 | lordhoto | 2009-07-13 00:29:59 +1000 (Mon, 13 Jul 2009) | 1 line
  
  Fix typo, which in fact fixes bug #2820353 "GUI: Search doesn't handle uppercase properly".
........
  r42419 | knakos | 2009-07-13 01:59:27 +1000 (Mon, 13 Jul 2009) | 1 line
  
  Apply patch 2802544: WINCE: Implement OSystem::engineInit to remove hack
........
  r42420 | knakos | 2009-07-13 01:59:56 +1000 (Mon, 13 Jul 2009) | 1 line
  
  fix build with arm-asm routines
........
  r42421 | knakos | 2009-07-13 02:40:10 +1000 (Mon, 13 Jul 2009) | 1 line
  
  oops, fix props
........
  r42423 | sev | 2009-07-13 04:52:38 +1000 (Mon, 13 Jul 2009) | 2 lines
  
  Patch #1936137: "Speech for Mac BS1 english"
........
  r42428 | sunmax | 2009-07-13 07:58:00 +1000 (Mon, 13 Jul 2009) | 6 lines
  
  Split _eof vs. _err.
  
  Latter defaults to false for now, there are hooks
  for possible future implementation.
........
  r42429 | sunmax | 2009-07-13 08:00:47 +1000 (Mon, 13 Jul 2009) | 4 lines
  
  On PS2 use "fprintf" (as in 0.13.x ) to print error messages to stderr,
  rather than "fputs", which is buggy in the PS2 implementation.
........
  r42430 | wjpalenstijn | 2009-07-13 08:08:10 +1000 (Mon, 13 Jul 2009) | 1 line
  
  Remove double endline
........

svn-id: r42432

3 files changed, 19 insertions, 1 deletions

diff --git a/common/array.h b/common/array.h
index 7852cabf06..ac8a4b20d7 100644
--- a/common/array.h
+++ b/common/array.h
@@ -222,7 +222,13 @@ public:
 
 		T *old_storage = _storage;
 		_capacity = newCapacity;
+		// PS2 gcc 3.2.2 can't do "new T[newCapacity]()" but only
+		// "new T[newCapacity]" -> quick fix until we update tools.
+		#ifndef __PLAYSTATION2__
 		_storage = new T[newCapacity]();
+		#else
+		_storage = new T[newCapacity];
+		#endif
 		assert(_storage);
 
 		if (old_storage) {
@@ -273,7 +279,13 @@ protected:
 				// If there is not enough space, allocate more and
 				// copy old elements over.
 				uint newCapacity = roundUpCapacity(_size + n);
+				// PS2 gcc 3.2.2 can't do "new T[newCapacity]()" but only
+				// "new T[newCapacity]" -> quick fix until we update tools.
+				#ifndef __PLAYSTATION2__
 				newStorage = new T[newCapacity]();
+				#else
+				newStorage = new T[newCapacity];
+				#endif
 				assert(newStorage);
 				copy(_storage, _storage + idx, newStorage);
 				pos = newStorage + idx;
diff --git a/common/events.h b/common/events.h
index e13d95cf47..82b85e60ea 100644
--- a/common/events.h
+++ b/common/events.h
@@ -195,7 +195,9 @@ public:
 	 * Used when we have returned to the launcher.
 	 */
 	virtual void resetRTL() = 0;
-
+#ifdef FORCE_RTL
+	virtual void resetQuit() = 0;
+#endif
 	// Optional: check whether a given key is currently pressed ????
 	//virtual bool isKeyPressed(int keycode) = 0;
 
diff --git a/common/util.cpp b/common/util.cpp
index e99bbeb12d..5f5e31aa93 100644
--- a/common/util.cpp
+++ b/common/util.cpp
@@ -477,7 +477,11 @@ void NORETURN error(const char *s, ...) {
 
 
 	// Print the error message to stderr
+#ifndef __PLAYSTATION2__
 	fputs(buf_output, stderr);
+#else
+	fprintf(stderr, "%s", buf_output);
+#endif
 
 	// Unless this error -originated- within the debugger itself, we
 	// now invoke the debugger, if available / supported.