Merged revisions 43338-43340,43342,43344-43347,43349-43350,43352-43354,43357-43358,43362,43366,43369,43375,43377,43380,43383-43384,43386,43388,43390,43393,43400,43402,43404,43406-43409,43411,43413-43414 via svnmerge from

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

........
  r43338 | lordhoto | 2009-08-13 10:19:26 +1000 (Thu, 13 Aug 2009) | 1 line
  
  Little optimization in Screen::setPaletteIndex, now it only resets the palette, when the color index really changed.
........
  r43339 | lordhoto | 2009-08-13 10:20:37 +1000 (Thu, 13 Aug 2009) | 1 line
  
  Fix key input in credits sequences.
........
  r43340 | lordhoto | 2009-08-13 10:21:42 +1000 (Thu, 13 Aug 2009) | 1 line
  
  Fix serious bug in StaticResource::unloadId.
........
  r43342 | lordhoto | 2009-08-13 10:26:41 +1000 (Thu, 13 Aug 2009) | 1 line
  
  Do not unload credits data after copying it to a temporary buffer in Kyrandia 1 Amiga, since the credits will be looped and need reload every time.
........
  r43344 | strangerke | 2009-08-13 19:56:54 +1000 (Thu, 13 Aug 2009) | 1 line
  
  Initial save handler for Playtoons 
........
  r43345 | strangerke | 2009-08-13 19:59:44 +1000 (Thu, 13 Aug 2009) | 2 lines
  
  - Add a specific OPCODEFUNC checkData to avoid having a Playtoons workaround in working code
  - Replace OPCODEDRAW 0x20,0x23 and 0x25
........
  r43346 | strangerke | 2009-08-13 20:00:35 +1000 (Thu, 13 Aug 2009) | 1 line
  
  Suppress no longer needed Playtoons workaround
........
  r43347 | strangerke | 2009-08-13 20:08:07 +1000 (Thu, 13 Aug 2009) | 1 line
  
  fix methods
........
  r43349 | lordhoto | 2009-08-14 01:55:12 +1000 (Fri, 14 Aug 2009) | 1 line
  
  Implemented support for the "Lore of the Lands" special of Lands of Lore CD.
........
  r43350 | lordhoto | 2009-08-14 02:41:07 +1000 (Fri, 14 Aug 2009) | 1 line
  
  Move version string in Modern theme beneath the Logo in high res mode, this saves some space and looks nicer.
........
  r43352 | lordhoto | 2009-08-14 02:50:30 +1000 (Fri, 14 Aug 2009) | 1 line
  
  Little fix of new modern theme layout in the launcher for 3x.
........
  r43353 | lordhoto | 2009-08-14 03:00:19 +1000 (Fri, 14 Aug 2009) | 1 line
  
  Cleanup.
........
  r43354 | lordhoto | 2009-08-14 03:00:40 +1000 (Fri, 14 Aug 2009) | 1 line
  
  Cleanup.
........
  r43357 | agent-q | 2009-08-14 07:46:41 +1000 (Fri, 14 Aug 2009) | 1 line
  
  Allow VOCs to stream from disk.  Disabled by default, use symbol STREAM_AUDIO_FROM_DISK to enable.  See patch #2834001.
........
  r43358 | Kirben | 2009-08-14 10:44:36 +1000 (Fri, 14 Aug 2009) | 1 line
  
  The Nintendo DS hack for introduction in Simon the Sorcerer 1 is only required for Windows version (WAV format) now.
........
  r43362 | anotherguest | 2009-08-14 16:42:57 +1000 (Fri, 14 Aug 2009) | 1 line
  
  Updated files from 1.0.0 branch
........
  r43366 | drmccoy | 2009-08-15 01:22:43 +1000 (Sat, 15 Aug 2009) | 2 lines
  
  Setting gob3 save/load mode of the temporary sprite "intro.$$$" to ignore and remove the TempSpriteHandler.
  Gob3 doesn't use it at all and Lost in Time only saves (with an invalid index) and never loads
........
  r43369 | joostp | 2009-08-15 02:13:00 +1000 (Sat, 15 Aug 2009) | 2 lines
  
  PSP: create an EBOOT.PBP when building via configure
........
  r43375 | joostp | 2009-08-15 02:44:29 +1000 (Sat, 15 Aug 2009) | 2 lines
  
  Fix incorrect memset() call (reported by Peter Bortas).
........
  r43377 | joostp | 2009-08-15 02:54:43 +1000 (Sat, 15 Aug 2009) | 2 lines
  
  add psp_clean build rule to clean up EBOOT.PBP and scummvm_stripped.elf
........
  r43380 | joostp | 2009-08-15 03:18:03 +1000 (Sat, 15 Aug 2009) | 3 lines
  
  MIPSpro compilation fixes / workarounds (from a patch by Rainer Canavan)
  The hashmap.h change is ugly, but so far the only thing found to work. Suggestions for a better "fix" appreciated!
........
  r43383 | lordhoto | 2009-08-15 03:49:30 +1000 (Sat, 15 Aug 2009) | 1 line
  
  Little fix for lopping credits in Kyrandia 1 Amiga.
........
  r43384 | joostp | 2009-08-15 04:02:17 +1000 (Sat, 15 Aug 2009) | 2 lines
  
  PSP: also create param.sfo when building via configure
........
  r43386 | joostp | 2009-08-15 04:34:01 +1000 (Sat, 15 Aug 2009) | 2 lines
  
  PSP: add svn revision + build date to SFO title.
........
  r43388 | joostp | 2009-08-15 09:20:46 +1000 (Sat, 15 Aug 2009) | 2 lines
  
  remove double semi-colon -- hopefully this kicks the buildbot back into action =)
........
  r43390 | waltervn | 2009-08-15 10:28:59 +1000 (Sat, 15 Aug 2009) | 2 lines
  
  SCI: Added enum for map and volume versions. Removed res_version setting from
  detection.cpp (should be detectable). Cleanup.
........
  r43393 | dhewg | 2009-08-15 15:39:44 +1000 (Sat, 15 Aug 2009) | 1 line
  
  Fix compilation.
........
  r43400 | Kirben | 2009-08-15 20:09:32 +1000 (Sat, 15 Aug 2009) | 1 line
  
  Fix regression, that caused multiple sounds in Simon the Sorcerer 2 to be cut off.
........
  r43402 | Kirben | 2009-08-15 20:31:20 +1000 (Sat, 15 Aug 2009) | 1 line
  
  Restore code to clear screen, before playing videos with smaller resolution in the Amiga version of The Feeble Files.
........
  r43404 | joostp | 2009-08-15 20:44:58 +1000 (Sat, 15 Aug 2009) | 2 lines
  
  Properly implement PSPFilesystemFactory::makeCurrentDirectoryFileNode()
........
  r43406 | dreammaster | 2009-08-15 21:50:59 +1000 (Sat, 15 Aug 2009) | 1 line
  
  Added Dirty Rect handling functionality
........
  r43407 | waltervn | 2009-08-15 22:09:47 +1000 (Sat, 15 Aug 2009) | 1 line
  
  SCI: Rename sci_version_t to SciVersion
........
  r43408 | waltervn | 2009-08-15 22:17:23 +1000 (Sat, 15 Aug 2009) | 1 line
  
  SCI: Add missing versions to exe version parsing
........
  r43409 | eriktorbjorn | 2009-08-16 00:13:48 +1000 (Sun, 16 Aug 2009) | 2 lines
  
  Removed unnecessary semi-colons.
........
  r43411 | lordhoto | 2009-08-16 00:59:11 +1000 (Sun, 16 Aug 2009) | 1 line
  
  Added const qualifiers to static data.
........
  r43413 | lordhoto | 2009-08-16 01:30:35 +1000 (Sun, 16 Aug 2009) | 1 line
  
  Yet another slight graphic fix for the Kyrandia 1 Amiga credits.
........
  r43414 | buddha_ | 2009-08-16 05:04:21 +1000 (Sun, 16 Aug 2009) | 4 lines
  
  Fix for bug #2835581 (KQ3: Game Crash When Leaving Tavern as Fly):
  - Use AGI version 0x3149 instead of the previous 0x3086
  - Makes ESC pause the game (Identical to original in this respect)
........

svn-id: r43418

8 files changed, 48 insertions, 11 deletions

diff --git a/backends/fs/psp/psp-fs-factory.cpp b/backends/fs/psp/psp-fs-factory.cpp
index cfe8ed27d1..27bee4de86 100644
--- a/backends/fs/psp/psp-fs-factory.cpp
+++ b/backends/fs/psp/psp-fs-factory.cpp
@@ -33,7 +33,8 @@ AbstractFSNode *PSPFilesystemFactory::makeRootFileNode() const {
 }
 
 AbstractFSNode *PSPFilesystemFactory::makeCurrentDirectoryFileNode() const {
-	return new PSPFilesystemNode();
+	char buf[MAXPATHLEN];
+	return getcwd(buf, MAXPATHLEN) ? new PSPFilesystemNode(buf) : NULL;
 }
 
 AbstractFSNode *PSPFilesystemFactory::makeFileNodePath(const Common::String &path) const {
diff --git a/backends/fs/psp/psp-fs.cpp b/backends/fs/psp/psp-fs.cpp
index 9936d37f77..f5ff65c9fa 100644
--- a/backends/fs/psp/psp-fs.cpp
+++ b/backends/fs/psp/psp-fs.cpp
@@ -59,7 +59,7 @@ public:
 	 * @param path Common::String with the path the new node should point to.
 	 * @param verify true if the isValid and isDirectory flags should be verified during the construction.
 	 */
-	PSPFilesystemNode(const Common::String &p, bool verify);
+	PSPFilesystemNode(const Common::String &p, bool verify = true);
 
 	virtual bool exists() const { return access(_path.c_str(), F_OK) == 0; }
 	virtual Common::String getDisplayName() const { return _displayName; }
diff --git a/backends/platform/psp/psp.mk b/backends/platform/psp/psp.mk
index ff81a567d6..10e272a593 100644
--- a/backends/platform/psp/psp.mk
+++ b/backends/platform/psp/psp.mk
@@ -1,6 +1,38 @@
-all: psp_fixup_elf
+all: pack_pbp
+clean: psp_clean
 
-psp_fixup_elf: scummvm.elf 
+
+PSP_EXE := scummvm$(EXEEXT)
+PSP_EXE_STRIPPED := scummvm_stripped$(EXEEXT)
+PSP_EBOOT = EBOOT.PBP
+PSP_EBOOT_SFO = param.sfo
+PSP_EBOOT_TITLE = ScummVM-PSP
+DATE = $(shell date +%Y%m%d)
+
+MKSFO = mksfo
+PACK_PBP = pack-pbp
+
+$(PSP_EXE_STRIPPED): $(PSP_EXE)
+	$(STRIP) $< -o $@
+
+$(PSP_EBOOT_SFO): $(PSP_EXE)
+	$(MKSFO) '$(PSP_EBOOT_TITLE) r$(VER_SVNREV) ($(DATE))' $@
+
+psp_clean:
+	$(RM) $(PSP_EXE_STRIPPED) $(PSP_EBOOT) $(PSP_EBOOT_SFO)
+
+psp_fixup_elf: $(PSP_EXE_STRIPPED)
 	$(PSPDEV)/bin/psp-fixup-imports $<
 
-.PHONY: psp_fixup_elf
+pack_pbp: psp_fixup_elf $(PSP_EBOOT_SFO)
+	$(PACK_PBP) $(PSP_EBOOT) \
+	$(PSP_EBOOT_SFO) \
+	$(srcdir)/backends/platform/psp/icon0.png \
+	NULL \
+	$(srcdir)/backends/platform/psp/pic0.png \
+	$(srcdir)/backends/platform/psp/pic1.png \
+	NULL \
+	$(PSP_EXE_STRIPPED) \
+	NULL
+
+.PHONY: psp_fixup_elf pack_pbp
diff --git a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
index fe82cb7b4e..19b4d67961 100644
--- a/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
+++ b/backends/platform/symbian/S60v3/scummvm-CVS-SymbianS60v3.pkg
@@ -34,7 +34,7 @@
 :"ScummVM"
 
 ; UID is the app's UID
-#{"ScummVM S60v3"},(0xA0000657),0,14,0
+#{"ScummVM S60v3"},(0xA0000657),1,0,0
 
 ;Supports Series 60 v 3.0
 [0x101F7961], 0, 0, 0, {"Series60ProductID"}
diff --git a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
index 5a8d317fbc..a500e92529 100644
--- a/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
+++ b/backends/platform/symbian/UIQ3/scummvm-CVS-SymbianUIQ3.pkg
@@ -32,7 +32,7 @@
 :"ScummVM"
 
 ; UID is the app's UID
-#{"ScummVM UIQ3"},(0xA0000657),0,14,0
+#{"ScummVM UIQ3"},(0xA0000657),1,0,0
 
 ; ProductID for UIQ 3.0
 ; Product/platform version UID, Major, Minor, Build, Product ID
diff --git a/backends/platform/symbian/src/SymbianActions.cpp b/backends/platform/symbian/src/SymbianActions.cpp
index 5f5551422e..58ede5988f 100644
--- a/backends/platform/symbian/src/SymbianActions.cpp
+++ b/backends/platform/symbian/src/SymbianActions.cpp
@@ -104,6 +104,8 @@ SymbianActions::SymbianActions()
 void SymbianActions::initInstanceMain(OSystem *mainSystem) {
 	int i;
 	
+	// Need to do this since all old mappings are reset after engineDone
+	_initialized = false;
 	Actions::initInstanceMain(mainSystem);
 
 	// Disable all mappings before setting main mappings again
diff --git a/backends/platform/symbian/src/portdefs.h b/backends/platform/symbian/src/portdefs.h
index 3c2286d154..9059ae9e49 100644
--- a/backends/platform/symbian/src/portdefs.h
+++ b/backends/platform/symbian/src/portdefs.h
@@ -127,7 +127,9 @@
 #define USE_ARM_COSTUME_ASM
 #define USE_ARM_SOUND_ASM
 #endif
-#define ENABLE_KEYMAPPER
+// This is not really functioning yet. 
+// Default SDL keys should map to standard keys I think!
+//#define ENABLE_KEYMAPPER  
 
 // Symbian bsearch implementation is flawed
 void *scumm_bsearch(const void *key, const void *base, size_t nmemb, size_t size, int (*compar)(const void *, const void *));
diff --git a/backends/platform/wii/gx_supp.cpp b/backends/platform/wii/gx_supp.cpp
index 34cd31fd13..f33adae566 100644
--- a/backends/platform/wii/gx_supp.cpp
+++ b/backends/platform/wii/gx_supp.cpp
@@ -57,9 +57,9 @@ static float tex_xT = 0.0f, tex_yT = 0.0f;
 
 /* New texture based scaler */
 typedef struct tagcamera {
-	Vector pos;
-	Vector up;
-	Vector view;
+	guVector pos;
+	guVector up;
+	guVector view;
 } camera;
 
 static s16 square[] ATTRIBUTE_ALIGN(32) = {