Merged revisions 41219-41297,41299-41318,41322-41328,41331-41334,41336-41346,41348-41369,41372-41376,41379-41381,41384-41386,41389,41393,41395,41398,41400-41409,41419,41421,41423-41425,41428-41430,41432-41433,41452-41453,41458-41462,41465,41468,41470,41473-41474,41484-41490,41493,41496-41504,41506-41508,41516-41517,41519-41520,41528,41536-41538,41556-41557,41559-41560,41562-41576,41579,41584,41587-41592,41596,41598,41601-41603,41611,41618-41619,41630,41632-41635,41639,41641,41644-41647,41660,41663-41665,41668,41677,41679-41680,41683,41699-41705,41707-41709,41713-41715,41718-41727,41729-41736,41739-41763,41765-41766,41768-41774,41777-41778,41781-41799,41803,41806,41809-41813,41821-41823,41827,41833-41834,41836-41839,41841,41844-41848,41850-41853,41858-41860,41867-41871,41875-41887,41889-41893,41895-41897,41902-41903,41915-41917,41922,41929-41934,41938,41940-41964,41967-41968,41975,42007-42012,42020,42038-42041,42043-42044,42047-42050,42054-42056,42060,42062,42079,42081 via svnmerge from

https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk ........ r41219 | drmccoy | 2009-06-06 21:34:11 +1000 (Sat, 06 Jun 2009) | 2 lines Adding my German version of Playtoons 2 ("Rummelsdorf hoch zwei") ........ r41220 | wjpalenstijn | 2009-06-06 21:38:20 +1000 (Sat, 06 Jun 2009) | 3 lines Store long-term pointers to object variables in a new ObjVarRef struct. Storing them as reg_t* could cause the pointers to become invalid when they pointed into CloneTable since CloneTable can be re-allocated. ........ r41221 | athrxx | 2009-06-06 22:18:39 +1000 (Sat, 06 Jun 2009) | 1 line KYRA/LOL: fix input code for japanese game versions ........ r41222 | waltervn | 2009-06-06 22:30:13 +1000 (Sat, 06 Jun 2009) | 2 lines SCI: Fix audio regression in KQ5CD, introduced in r41205. ........ r41223 | athrxx | 2009-06-07 00:14:07 +1000 (Sun, 07 Jun 2009) | 1 line LOL: fixed vaelan's cube ........ r41224 | athrxx | 2009-06-07 00:42:03 +1000 (Sun, 07 Jun 2009) | 1 line LOL: fixed level temp data size ........ r41225 | athrxx | 2009-06-07 01:32:42 +1000 (Sun, 07 Jun 2009) | 1 line LOL: fix last commit ........ r41226 | djwillis | 2009-06-07 01:41:17 +1000 (Sun, 07 Jun 2009) | 1 line GP2XWiz: Cleanup and start to work on virtual keyboard support for the backend. ........ r41227 | thebluegr | 2009-06-07 02:43:13 +1000 (Sun, 07 Jun 2009) | 1 line Moved some more debug commands to ScummVM's coneole ........ r41228 | drmccoy | 2009-06-07 02:47:21 +1000 (Sun, 07 Jun 2009) | 2 lines Adding a pause mode ........ r41229 | drmccoy | 2009-06-07 02:48:29 +1000 (Sun, 07 Jun 2009) | 2 lines Adding a general coktelplayer.scn demo file ........ r41230 | djwillis | 2009-06-07 02:52:45 +1000 (Sun, 07 Jun 2009) | 2 lines GP2X: Small cleanup of control code and start to work on virtual keyboard support for the backend. ........ r41231 | lordhoto | 2009-06-07 03:10:15 +1000 (Sun, 07 Jun 2009) | 2 lines Fix unused variable warnings. ........ r41232 | djwillis | 2009-06-07 03:21:50 +1000 (Sun, 07 Jun 2009) | 1 line Virtual Keyboard: Fix detection of v_align option when used in the keyboard definition. ........ r41233 | sev | 2009-06-07 03:36:06 +1000 (Sun, 07 Jun 2009) | 1 line Implement feature request #1180217: "GUI: Mute option" ........ r41234 | sev | 2009-06-07 03:36:21 +1000 (Sun, 07 Jun 2009) | 1 line Mention new hotkey in README ........ r41235 | sev | 2009-06-07 03:36:58 +1000 (Sun, 07 Jun 2009) | 1 line Add Mute control to all themes ........ r41236 | sev | 2009-06-07 03:37:15 +1000 (Sun, 07 Jun 2009) | 1 line Implement FR#1522626: "GUI: Friendlier "Add Game" session" ........ r41237 | sev | 2009-06-07 03:37:31 +1000 (Sun, 07 Jun 2009) | 1 line Implement FR#2090830: "GUI: RTL should focus game list on the last game played" ........ r41238 | sev | 2009-06-07 03:37:51 +1000 (Sun, 07 Jun 2009) | 1 line Decrease number of free memory pages to realistic value ........ r41239 | sev | 2009-06-07 03:39:13 +1000 (Sun, 07 Jun 2009) | 1 line Whitespace fixes and C++ comments ........ r41240 | sev | 2009-06-07 03:39:42 +1000 (Sun, 07 Jun 2009) | 1 line Fix bug #2434187: "SQ2: message not displayed, or vanishes too quickly" ........ r41241 | sev | 2009-06-07 03:40:09 +1000 (Sun, 07 Jun 2009) | 1 line Fix implementation of prevent.input. This fixes SQ2 intro ........ r41242 | sev | 2009-06-07 03:40:27 +1000 (Sun, 07 Jun 2009) | 1 line Fix bug #2026570: "SQ2: Prompt disappears when it shouldn't" ........ r41243 | sev | 2009-06-07 03:40:56 +1000 (Sun, 07 Jun 2009) | 1 line Fix bug #2721940: "AGI: Gold Rush! Restart Option differs from original" ........ r41244 | sev | 2009-06-07 03:41:29 +1000 (Sun, 07 Jun 2009) | 1 line Fix bug #1745954: "GR: Intro "jumpy" in parts (Amiga version)" ........ r41245 | sev | 2009-06-07 03:41:50 +1000 (Sun, 07 Jun 2009) | 1 line Store and compare MD5s in the saves ........ r41246 | sev | 2009-06-07 03:42:12 +1000 (Sun, 07 Jun 2009) | 1 line Disable save/load when original did not allow ........ r41247 | sev | 2009-06-07 03:42:37 +1000 (Sun, 07 Jun 2009) | 1 line Stop abusing game flag. ........ r41248 | sev | 2009-06-07 03:43:04 +1000 (Sun, 07 Jun 2009) | 1 line Remove duplicated amiga busy cursor ........ r41249 | sev | 2009-06-07 03:43:26 +1000 (Sun, 07 Jun 2009) | 1 line Implement debug commands "room" and "bt" ........ r41250 | sev | 2009-06-07 03:43:51 +1000 (Sun, 07 Jun 2009) | 1 line Fix bug #2026605: "SQ2: Have to wait after dying to do anything." ........ r41251 | sev | 2009-06-07 03:44:24 +1000 (Sun, 07 Jun 2009) | 1 line Cleanup ........ r41252 | sev | 2009-06-07 03:44:46 +1000 (Sun, 07 Jun 2009) | 1 line Implement scummvm.ini flag features for AGI engine ........ r41253 | sev | 2009-06-07 03:45:06 +1000 (Sun, 07 Jun 2009) | 1 line Implement cancel.line. Consider obj.status.f implemented ........ r41254 | sev | 2009-06-07 03:45:52 +1000 (Sun, 07 Jun 2009) | 1 line Cleanup ........ r41255 | sev | 2009-06-07 03:46:19 +1000 (Sun, 07 Jun 2009) | 1 line Implement hold.key and release.key opcodes ........ r41256 | sev | 2009-06-07 03:46:38 +1000 (Sun, 07 Jun 2009) | 1 line Implement allow.menu opcode ........ r41257 | sev | 2009-06-07 03:46:55 +1000 (Sun, 07 Jun 2009) | 1 line Implement hide.mouse and show.mouse opcodes ........ r41258 | sev | 2009-06-07 03:47:29 +1000 (Sun, 07 Jun 2009) | 1 line Implement fence.mouse opcode ........ r41259 | sev | 2009-06-07 03:48:09 +1000 (Sun, 07 Jun 2009) | 1 line Correct implementation for set.key opcode. Fixes #2605104: "AGI: Manhunter, F3 hotkey dosent work", removed number of hacks ........ r41260 | sev | 2009-06-07 03:48:30 +1000 (Sun, 07 Jun 2009) | 1 line Add guard check to set.key opcode. ........ r41261 | sev | 2009-06-07 03:48:46 +1000 (Sun, 07 Jun 2009) | 1 line Make PopUp widget look more balanced ........ r41262 | sev | 2009-06-07 03:49:09 +1000 (Sun, 07 Jun 2009) | 1 line Improved look of popup widget, buttons, checkbox and tab widget ........ r41263 | sev | 2009-06-07 03:49:59 +1000 (Sun, 07 Jun 2009) | 1 line Implement FR#2707442: "GUI: Improve Mass Add dialog" ........ r41264 | sev | 2009-06-07 03:50:30 +1000 (Sun, 07 Jun 2009) | 1 line Sync all themes with improvements of mass dialog. Fixed list positioning ........ r41265 | sev | 2009-06-07 03:51:41 +1000 (Sun, 07 Jun 2009) | 1 line Implement widget property "textalign". Added it to all theme layouts ........ r41266 | sev | 2009-06-07 03:52:44 +1000 (Sun, 07 Jun 2009) | 4 lines Implement FR#2507667: "GUI: Improve PopupWidget rendering / theme layouting". - Split out label from PopUp widget - Aligned every widget on all layouts so GUI becomes to look nice again - Moved textHAlign to layout properties ........ r41267 | sev | 2009-06-07 03:53:25 +1000 (Sun, 07 Jun 2009) | 2 lines Add to launcher not yet functional search widget. Make EditableWidget CommandSender ........ r41268 | sev | 2009-06-07 03:54:08 +1000 (Sun, 07 Jun 2009) | 1 line Implement FR#1970293: "LAUNCHER: Add "quick search" input field like in iTunes" ........ r41269 | sev | 2009-06-07 03:54:28 +1000 (Sun, 07 Jun 2009) | 5 lines Improvements to laucher dialog - Made quicksearch turned off in the launcher game list - Turn ListWidget into CommandSender - Turn quicksearch off in launcher game list - Connect laucher list widget with search box so search is initiated by typing ........ r41270 | sev | 2009-06-07 03:54:43 +1000 (Sun, 07 Jun 2009) | 1 line Fix font size in EditTextWidget on screen resolution change. ........ r41271 | sev | 2009-06-07 03:54:59 +1000 (Sun, 07 Jun 2009) | 1 line Fix item selection on filtered out list in launcher ........ r41272 | sev | 2009-06-07 03:56:41 +1000 (Sun, 07 Jun 2009) | 1 line Added game GUI options to advancedDetector and updated all engines ........ r41273 | sev | 2009-06-07 03:56:59 +1000 (Sun, 07 Jun 2009) | 1 line Fix bug with GUI options not set when per-game setting is empty ........ r41274 | sev | 2009-06-07 03:57:39 +1000 (Sun, 07 Jun 2009) | 1 line Add GUI options support to Sky, Queen and Sword1&2 engines (which do not use AD) ........ r41275 | sev | 2009-06-07 03:58:08 +1000 (Sun, 07 Jun 2009) | 2 lines Implement FR#862150: "GUI: Show subtitles/speech options only for speech games" Add generic per-game GUI options support along the way ;) ........ r41276 | sev | 2009-06-07 03:58:29 +1000 (Sun, 07 Jun 2009) | 1 line Do not change list content if filter was not changed ........ r41277 | sev | 2009-06-07 03:59:04 +1000 (Sun, 07 Jun 2009) | 1 line Disable load from the launcher button for AGOS and Gob games with use of GUI options ........ r41278 | sev | 2009-06-07 03:59:54 +1000 (Sun, 07 Jun 2009) | 1 line Add support for GUI options to SCUMM engine ........ r41279 | thebluegr | 2009-06-07 04:02:16 +1000 (Sun, 07 Jun 2009) | 1 line Removed unused variable ........ r41280 | sev | 2009-06-07 04:11:05 +1000 (Sun, 07 Jun 2009) | 2 lines Add empty file to cheat git-svn ........ r41281 | sev | 2009-06-07 04:21:07 +1000 (Sun, 07 Jun 2009) | 1 line Disable MIDI controls if GUIO_NOMIDI is set ........ r41282 | sev | 2009-06-07 04:21:49 +1000 (Sun, 07 Jun 2009) | 1 line Patch #1365914: "SCUMM: CMS support." Disabled by default. Still plenty to do. ........ r41283 | sev | 2009-06-07 04:22:18 +1000 (Sun, 07 Jun 2009) | 1 line Added couple of newly discovered fanmade AGI games. ........ r41284 | sev | 2009-06-07 04:22:43 +1000 (Sun, 07 Jun 2009) | 1 line Added CoCo3 version of SQ1 ........ r41285 | sev | 2009-06-07 04:23:05 +1000 (Sun, 07 Jun 2009) | 1 line Added GUI options for newly added games ........ r41286 | sev | 2009-06-07 04:23:24 +1000 (Sun, 07 Jun 2009) | 1 line Shut gcc warning. ........ r41287 | sev | 2009-06-07 04:27:25 +1000 (Sun, 07 Jun 2009) | 2 lines Bump theme version to 0.5 due to number of recent changes. ........ r41288 | sev | 2009-06-07 04:32:33 +1000 (Sun, 07 Jun 2009) | 2 lines Restore search.bmp which was lost ........ r41289 | lordhoto | 2009-06-07 04:33:20 +1000 (Sun, 07 Jun 2009) | 2 lines Fix printf format argument related warnings. ........ r41290 | thebluegr | 2009-06-07 04:38:41 +1000 (Sun, 07 Jun 2009) | 1 line Updated the MSVC project files of the SCUMM engine for commit #41282 ........ r41291 | lordhoto | 2009-06-07 04:41:25 +1000 (Sun, 07 Jun 2009) | 2 lines Flag all games without full voice over with GUIO_NOSPEECH. ........ r41292 | athrxx | 2009-06-07 04:46:07 +1000 (Sun, 07 Jun 2009) | 1 line LOL: fix flying item hit processing ........ r41293 | thebluegr | 2009-06-07 05:04:09 +1000 (Sun, 07 Jun 2009) | 1 line Fixed assertion when starting mass add and there are no games currently in the game list ........ r41294 | drmccoy | 2009-06-07 05:06:47 +1000 (Sun, 07 Jun 2009) | 4 lines Demoplayer: - Fixing the flawed double mode - Adding an "auto" double mode, where the videos get scaled if possible ........ r41295 | lordhoto | 2009-06-07 05:10:25 +1000 (Sun, 07 Jun 2009) | 3 lines - Flag Kyra3 detection entries with GUIO_NOMIDI - Get rid of using directive ........ r41296 | sev | 2009-06-07 05:20:39 +1000 (Sun, 07 Jun 2009) | 2 lines Bring old 'quick search' behavior of games list back. ........ r41297 | lordhoto | 2009-06-07 05:47:55 +1000 (Sun, 07 Jun 2009) | 2 lines Use GameDescriptor::setGUIOptions instead of setting key "guioptions" directly. ........ r41299 | fingolfin | 2009-06-07 06:03:13 +1000 (Sun, 07 Jun 2009) | 1 line GOB: Got rid of class ReferenceCounter; changed SurfaceDesc::Ptr to SurfaceDescPtr (a Common::SharedPtr); and changed many SurfaceDesc pointers to references ........ r41300 | djwillis | 2009-06-07 06:05:21 +1000 (Sun, 07 Jun 2009) | 1 line Virtual Keyboard: 'Ab'use the console font to get a font small enough to be usable on 320*240 virtual keyboards for display_area (GUI and BigGUI take up far too much space). ........ r41301 | lordhoto | 2009-06-07 06:22:16 +1000 (Sun, 07 Jun 2009) | 2 lines Made fix for empty game list on starting MassAdd a bit more robust. ........ r41302 | thebluegr | 2009-06-07 06:29:37 +1000 (Sun, 07 Jun 2009) | 1 line Moved some more debug commands to ScummVM's coneole ........ r41303 | djwillis | 2009-06-07 06:36:12 +1000 (Sun, 07 Jun 2009) | 1 line Virtual Keyboard: Add 320*240 support (in addition to 640*480) to the default keyboard pack. Also tweak vkeybd.xml to make it a little more like valid XML). New graphics still to come so excuse the ugly keyboard images for now. ........ r41304 | sev | 2009-06-07 06:58:36 +1000 (Sun, 07 Jun 2009) | 2 lines Make script executable ........ r41305 | fingolfin | 2009-06-07 07:37:30 +1000 (Sun, 07 Jun 2009) | 1 line GOB: Turned _spritesArray into a Common::Array (of fixed size) to detect out-of-bounds access to it (since access is controlled by scripts, this could (and does :/) easily happen. Also removed an obsolete swap() method, and fixed one case where _spritesArray was indeed accessed out of bounds ........ r41306 | drmccoy | 2009-06-07 07:41:22 +1000 (Sun, 07 Jun 2009) | 2 lines Fixing the Woodruff intro: Using a flag that's /not/ already used be the scripts ........ r41307 | drmccoy | 2009-06-07 07:45:47 +1000 (Sun, 07 Jun 2009) | 2 lines Fixing the demoplayer's auto double mode and added a REBASE0 option that sets the video's X and Y coordinates to 0,0 ........ r41308 | drmccoy | 2009-06-07 07:54:12 +1000 (Sun, 07 Jun 2009) | 2 lines Setting the game type of the generic demoplayer to Urban so it can make use of the initial palette ........ r41309 | fingolfin | 2009-06-07 09:22:22 +1000 (Sun, 07 Jun 2009) | 1 line GUI: Simplified ThemeEngine::getImageSurface (this way it's easier to add more graphics in the future ;) ........ r41310 | fingolfin | 2009-06-07 09:22:35 +1000 (Sun, 07 Jun 2009) | 1 line GUI: Pressing 'ESC' in the Launcher's quick search field now resets the search filter ........ r41311 | fingolfin | 2009-06-07 09:22:48 +1000 (Sun, 07 Jun 2009) | 1 line GUI: Tweaked the launcher so that TAB switches focus between the list and the quick search field ........ r41312 | drmccoy | 2009-06-07 09:39:58 +1000 (Sun, 07 Jun 2009) | 1 line Renamed the evaluateStore opcodes to assign, because that's what they are ........ r41313 | drmccoy | 2009-06-07 09:40:11 +1000 (Sun, 07 Jun 2009) | 1 line Fascination needs o1_assign. o2_assign breaks the DOS floppy version ........ r41314 | athrxx | 2009-06-07 10:37:30 +1000 (Sun, 07 Jun 2009) | 1 line LOL: implemented king richard healing sequence ........ r41315 | lordhoto | 2009-06-07 10:51:19 +1000 (Sun, 07 Jun 2009) | 2 lines Fix WSA v2 code, now the automap remove WSA file in Lands of Lore plays correctly. ........ r41316 | lordhoto | 2009-06-07 10:58:14 +1000 (Sun, 07 Jun 2009) | 2 lines Add support for "WF_NO_LAST_FRAME" in WSA v1 code too. Since so far every v1 WSA file played fine, it might be unneeded, but better safe than sorry. ........ r41317 | drmccoy | 2009-06-07 11:45:09 +1000 (Sun, 07 Jun 2009) | 1 line Dropping the v1 parser functions in favour of the extended v2 ones ........ r41318 | waltervn | 2009-06-07 12:18:38 +1000 (Sun, 07 Jun 2009) | 2 lines SCI: Resmgr cleanup and preparations for moving resource36 handling into resmgr. ........ r41322 | strangerke | 2009-06-07 18:33:46 +1000 (Sun, 07 Jun 2009) | 1 line Suppress use of parse_v1 and parse_v2 as DrMcCoy got rid of them. ........ r41323 | strangerke | 2009-06-07 18:46:15 +1000 (Sun, 07 Jun 2009) | 1 line Suppress inclusion of a not yet committed file ........ r41324 | sev | 2009-06-07 20:03:19 +1000 (Sun, 07 Jun 2009) | 2 lines Mention recent improvements ........ r41325 | sev | 2009-06-07 20:04:41 +1000 (Sun, 07 Jun 2009) | 2 lines Added MD5 from Bug #2796782: "SCI: LSL1 Russian MD5" ........ r41326 | sev | 2009-06-07 20:13:05 +1000 (Sun, 07 Jun 2009) | 2 lines MD5 from bugreport #2797962: "SCI: Laura Bows 2 german, md5" ........ r41327 | athrxx | 2009-06-07 20:34:01 +1000 (Sun, 07 Jun 2009) | 1 line LOL: implemented some missing monster animation code ........ r41328 | fingolfin | 2009-06-07 21:02:51 +1000 (Sun, 07 Jun 2009) | 1 line Set svn:ignore ........ r41331 | fingolfin | 2009-06-07 22:37:16 +1000 (Sun, 07 Jun 2009) | 1 line AGI: Fixed typo in game name ;) ........ r41332 | fingolfin | 2009-06-07 22:47:10 +1000 (Sun, 07 Jun 2009) | 1 line Added an experimental '--upgrade-targets' option (to be refined; and possibly hooked to the GUI eventually). This updates the guioptions,platform and lang for all your targets (and with a source change, also the descriptions) ........ r41333 | fingolfin | 2009-06-07 23:04:03 +1000 (Sun, 07 Jun 2009) | 1 line Added some new method variants to Common::String ........ r41334 | fingolfin | 2009-06-07 23:04:16 +1000 (Sun, 07 Jun 2009) | 1 line Fix for bug #2802492 (GUI: search query causes game list scrollbar glitches) ........ r41336 | athrxx | 2009-06-07 23:07:16 +1000 (Sun, 07 Jun 2009) | 1 line LOL: implemented two more opcodes for castle cimmeria ........ r41337 | fingolfin | 2009-06-07 23:14:34 +1000 (Sun, 07 Jun 2009) | 1 line Fixed appending a (substring of a) string to itself ........ r41338 | thebluegr | 2009-06-08 01:53:30 +1000 (Mon, 08 Jun 2009) | 1 line Replaced/removed KP_UINT, KP_SINT, SKPV and UKPV as well as the VIEW_PRIORITY and PRIORITY_BAND_FIRST wrappers ........ r41339 | thebluegr | 2009-06-08 02:44:57 +1000 (Mon, 08 Jun 2009) | 1 line Init _opl to 0. This prevents a crash on exit when the Adlib driver is closed, if the game music driver doesn't support music for the currently playing game (e.g. Christmas 1998) ........ r41340 | thebluegr | 2009-06-08 02:50:34 +1000 (Mon, 08 Jun 2009) | 1 line Replaced KP_ALT, SKPV_OR_ALT and UKPV_OR_ALT ........ r41341 | fingolfin | 2009-06-08 03:05:58 +1000 (Mon, 08 Jun 2009) | 1 line cleanup ........ r41342 | fingolfin | 2009-06-08 03:06:32 +1000 (Mon, 08 Jun 2009) | 1 line SCI: Renamed various song/songlib related structs and members ........ r41343 | fingolfin | 2009-06-08 03:06:51 +1000 (Mon, 08 Jun 2009) | 1 line SCI: Objectified SongLibrary ........ r41344 | fingolfin | 2009-06-08 03:07:07 +1000 (Mon, 08 Jun 2009) | 1 line SCI: Objectified Song struct 'a bit' ........ r41345 | fingolfin | 2009-06-08 03:07:25 +1000 (Mon, 08 Jun 2009) | 1 line SCI: Simplified SongLibrary code a bit ........ r41346 | fingolfin | 2009-06-08 03:18:11 +1000 (Mon, 08 Jun 2009) | 1 line SCI: Fixed the broken SciEngine::pauseEngineIntern code by ensuring that SciEngine::_gamestate is updated whenever the EngineState gets changed (due to loading a savestate) ........ r41348 | athrxx | 2009-06-08 04:51:03 +1000 (Mon, 08 Jun 2009) | 1 line LOL: minor bug fix in battle system ........ r41349 | waltervn | 2009-06-08 05:15:55 +1000 (Mon, 08 Jun 2009) | 2 lines SCI: Moved resource36 handling into resource manager. ........ r41350 | lordhoto | 2009-06-08 05:58:00 +1000 (Mon, 08 Jun 2009) | 2 lines Avoid warning about missing SFX file in Lands of Lore (it seems the original misses some datafiles for certain effects). ........ r41351 | lordhoto | 2009-06-08 06:43:43 +1000 (Mon, 08 Jun 2009) | 2 lines Remove LoLEngine::_gameFlags and convert all Lands of Lore code to use _flagsTable instead. ........ r41352 | sev | 2009-06-08 08:05:57 +1000 (Mon, 08 Jun 2009) | 3 lines Added current keymapper dialog to all themes so it could be tested by other devs. ........ r41353 | thebluegr | 2009-06-08 08:15:28 +1000 (Mon, 08 Jun 2009) | 1 line Applied madmoose's patch from bug report #2794216 - "Loading large Smacker movies is slow" ........ r41354 | thebluegr | 2009-06-08 08:17:44 +1000 (Mon, 08 Jun 2009) | 1 line Formatting ........ r41355 | sev | 2009-06-08 08:19:48 +1000 (Mon, 08 Jun 2009) | 3 lines Added Clear button for search box. Looks a bit off, but we do not yet have skinned buttons. ........ r41356 | thebluegr | 2009-06-08 08:34:03 +1000 (Mon, 08 Jun 2009) | 1 line Changed the bitstream buffer used to initialize the big Huffman trees to be a normal byte array, instead of a Common::Array ........ r41357 | lordhoto | 2009-06-08 08:41:38 +1000 (Mon, 08 Jun 2009) | 2 lines Remove unneeded functionality from Screen. ........ r41358 | athrxx | 2009-06-08 08:42:21 +1000 (Mon, 08 Jun 2009) | 1 line LOL: minor bug fix ........ r41359 | fingolfin | 2009-06-08 09:04:34 +1000 (Mon, 08 Jun 2009) | 1 line SCI: Got rid of g_EngineState ........ r41360 | fingolfin | 2009-06-08 09:05:11 +1000 (Mon, 08 Jun 2009) | 1 line SCI: C++ified the song iterator code a little bit more ........ r41361 | thebluegr | 2009-06-08 09:29:11 +1000 (Mon, 08 Jun 2009) | 1 line Hopefully fixed memory corruption when loading games ........ r41362 | lordhoto | 2009-06-08 12:26:33 +1000 (Mon, 08 Jun 2009) | 3 lines - Fix Screen_v2::wsaFrameAnimationStep, now the MR album and LoL intro demo WSAs will be correctly played - Made album page change in MR a bit slower, so it's visible at least ........ r41363 | djwillis | 2009-06-08 18:21:18 +1000 (Mon, 08 Jun 2009) | 1 line Virtual Keyboard: Fix default keyboard pack to return correct events for ENTER and !. ........ r41364 | thebluegr | 2009-06-08 18:38:10 +1000 (Mon, 08 Jun 2009) | 1 line Moved some more debug commands to ScummVM's console ........ r41365 | Kirben | 2009-06-08 18:56:32 +1000 (Mon, 08 Jun 2009) | 1 line Update details for the Polish version of The Feeble Files. ........ r41366 | djwillis | 2009-06-08 19:10:12 +1000 (Mon, 08 Jun 2009) | 1 line Virtual Keyboard: Add source files for the default keyboard pack seperate from ZIP archive (makes it easier to version the packs vkeybd.xml and track fixes) and add script to build keyboard pack(s) ZIP's from source files (based on /gui/themes/scummtheme.py). ........ r41367 | thebluegr | 2009-06-08 21:42:13 +1000 (Mon, 08 Jun 2009) | 1 line Replaced GFXWARN with warning and GFXDEBUG with debugC ........ r41368 | waltervn | 2009-06-08 22:20:36 +1000 (Mon, 08 Jun 2009) | 2 lines SCI: Cleanup ........ r41369 | Hkz | 2009-06-08 22:37:24 +1000 (Mon, 08 Jun 2009) | 1 line sword1: add Broken Sword PSX demo support ........ r41372 | Kirben | 2009-06-09 00:21:43 +1000 (Tue, 09 Jun 2009) | 1 line Add Polish font data for The Feeble Files. ........ r41373 | djwillis | 2009-06-09 00:47:38 +1000 (Tue, 09 Jun 2009) | 1 line Virtual Keyboard: Move vkeybd.zip into packs folder and rename default keyboard pack to vkeybd_default(.zip) with updates to default-events.cpp. Also update vkeybdpack.py to use zlib compression if Python zlib is found. Update GP2X and GP2XWiz bundle files to get new vkeybd_default.zip. ........ r41374 | Kirben | 2009-06-09 00:50:34 +1000 (Tue, 09 Jun 2009) | 1 line Add more Polish font data for The Feeble Files. ........ r41375 | Kirben | 2009-06-09 00:55:11 +1000 (Tue, 09 Jun 2009) | 1 line Spacing. ........ r41376 | djwillis | 2009-06-09 01:45:03 +1000 (Tue, 09 Jun 2009) | 1 line Virtual Keyboard: Fix slight error in earlier commit (failed to rename the XML to match the keyboard pack name). ........ r41379 | lordhoto | 2009-06-09 03:47:37 +1000 (Tue, 09 Jun 2009) | 2 lines Fix out of bounds memory access in Screen::drawShape. ........ r41380 | Hkz | 2009-06-09 03:54:44 +1000 (Tue, 09 Jun 2009) | 1 line sword1: slight cleanup of psx related sound code and comments ........ r41381 | lordhoto | 2009-06-09 04:30:28 +1000 (Tue, 09 Jun 2009) | 2 lines Cleanup. ........ r41384 | lordhoto | 2009-06-09 06:11:07 +1000 (Tue, 09 Jun 2009) | 3 lines - Cleanup - Fix regression in Kyra1 outro ........ r41385 | djwillis | 2009-06-09 06:31:49 +1000 (Tue, 09 Jun 2009) | 1 line Virtual Keyboard: Add some quick changes to the virtual keyboard to activate submit and cancel events from the default lowercase keyboards. This makes it possible to cancel and submit without having to call Common::KEYCODE_F7 again. Sorry for the nasty (temp) graphics. ........ r41386 | buddha_ | 2009-06-09 06:46:21 +1000 (Tue, 09 Jun 2009) | 3 lines Convert FWRenderer and OSRenderer to use Cine::Palette. Also fix some bugs that came up in testing of Cine::Palette. ........ r41389 | sev | 2009-06-09 07:52:32 +1000 (Tue, 09 Jun 2009) | 2 lines Actually we /did not/ put periods at ends of the sentences in majority of past entries ........ r41393 | Kirben | 2009-06-09 10:00:24 +1000 (Tue, 09 Jun 2009) | 1 line Correct check for font data table used in The Feeble Files. ........ r41395 | Kirben | 2009-06-09 16:37:42 +1000 (Tue, 09 Jun 2009) | 1 line Remove unused old code. ........ r41398 | lordhoto | 2009-06-09 21:26:15 +1000 (Tue, 09 Jun 2009) | 5 lines - Moved Screen_v2::copyWsaRect to Screen::copyWsaRect - Made WSAMovie_v1::displayFrame code match the original - Changed WSAMovieAmiga::displayFrame to use Screen::copyWsaRect too - Got rid of '...' parameter usage in all WSA player classes ........ r41400 | wjpalenstijn | 2009-06-10 01:26:09 +1000 (Wed, 10 Jun 2009) | 1 line Add (failing) hashmap test case for collision handling ........ r41401 | lordhoto | 2009-06-10 01:34:02 +1000 (Wed, 10 Jun 2009) | 2 lines Changed some lines to tabs instead of whitespaces for identation. ........ r41402 | drmccoy | 2009-06-10 04:14:49 +1000 (Wed, 10 Jun 2009) | 1 line Win Gob3 is multi-lingual (British, French, German) ........ r41403 | drmccoy | 2009-06-10 04:18:11 +1000 (Wed, 10 Jun 2009) | 1 line Win Gob2 is multi-lingual (American, French, German) ........ r41404 | drmccoy | 2009-06-10 04:19:11 +1000 (Wed, 10 Jun 2009) | 1 line Win Gob1 is multi-lingual (British, French, German, Italian, Spanish) ........ r41405 | drmccoy | 2009-06-10 04:52:55 +1000 (Wed, 10 Jun 2009) | 1 line Multi-lingual Inca2 version (American, French, German, Italian, Spanish) ........ r41406 | drmccoy | 2009-06-10 04:53:17 +1000 (Wed, 10 Jun 2009) | 1 line Win Lost in Time is multi-lingual (British, French, Spanish) ........ r41407 | drmccoy | 2009-06-10 04:53:35 +1000 (Wed, 10 Jun 2009) | 2 lines Added a workaround for Win Lost in Time. It's got VMD files which are still referenced as IMD ........ r41408 | waltervn | 2009-06-10 05:18:48 +1000 (Wed, 10 Jun 2009) | 2 lines SCI: Moved SCI1 audio map handling into the resource manager. ........ r41409 | drmccoy | 2009-06-10 05:37:24 +1000 (Wed, 10 Jun 2009) | 1 line Fixed CLEAR ........ r41419 | sev | 2009-06-10 18:18:44 +1000 (Wed, 10 Jun 2009) | 1 line Clarify that Cygwin is not supported as building platform anymore ........ r41421 | sev | 2009-06-10 20:11:24 +1000 (Wed, 10 Jun 2009) | 1 line Added debugCN() call which does not add newline automatically ........ r41423 | dreammaster | 2009-06-10 22:15:50 +1000 (Wed, 10 Jun 2009) | 1 line Added variable to savegame format so that savegames can be correctly loaded from the ScummVM launcher ........ r41424 | dreammaster | 2009-06-10 22:16:30 +1000 (Wed, 10 Jun 2009) | 1 line Added support for loading savegames from the launcher ........ r41425 | lordhoto | 2009-06-10 22:47:19 +1000 (Wed, 10 Jun 2009) | 2 lines Fix documentation for debugC and debugCN, relying on special debug levels. ........ r41428 | lordhoto | 2009-06-11 01:01:20 +1000 (Thu, 11 Jun 2009) | 2 lines Fix a bug in disableCursorPalette, where it never allowed the palette to be enabled properly again. ........ r41429 | strangerke | 2009-06-11 01:04:21 +1000 (Thu, 11 Jun 2009) | 3 lines Gob detection : - use GUIO_NOSPEECH and GUIO_NOSUBTITLES intensively, as there is no control other them even when they are present - Replace non-ASCII characters by hex values ........ r41430 | lordhoto | 2009-06-11 01:11:17 +1000 (Thu, 11 Jun 2009) | 2 lines Extend documentation for "kFeatureCursorHasPalette". ........ r41432 | lordhoto | 2009-06-11 01:20:52 +1000 (Thu, 11 Jun 2009) | 2 lines Add a convenience wrapper to CursorMan for checking whether cursor palettes are supported. ........ r41433 | jvprat | 2009-06-11 01:33:37 +1000 (Thu, 11 Jun 2009) | 2 lines Point to the Cursor and AudioCD Managers to help engine authors following the right path. ........ r41452 | sev | 2009-06-12 01:45:52 +1000 (Fri, 12 Jun 2009) | 1 line Added set of CoCo3 AGI games ........ r41453 | buddha_ | 2009-06-12 04:32:35 +1000 (Fri, 12 Jun 2009) | 8 lines Fix Operation Stealth's 2nd arcade sequence's revolving doors. - Now the doors actually do revolve when before they didn't. - The fix was to alias the 9th background with the collision page directly when loading collision page data. This way changes written to the 9th background go to the collision page and vice versa (And there were changes in the labyrinth). - Also converted _bgTable from a pure array to a Common::Array ........ r41458 | peres001 | 2009-06-12 15:03:18 +1000 (Fri, 12 Jun 2009) | 2 lines * Final version of the IFF parsing code. * Refactored ILBMDecoder usage from disk code. ........ r41459 | peres001 | 2009-06-12 16:20:11 +1000 (Fri, 12 Jun 2009) | 1 line Removed a leftover printf(). ........ r41460 | peres001 | 2009-06-12 17:18:01 +1000 (Fri, 12 Jun 2009) | 2 lines * Replaced the A8SVXDecoder class with a function to return an AudioStream in trunk/sound/. * Refactored sound code in Parallaction to use the new Audio::make8SVXStream. ........ r41461 | peres001 | 2009-06-12 17:55:44 +1000 (Fri, 12 Jun 2009) | 1 line Cleanup of sound code. ........ r41462 | sev | 2009-06-12 18:00:26 +1000 (Fri, 12 Jun 2009) | 1 line Rename KeyRemapper dialog to KeyMapper ........ r41465 | peres001 | 2009-06-12 18:51:05 +1000 (Fri, 12 Jun 2009) | 2 lines * Moved the updated IFF code from Parallaction to common/ * Updated Parallaction and SAGA to use the new decoder infrastructure. ........ r41468 | peres001 | 2009-06-12 19:49:38 +1000 (Fri, 12 Jun 2009) | 3 lines * Adapted Kyra to the new IFFParser interface. * Adapted the new IFFParser to Kyra (slightly). The Kyra1 demo on the website works. ........ r41470 | peres001 | 2009-06-12 19:56:07 +1000 (Fri, 12 Jun 2009) | 1 line Finally fix build (extra qualifier removed). ........ r41473 | peres001 | 2009-06-12 20:26:15 +1000 (Fri, 12 Jun 2009) | 1 line Added missing return statements. ........ r41474 | peres001 | 2009-06-12 20:26:58 +1000 (Fri, 12 Jun 2009) | 1 line Fixed disposeStream initialization. ........ r41484 | strangerke | 2009-06-13 08:35:08 +1000 (Sat, 13 Jun 2009) | 1 line Fix MSVC compilation : iff.h and iff.cpp were move from engines\parallaction\ to graphics\ ........ r41485 | waltervn | 2009-06-13 09:29:27 +1000 (Sat, 13 Jun 2009) | 2 lines SCI: Added detection entries for Japanese QFG. ........ r41486 | waltervn | 2009-06-13 09:46:23 +1000 (Sat, 13 Jun 2009) | 2 lines SCI: Moved audio code from AudioResource to the sfx core. ........ r41487 | strangerke | 2009-06-13 17:54:25 +1000 (Sat, 13 Jun 2009) | 1 line Oups. disk.cpp was also missing in MSVC files ........ r41488 | vinterstum | 2009-06-13 19:40:42 +1000 (Sat, 13 Jun 2009) | 1 line Updated xcode project ........ r41489 | thebluegr | 2009-06-13 20:20:12 +1000 (Sat, 13 Jun 2009) | 1 line Properly updated the MSVC project files of the parallaction engine, fixing compilation. Side note: please, don't include files outside the engine's directory (like files in /common) for engine project files - it's wrong, as the same code will be compiled twice ........ r41490 | thebluegr | 2009-06-13 20:23:23 +1000 (Sat, 13 Jun 2009) | 1 line Removed duplicate entry of disk.cpp ........ r41493 | vinterstum | 2009-06-13 23:27:21 +1000 (Sat, 13 Jun 2009) | 1 line Buildfix for gcc 3.3 (moved a template class member into the header file) ........ r41496 | wjpalenstijn | 2009-06-14 07:07:05 +1000 (Sun, 14 Jun 2009) | 3 lines Fix erase() sometimes hiding other hash elements. Like CPython, we now use a dummy node to mark nodes as erased, so that lookup() can skip over it. All tests should now pass again. ........ r41497 | drmccoy | 2009-06-14 08:10:55 +1000 (Sun, 14 Jun 2009) | 1 line Making TotTextData's item's offsets unsigned. This could fix the crash in the Polish Woodruff version (bug #2804962) ........ r41498 | strangerke | 2009-06-14 08:14:58 +1000 (Sun, 14 Jun 2009) | 1 line Gob - *WIP* incomplete implementation of MDY/TBR ........ r41499 | drmccoy | 2009-06-14 08:35:22 +1000 (Sun, 14 Jun 2009) | 1 line Warn when a sprite operation is to be performed on a nonexistent surface instead of crashing ........ r41500 | lordhoto | 2009-06-14 08:40:30 +1000 (Sun, 14 Jun 2009) | 2 lines Strip trailing whitespaces. ........ r41501 | sev | 2009-06-14 08:48:16 +1000 (Sun, 14 Jun 2009) | 2 lines Added sanity checking to stopSound() and a bit more debug output ........ r41502 | lordhoto | 2009-06-14 08:48:32 +1000 (Sun, 14 Jun 2009) | 2 lines Added periods to every news entry (actually it seems like we always did that in the past, but were a bit lazier in the last time). ........ r41503 | lordhoto | 2009-06-14 09:04:26 +1000 (Sun, 14 Jun 2009) | 2 lines Added yet another missing period at the end of a line. (I hope I catched all now) ........ r41504 | marcus_c | 2009-06-14 09:42:39 +1000 (Sun, 14 Jun 2009) | 5 lines Detected games with different language or platform are now no longer treated as duplicates, even if they have the same target and directory. Also, pass these parameters to the ConfMan, so that the correct version of the game is started. ........ r41506 | dreammaster | 2009-06-14 13:39:30 +1000 (Sun, 14 Jun 2009) | 1 line Beginnings of music support for Cruise, based on the cine engine sound code (note that the music played isn't yet correct, though) ........ r41507 | lordhoto | 2009-06-14 21:08:35 +1000 (Sun, 14 Jun 2009) | 2 lines Fix unused variable warning. ........ r41508 | drmccoy | 2009-06-14 22:19:42 +1000 (Sun, 14 Jun 2009) | 1 line Fixed an animation speed regression that got introduced when I added a lag compensation for Woodruff ........ r41516 | lordhoto | 2009-06-15 00:05:42 +1000 (Mon, 15 Jun 2009) | 2 lines Got rid of a needless "getEventManager" call. (Using Engine::_eventMan now instead) ........ r41517 | waltervn | 2009-06-15 00:11:21 +1000 (Mon, 15 Jun 2009) | 2 lines SCI: Added detection entries for Japanese SQ4. ........ r41519 | lordhoto | 2009-06-15 00:24:28 +1000 (Mon, 15 Jun 2009) | 2 lines Cleanup. ........ r41520 | cyx | 2009-06-15 01:07:34 +1000 (Mon, 15 Jun 2009) | 1 line simplified .raw/.wav data files handling in introduction sequences ........ r41528 | jvprat | 2009-06-15 08:10:17 +1000 (Mon, 15 Jun 2009) | 2 lines Fix groovie's GUI game options ........ r41536 | sev | 2009-06-15 17:06:52 +1000 (Mon, 15 Jun 2009) | 2 lines Run AGIMOUSE hack as a side effect always ........ r41537 | thebluegr | 2009-06-15 18:24:01 +1000 (Mon, 15 Jun 2009) | 1 line Added the missing pixelformat.h file ........ r41538 | thebluegr | 2009-06-15 18:44:35 +1000 (Mon, 15 Jun 2009) | 1 line Added aliases for the script/breakpoint related commands and added the debugflag related commands to the help screen ........ r41556 | strangerke | 2009-06-16 05:46:00 +1000 (Tue, 16 Jun 2009) | 1 line Add MD5 for Playtoons 4 FR ........ r41557 | athrxx | 2009-06-16 06:52:09 +1000 (Tue, 16 Jun 2009) | 4 lines LOL: - started on the ingame menu code (death menu, load menu and main menu) - fixed regression in kyra gui code (broken menu highlighting) - fixed minor bug in animation code ........ r41559 | strangerke | 2009-06-16 07:28:11 +1000 (Tue, 16 Jun 2009) | 1 line renamed playtoons target names to insult-free target names (maybe non-definitive names) ........ r41560 | athrxx | 2009-06-16 07:39:43 +1000 (Tue, 16 Jun 2009) | 1 line LOL: implemented quit menu ........ r41562 | drmccoy | 2009-06-16 09:07:38 +1000 (Tue, 16 Jun 2009) | 1 line Merging parseValExpr and parseExpr ........ r41563 | drmccoy | 2009-06-16 09:07:55 +1000 (Tue, 16 Jun 2009) | 1 line Renamed varPos to varBase and split off getVarBase() from parseVarIndex() and parseExpr() ........ r41564 | drmccoy | 2009-06-16 09:08:09 +1000 (Tue, 16 Jun 2009) | 1 line Renamed various variables to better reflect their meaning ........ r41565 | drmccoy | 2009-06-16 09:08:28 +1000 (Tue, 16 Jun 2009) | 1 line Propagating variable name changes ........ r41566 | drmccoy | 2009-06-16 09:08:44 +1000 (Tue, 16 Jun 2009) | 1 line Fixing the signness indicated by the OP_ enums ........ r41567 | drmccoy | 2009-06-16 09:09:04 +1000 (Tue, 16 Jun 2009) | 1 line Adding a TYPE_ enum ........ r41568 | drmccoy | 2009-06-16 09:09:23 +1000 (Tue, 16 Jun 2009) | 1 line Using the TYPE_ enum where applicable ........ r41569 | drmccoy | 2009-06-16 09:09:37 +1000 (Tue, 16 Jun 2009) | 1 line Renaming some variables in o1_assign() and o2_assign() to mirror the structure in o6_assign() ........ r41570 | drmccoy | 2009-06-16 09:09:57 +1000 (Tue, 16 Jun 2009) | 1 line Using cmpHelper for OP_NEQ too, since the original does a normal strcmp there as well. No idea where the stricmp came from ........ r41571 | drmccoy | 2009-06-16 09:10:10 +1000 (Tue, 16 Jun 2009) | 1 line Remove some now superfluous comments ........ r41572 | drmccoy | 2009-06-16 09:10:27 +1000 (Tue, 16 Jun 2009) | 1 line Splitting up parseExpr a bit ........ r41573 | drmccoy | 2009-06-16 09:10:51 +1000 (Tue, 16 Jun 2009) | 1 line Moving _inter_resVal and _inter_resStr from Global to Parse ........ r41574 | drmccoy | 2009-06-16 09:11:08 +1000 (Tue, 16 Jun 2009) | 1 line Renaming _inter_resVal to _resultInt ........ r41575 | drmccoy | 2009-06-16 09:11:29 +1000 (Tue, 16 Jun 2009) | 1 line Renamed _inter_resStr to _resultStr ........ r41576 | athrxx | 2009-06-16 09:22:31 +1000 (Tue, 16 Jun 2009) | 1 line KYRA: fixed regression (broken menu slide bars in HOF/MR) ........ r41579 | strangerke | 2009-06-16 17:14:07 +1000 (Tue, 16 Jun 2009) | 1 line Add MD5 for Playtoons 3 (english) ........ r41584 | strangerke | 2009-06-16 22:25:53 +1000 (Tue, 16 Jun 2009) | 1 line MDY/TBR : fix a thing or two. Still far from being OK, but in-game ambiance "music" is (a little) less buggy ........ r41587 | Hkz | 2009-06-17 04:58:21 +1000 (Wed, 17 Jun 2009) | 1 line tinsel: check only english.txt for DW1 psx version detection, and use recursive "SearchMan.addDirectory()" to obtain subdirs for Discworld PSX datafiles ........ r41588 | lordhoto | 2009-06-17 05:26:44 +1000 (Wed, 17 Jun 2009) | 2 lines Formatting. ........ r41589 | drmccoy | 2009-06-17 06:14:56 +1000 (Wed, 17 Jun 2009) | 1 line Encapsulating stack adjustments ........ r41590 | drmccoy | 2009-06-17 06:15:19 +1000 (Wed, 17 Jun 2009) | 1 line Encapsulating the Stack and StackFrame a bit ........ r41591 | drmccoy | 2009-06-17 06:15:49 +1000 (Wed, 17 Jun 2009) | 1 line Properly initializing _soundMode, for ADLs too ........ r41592 | drmccoy | 2009-06-17 06:39:37 +1000 (Wed, 17 Jun 2009) | 1 line Including scummsys.h and forward-declaring GobEngine ........ r41596 | athrxx | 2009-06-17 07:23:26 +1000 (Wed, 17 Jun 2009) | 1 line LOL: implemented options menu (settings aren't saved yet) ........ r41598 | sev | 2009-06-17 07:59:20 +1000 (Wed, 17 Jun 2009) | 2 lines Disable music for CoCo3 games. It has different format. ........ r41601 | drmccoy | 2009-06-17 14:15:45 +1000 (Wed, 17 Jun 2009) | 1 line Changed opcodeDraw to be functor-based ........ r41602 | drmccoy | 2009-06-17 14:16:21 +1000 (Wed, 17 Jun 2009) | 1 line Changed opcodeFunc to be functor-based ........ r41603 | drmccoy | 2009-06-17 14:16:51 +1000 (Wed, 17 Jun 2009) | 1 line Changed opcodeGob to be functor-based ........ r41611 | strangerke | 2009-06-18 04:48:41 +1000 (Thu, 18 Jun 2009) | 2 lines - Modify detection files for Playtoons CK Knights (CK2) as it wasn't making the difference with CK1 - Add Playtoons CK Monsters (CK1) ........ r41618 | sev | 2009-06-18 09:16:21 +1000 (Thu, 18 Jun 2009) | 2 lines Preliminary support for CoCo3 music. ........ r41619 | dhewg | 2009-06-18 09:36:00 +1000 (Thu, 18 Jun 2009) | 1 line Moved the wiidist target to ports.mk, cleaned it up and automated meta.xml generation. ........ r41630 | dreammaster | 2009-06-18 21:37:45 +1000 (Thu, 18 Jun 2009) | 1 line Removed redundant code that isn't used ........ r41632 | drmccoy | 2009-06-18 23:27:14 +1000 (Thu, 18 Jun 2009) | 1 line Replacing some #includes by forward declarations ........ r41633 | drmccoy | 2009-06-18 23:27:35 +1000 (Thu, 18 Jun 2009) | 1 line Splitting an ADLPlayer and MDYPlayer from the AdLib class ........ r41634 | drmccoy | 2009-06-18 23:27:48 +1000 (Thu, 18 Jun 2009) | 1 line Oops, forgot again that Fascination needs o1_assign ........ r41635 | Hkz | 2009-06-18 23:50:26 +1000 (Thu, 18 Jun 2009) | 1 line scumm: added the missing word "version" in a comment ........ r41639 | dhewg | 2009-06-19 04:40:38 +1000 (Fri, 19 Jun 2009) | 1 line added DIST_FILES_DOCS to Makefile.common, used by some dist targets now, incl. OSX bundles. ........ r41641 | vinterstum | 2009-06-19 04:57:17 +1000 (Fri, 19 Jun 2009) | 1 line Improved the iphone swipe input handling ........ r41644 | dhewg | 2009-06-19 05:39:12 +1000 (Fri, 19 Jun 2009) | 1 line added pred.dic to DIST_FILES_ENGINEDATA ........ r41645 | drmccoy | 2009-06-19 07:08:51 +1000 (Fri, 19 Jun 2009) | 1 line Removing the useless _vm->_parse-> ........ r41646 | lordhoto | 2009-06-19 07:47:10 +1000 (Fri, 19 Jun 2009) | 2 lines Replaced "getRandomNumberSpecial" be RandomSource usage. (This is needed for proper event recording, also the probability for generated numbers is actually nearly the same) ........ r41647 | fingolfin | 2009-06-19 08:09:57 +1000 (Fri, 19 Jun 2009) | 1 line Patch ........ r41660 | thebluegr | 2009-06-19 17:56:30 +1000 (Fri, 19 Jun 2009) | 1 line Fixed a warning about an uninitialized variable ........ r41663 | drmccoy | 2009-06-19 19:42:41 +1000 (Fri, 19 Jun 2009) | 1 line Ooops, forgot to change the array when copy-pasting the description function ........ r41664 | drmccoy | 2009-06-19 19:43:01 +1000 (Fri, 19 Jun 2009) | 1 line Fixing The Last Dynasty again after the opcode dispatcher changes ........ r41665 | dreammaster | 2009-06-19 19:44:33 +1000 (Fri, 19 Jun 2009) | 1 line Added myself to the CRUISE engine credits ........ r41668 | drmccoy | 2009-06-19 19:55:23 +1000 (Fri, 19 Jun 2009) | 1 line Added my German version of The Last Dynasty ........ r41677 | athrxx | 2009-06-20 03:03:28 +1000 (Sat, 20 Jun 2009) | 2 lines LOL: - implemented bezel cup opcode - implemented font conversion for certain language specific characters in load game dialogue (only german atm) ........ r41679 | lordhoto | 2009-06-20 03:53:25 +1000 (Sat, 20 Jun 2009) | 2 lines Fix some warnings. ........ r41680 | waltervn | 2009-06-20 04:07:45 +1000 (Sat, 20 Jun 2009) | 2 lines SCI: Fix cel1 y-offset regression introduced in r40997. ........ r41683 | athrxx | 2009-06-20 04:46:19 +1000 (Sat, 20 Jun 2009) | 3 lines LOL: - implemented delete menu - fixed some bugs in the menu code ........ r41699 | dreammaster | 2009-06-20 16:20:12 +1000 (Sat, 20 Jun 2009) | 1 line Added explicit casts to _fontConversionTableGerman for systems where char is signed ........ r41700 | dreammaster | 2009-06-20 16:48:47 +1000 (Sat, 20 Jun 2009) | 1 line Finally tracked down the difference/bug in the music playing code - music playback now works ........ r41701 | dreammaster | 2009-06-20 17:36:12 +1000 (Sat, 20 Jun 2009) | 1 line Bugfix to fade out any currently playing music when the game is restarted ........ r41702 | dreammaster | 2009-06-20 18:15:01 +1000 (Sat, 20 Jun 2009) | 1 line Added proper saving of music state to savegames so music resumes when a savegame is loaded. ........ r41703 | dreammaster | 2009-06-20 18:15:39 +1000 (Sat, 20 Jun 2009) | 1 line Implemented the library function Op_SongExist ........ r41704 | cyx | 2009-06-20 20:52:55 +1000 (Sat, 20 Jun 2009) | 2 lines fixed OPL 0xB0 register write. the return value of findNote() already includes the octave, no need to readd it. ........ r41705 | dhewg | 2009-06-20 21:48:42 +1000 (Sat, 20 Jun 2009) | 2 lines split loadKeyboardPack(), fallback to the current dir when searching for packs, and free memory in the case of an error. ........ r41707 | dhewg | 2009-06-20 21:50:15 +1000 (Sat, 20 Jun 2009) | 1 line added vkeybd_default.zip to the Wii dist target. ........ r41708 | dhewg | 2009-06-20 21:53:31 +1000 (Sat, 20 Jun 2009) | 1 line oups, wrong spot. ........ r41709 | dreammaster | 2009-06-20 22:02:08 +1000 (Sat, 20 Jun 2009) | 1 line Changed many file reads and manual conversions from endian format to instead use file readSint16BE/readSint32BE calls ........ r41713 | athrxx | 2009-06-21 00:26:01 +1000 (Sun, 21 Jun 2009) | 1 line LOL: implemented save menu ........ r41714 | athrxx | 2009-06-21 01:09:55 +1000 (Sun, 21 Jun 2009) | 1 line LOL: cleanup ........ r41715 | athrxx | 2009-06-21 02:36:26 +1000 (Sun, 21 Jun 2009) | 1 line LOL: minor fix for save menu ........ r41718 | lordhoto | 2009-06-21 11:14:57 +1000 (Sun, 21 Jun 2009) | 1 line Prevent font code to draw characters not included in the font. ........ r41719 | lordhoto | 2009-06-21 11:15:09 +1000 (Sun, 21 Jun 2009) | 1 line Fix drawing of sharp s. ........ r41720 | lordhoto | 2009-06-21 11:15:24 +1000 (Sun, 21 Jun 2009) | 1 line Moved CP850<->ISO-8859-1 conversion to Util. ........ r41721 | lordhoto | 2009-06-21 11:15:37 +1000 (Sun, 21 Jun 2009) | 1 line Enable proper umlaut handling in kyra 1-3. ........ r41722 | lordhoto | 2009-06-21 11:15:47 +1000 (Sun, 21 Jun 2009) | 1 line Fix umlauts for original interpreter saves. ........ r41723 | lordhoto | 2009-06-21 11:22:23 +1000 (Sun, 21 Jun 2009) | 1 line Cleanup. ........ r41724 | dreammaster | 2009-06-21 15:13:29 +1000 (Sun, 21 Jun 2009) | 1 line Bugfixes to pre-loading and handling of resources such as sound files ........ r41725 | dreammaster | 2009-06-21 21:42:45 +1000 (Sun, 21 Jun 2009) | 1 line Changed .SPL (sound effect) loading to load the Adlib version of sound effects - sound effects now work ........ r41726 | dreammaster | 2009-06-21 21:53:11 +1000 (Sun, 21 Jun 2009) | 1 line Minor fixes to the individual note playing code ........ r41727 | thebluegr | 2009-06-21 23:06:08 +1000 (Sun, 21 Jun 2009) | 1 line Cleanup ........ r41729 | athrxx | 2009-06-22 02:59:51 +1000 (Mon, 22 Jun 2009) | 3 lines LOL: - implemented audio menu - menu settings now get saved - remove white spaces ........ r41730 | lordhoto | 2009-06-22 05:00:50 +1000 (Mon, 22 Jun 2009) | 1 line Cleanup: Change LoL code to use KYRA volume handling. ........ r41731 | lordhoto | 2009-06-22 05:01:04 +1000 (Mon, 22 Jun 2009) | 1 line Cleanup: Change LoL specific config entries to use underscores instead of whitespaces. ........ r41732 | lordhoto | 2009-06-22 05:49:20 +1000 (Mon, 22 Jun 2009) | 1 line Fix slider buttons in LoL (and some minor cleanup). ........ r41733 | lordhoto | 2009-06-22 06:10:45 +1000 (Mon, 22 Jun 2009) | 1 line Cleanup. ........ r41734 | athrxx | 2009-06-22 06:40:31 +1000 (Mon, 22 Jun 2009) | 2 lines LOL: - implemented support for "floating cursors" - prevent complete refresh for audio menu whenever a mouse button is pressed ........ r41735 | athrxx | 2009-06-22 07:05:06 +1000 (Mon, 22 Jun 2009) | 1 line LOL: minor fix for floating cursors ........ r41736 | lordhoto | 2009-06-22 07:17:41 +1000 (Mon, 22 Jun 2009) | 1 line Cleanup. ........ r41739 | lordhoto | 2009-06-22 12:34:35 +1000 (Mon, 22 Jun 2009) | 1 line Start refactoring palette handling into new class "Palette". ........ r41740 | lordhoto | 2009-06-22 12:35:04 +1000 (Mon, 22 Jun 2009) | 1 line Got rid of Screen::_currentPalette. ........ r41741 | lordhoto | 2009-06-22 12:35:45 +1000 (Mon, 22 Jun 2009) | 1 line Changed Screen::getPalette to return a reference to a Palette object. ........ r41742 | lordhoto | 2009-06-22 12:36:16 +1000 (Mon, 22 Jun 2009) | 1 line Add wrapper functionality for copying full palettes. ........ r41743 | lordhoto | 2009-06-22 12:36:54 +1000 (Mon, 22 Jun 2009) | 6 lines - Changed the following Screen functions to take a reference to a Palette object: -> setScreenPalette -> fadePalette -> getFadeParams -> fadePalStep - Fixed initialization of 256 color palettes ........ r41744 | lordhoto | 2009-06-22 12:37:20 +1000 (Mon, 22 Jun 2009) | 1 line Changed Screen::loadBitmap and Movie::open to take an optional Palette pointer instead of an optional array pointer. ........ r41745 | lordhoto | 2009-06-22 12:37:41 +1000 (Mon, 22 Jun 2009) | 1 line Changed Screen::loadPalette to take a reference to a Palette object instead of an array. ........ r41746 | lordhoto | 2009-06-22 12:37:57 +1000 (Mon, 22 Jun 2009) | 2 lines - Fixed regression in Screen::fadeToBlack - Fixed some palette regressions in Kyra1 Amiga (only the intro works currently) ........ r41747 | lordhoto | 2009-06-22 12:41:56 +1000 (Mon, 22 Jun 2009) | 1 line Fix memory leak. ........ r41748 | dreammaster | 2009-06-22 16:17:50 +1000 (Mon, 22 Jun 2009) | 1 line Implemented the Op_SetVolume method like the original, which simply set a dummy variable and never actually changed the volume ........ r41749 | dreammaster | 2009-06-22 16:35:08 +1000 (Mon, 22 Jun 2009) | 1 line Added the dummy volume variable to the savegame format ........ r41750 | drmccoy | 2009-06-22 20:11:25 +1000 (Mon, 22 Jun 2009) | 1 line Encapsulated access to Parse::_resultInt ........ r41751 | drmccoy | 2009-06-22 20:11:53 +1000 (Mon, 22 Jun 2009) | 1 line Encapsulated access to _resultStr ........ r41752 | drmccoy | 2009-06-22 20:12:33 +1000 (Mon, 22 Jun 2009) | 1 line Adding DataIO::existData() ........ r41753 | drmccoy | 2009-06-22 20:13:37 +1000 (Mon, 22 Jun 2009) | 1 line Encapsulating script file access ........ r41754 | drmccoy | 2009-06-22 20:14:18 +1000 (Mon, 22 Jun 2009) | 1 line Implemented a call stack ........ r41755 | drmccoy | 2009-06-22 20:14:49 +1000 (Mon, 22 Jun 2009) | 1 line Removing debug output ........ r41756 | drmccoy | 2009-06-22 20:15:14 +1000 (Mon, 22 Jun 2009) | 1 line Implemented loading TOTs from video file again ........ r41757 | drmccoy | 2009-06-22 20:15:52 +1000 (Mon, 22 Jun 2009) | 1 line Giving CollisionArea a full-blown Script pointer instead the data pointer ........ r41758 | drmccoy | 2009-06-22 20:16:17 +1000 (Mon, 22 Jun 2009) | 1 line Removing the now useless cuckoo function and shrink the call stack entries accordingly ........ r41759 | drmccoy | 2009-06-22 20:16:45 +1000 (Mon, 22 Jun 2009) | 1 line Unwinding the call stack before unloading the script ........ r41760 | drmccoy | 2009-06-22 20:29:32 +1000 (Mon, 22 Jun 2009) | 1 line Putting evalBoolResult() and evalExpr() into Script ........ r41761 | drmccoy | 2009-06-22 20:29:48 +1000 (Mon, 22 Jun 2009) | 1 line Removing the Parse object from GobEngine ........ r41762 | drmccoy | 2009-06-22 20:30:09 +1000 (Mon, 22 Jun 2009) | 1 line Pushing script.o down ........ r41763 | dreammaster | 2009-06-22 20:41:32 +1000 (Mon, 22 Jun 2009) | 1 line Removed redundant variation of the routine to play sound effects ........ r41765 | drmccoy | 2009-06-22 21:53:46 +1000 (Mon, 22 Jun 2009) | 1 line const correctness ........ r41766 | strangerke | 2009-06-22 22:03:58 +1000 (Mon, 22 Jun 2009) | 1 line Include recently added script.h and script.cpp ........ r41768 | drmccoy | 2009-06-23 02:29:00 +1000 (Tue, 23 Jun 2009) | 1 line Removing commented-out declarations ........ r41769 | drmccoy | 2009-06-23 02:29:16 +1000 (Tue, 23 Jun 2009) | 1 line Adding some comments ........ r41770 | drmccoy | 2009-06-23 02:29:31 +1000 (Tue, 23 Jun 2009) | 1 line Don't assert on pop when no script is loaded ........ r41771 | drmccoy | 2009-06-23 02:29:45 +1000 (Tue, 23 Jun 2009) | 1 line More signess consistency on the reading and seeking methods ........ r41772 | drmccoy | 2009-06-23 02:30:06 +1000 (Tue, 23 Jun 2009) | 1 line Renaming "Parse" to "Expression" ........ r41773 | drmccoy | 2009-06-23 02:30:35 +1000 (Tue, 23 Jun 2009) | 1 line Renaming parse.h and parse.cpp to expression.h and expression.cpp ........ r41774 | drmccoy | 2009-06-23 02:30:51 +1000 (Tue, 23 Jun 2009) | 1 line Renaming kDebugParser to kDebugExpression ........ r41777 | lordhoto | 2009-06-23 05:46:08 +1000 (Tue, 23 Jun 2009) | 1 line Fix palette regression in Lands of Lore. ........ r41778 | strangerke | 2009-06-23 05:56:06 +1000 (Tue, 23 Jun 2009) | 1 line rename parse.h and .cpp to expression.h and .cpp ........ r41781 | drmccoy | 2009-06-23 06:27:47 +1000 (Tue, 23 Jun 2009) | 1 line Added stream-reading loading wrappers to MDYPlayer and added a workaround to fix TBR reading for the moment ........ r41782 | drmccoy | 2009-06-23 06:51:34 +1000 (Tue, 23 Jun 2009) | 1 line Properly guarding Script::getOffset() and adding a reverse operation ........ r41783 | drmccoy | 2009-06-23 06:51:48 +1000 (Tue, 23 Jun 2009) | 1 line Removing trailing spaces ........ r41784 | drmccoy | 2009-06-23 06:52:08 +1000 (Tue, 23 Jun 2009) | 1 line Removing trailing tabs ........ r41785 | fingolfin | 2009-06-23 07:48:47 +1000 (Tue, 23 Jun 2009) | 1 line Patch #2810483 (SCI: Convert gfx subsystem headers to Doxygen format), with @brief removed ........ r41786 | fingolfin | 2009-06-23 09:09:28 +1000 (Tue, 23 Jun 2009) | 1 line Fixed NDS compilation when using older devkitpro versions (I accidentally broke that some time ago) ........ r41787 | dreammaster | 2009-06-23 11:01:16 +1000 (Tue, 23 Jun 2009) | 1 line Bugfixes to keep sound effects to channel #4 like the original (it ignores the channel parameter to the given library routine) ........ r41788 | drmccoy | 2009-06-23 11:19:03 +1000 (Tue, 23 Jun 2009) | 1 line Added Script methods to get the TOT major and minor version ........ r41789 | drmccoy | 2009-06-23 11:19:21 +1000 (Tue, 23 Jun 2009) | 1 line Added Script methods to query commun file handling ........ r41790 | drmccoy | 2009-06-23 11:19:37 +1000 (Tue, 23 Jun 2009) | 1 line Const correctness ........ r41791 | drmccoy | 2009-06-23 11:20:05 +1000 (Tue, 23 Jun 2009) | 1 line Added a method to query the number of variables needed by a Script ........ r41792 | drmccoy | 2009-06-23 11:20:21 +1000 (Tue, 23 Jun 2009) | 1 line Added Script::getTextsOffset() ........ r41793 | drmccoy | 2009-06-23 11:21:06 +1000 (Tue, 23 Jun 2009) | 1 line Added Script::getResourcesOffset() ........ r41794 | drmccoy | 2009-06-23 11:21:51 +1000 (Tue, 23 Jun 2009) | 1 line Added Script::getAnimDataSize() ........ r41795 | drmccoy | 2009-06-23 11:22:30 +1000 (Tue, 23 Jun 2009) | 1 line Added Script::getStartOffset() ........ r41796 | drmccoy | 2009-06-23 11:22:51 +1000 (Tue, 23 Jun 2009) | 1 line Added Script::getCenterOffset() ........ r41797 | drmccoy | 2009-06-23 11:23:14 +1000 (Tue, 23 Jun 2009) | 1 line Replacing the 2 offset functions by a generic Script::getFunctionOffset() ........ r41798 | drmccoy | 2009-06-23 11:23:31 +1000 (Tue, 23 Jun 2009) | 1 line Stopping the seek() going into the header ........ r41799 | drmccoy | 2009-06-23 11:23:51 +1000 (Tue, 23 Jun 2009) | 1 line Also loading TOT properties when the TOT is found in a LOM ........ r41803 | drmccoy | 2009-06-23 18:51:55 +1000 (Tue, 23 Jun 2009) | 1 line Changing the TBR FIXME into a warning in setVoice() ........ r41806 | Hkz | 2009-06-23 23:24:46 +1000 (Tue, 23 Jun 2009) | 1 line tinsel: added some comments to psx palette mapper ........ r41809 | drmccoy | 2009-06-24 01:06:38 +1000 (Wed, 24 Jun 2009) | 1 line Added German Fascination (3 disk version), as supplied by windlepoons in bug report #2809247 ........ r41810 | drmccoy | 2009-06-24 01:08:56 +1000 (Wed, 24 Jun 2009) | 1 line Added Hungarian versions of gob1-gob3 as supplied by goodoldgeorg in bug report #2810082 ........ r41811 | drmccoy | 2009-06-24 03:37:18 +1000 (Wed, 24 Jun 2009) | 1 line Binary, not logical ORing the GUIO flags (Strangerke, you fscked up there :P) ........ r41812 | drmccoy | 2009-06-24 03:55:09 +1000 (Wed, 24 Jun 2009) | 1 line Added support for Hungarian ........ r41813 | drmccoy | 2009-06-24 03:55:27 +1000 (Wed, 24 Jun 2009) | 1 line Proper support for Hungarian versions ........ r41821 | drmccoy | 2009-06-24 09:55:19 +1000 (Wed, 24 Jun 2009) | 1 line Putting basic TOT handling into its own class ........ r41822 | drmccoy | 2009-06-24 09:55:35 +1000 (Wed, 24 Jun 2009) | 1 line Putting TOT filename generation and LOM checking into TOTFile ........ r41823 | drmccoy | 2009-06-24 09:55:48 +1000 (Wed, 24 Jun 2009) | 1 line Added methods to get the file base from a filename ........ r41827 | lordhoto | 2009-06-25 03:01:01 +1000 (Thu, 25 Jun 2009) | 1 line Silence unsued variables warnings. ........ r41833 | waltervn | 2009-06-25 05:12:45 +1000 (Thu, 25 Jun 2009) | 2 lines SCI: Partial support for dual-language games. ........ r41834 | waltervn | 2009-06-25 05:26:06 +1000 (Thu, 25 Jun 2009) | 2 lines SCI: Fix regression in r41833. ........ r41836 | drmccoy | 2009-06-25 07:47:54 +1000 (Thu, 25 Jun 2009) | 1 line Clarifying some warnings ........ r41837 | drmccoy | 2009-06-25 07:48:13 +1000 (Thu, 25 Jun 2009) | 1 line Checking for the file's existence in DataIO::getDataStream() ........ r41838 | drmccoy | 2009-06-25 07:48:27 +1000 (Thu, 25 Jun 2009) | 1 line Added the scriptEnd property ........ r41839 | drmccoy | 2009-06-25 07:49:37 +1000 (Thu, 25 Jun 2009) | 1 line Wrapping resources (out of TOT, EXT, IM? and EX? files) loading into its own class ........ r41841 | mthreepwood | 2009-06-25 10:14:07 +1000 (Thu, 25 Jun 2009) | 1 line After discussing with waltervn, committing my fix for the King's Quest I Demo (original from Patch #2795916). I'm also fixing the full game as well :) ........ r41844 | lordhoto | 2009-06-25 11:29:14 +1000 (Thu, 25 Jun 2009) | 1 line Initial support for Kyrandia 1 PC-9801 Japanese 16 color. ........ r41845 | lordhoto | 2009-06-25 11:29:27 +1000 (Thu, 25 Jun 2009) | 1 line Implement properly colored mouse cursors in 16 color version of Kyrandia 1. ........ r41846 | lordhoto | 2009-06-25 11:29:41 +1000 (Thu, 25 Jun 2009) | 1 line Implement palette fading for 16 color version of Kyrandia 1. ........ r41847 | lordhoto | 2009-06-25 11:29:55 +1000 (Thu, 25 Jun 2009) | 1 line Add config option for Kyra1 16 color, it'll only use dithering when "16_color" is set to true. ........ r41848 | lordhoto | 2009-06-25 11:30:12 +1000 (Thu, 25 Jun 2009) | 1 line Strip trailing whitespaces and tabs. ........ r41850 | lordhoto | 2009-06-25 12:38:19 +1000 (Thu, 25 Jun 2009) | 1 line Readd PC98 palette loading for LoL 16 color. ........ r41851 | lordhoto | 2009-06-25 12:39:00 +1000 (Thu, 25 Jun 2009) | 1 line Implement proper VGA (a color component in [0, 63]) to our palette format (color component in [0, 255]) conversion. ........ r41852 | lordhoto | 2009-06-25 12:39:23 +1000 (Thu, 25 Jun 2009) | 1 line Implement proper AMIGA to VGA color conversion. ........ r41853 | lordhoto | 2009-06-25 12:41:39 +1000 (Thu, 25 Jun 2009) | 1 line Mention Kyra 1 PC98 16 color dithering support. ........ r41858 | strangerke | 2009-06-25 20:03:23 +1000 (Thu, 25 Jun 2009) | 1 line Fix compilation issue for MSVC ........ r41859 | drmccoy | 2009-06-25 20:54:35 +1000 (Thu, 25 Jun 2009) | 1 line Plugging some memory leaks ........ r41860 | drmccoy | 2009-06-25 20:55:01 +1000 (Thu, 25 Jun 2009) | 1 line Giving the "backup" arrays their own class, Environments, and really plugging all related leaks ........ r41867 | lordhoto | 2009-06-26 01:22:08 +1000 (Fri, 26 Jun 2009) | 1 line Implement proper color index conversion for Lands of Lore PC98. (The intro and menu screen work fine now) ........ r41868 | drmccoy | 2009-06-26 01:29:19 +1000 (Fri, 26 Jun 2009) | 1 line Oops, used git commit --amend wrong, apparently. /This/ is the real Environments change I wanted to push ........ r41869 | drmccoy | 2009-06-26 01:37:46 +1000 (Fri, 26 Jun 2009) | 1 line Adding more version entries for a Gob1 Win version, thanks to Hkz ........ r41870 | lordhoto | 2009-06-26 01:53:09 +1000 (Fri, 26 Jun 2009) | 1 line Fix japanese font colors in Kyra 1 PC98 16 color. ........ r41871 | lordhoto | 2009-06-26 01:53:21 +1000 (Fri, 26 Jun 2009) | 1 line Cleanup. ........ r41875 | drmccoy | 2009-06-26 04:53:36 +1000 (Fri, 26 Jun 2009) | 1 line Making _numDataChunks unsigned ........ r41876 | lordhoto | 2009-06-26 05:52:49 +1000 (Fri, 26 Jun 2009) | 1 line Cleanup. ........ r41877 | lordhoto | 2009-06-26 05:53:55 +1000 (Fri, 26 Jun 2009) | 1 line Use Screen::loadPalette instead of Resource::loadFileToBuf. ........ r41878 | lordhoto | 2009-06-26 05:54:41 +1000 (Fri, 26 Jun 2009) | 1 line Replace yet another palette from file loading with Screen::loadPalette. ........ r41879 | lordhoto | 2009-06-26 05:55:25 +1000 (Fri, 26 Jun 2009) | 1 line Cleanup VQA player a bit. ........ r41880 | lordhoto | 2009-06-26 05:56:02 +1000 (Fri, 26 Jun 2009) | 1 line Add a const "getData" access method to Palette. ........ r41881 | lordhoto | 2009-06-26 05:57:06 +1000 (Fri, 26 Jun 2009) | 1 line Change Screen_v2::generateOverlay to take a const Palette reference instead of a pointer. ........ r41882 | lordhoto | 2009-06-26 05:57:35 +1000 (Fri, 26 Jun 2009) | 1 line Change Screen_LoL::generateGrayOverlay to use a Palette object internally. ........ r41883 | lordhoto | 2009-06-26 05:58:17 +1000 (Fri, 26 Jun 2009) | 1 line Change Screen_HoF::generateGrayOverlay to use a Palette object internally. ........ r41884 | lordhoto | 2009-06-26 05:59:06 +1000 (Fri, 26 Jun 2009) | 1 line Change Screen_LoL genereta overlay functionallity to accept a Palette object as source. ........ r41885 | lordhoto | 2009-06-26 05:59:56 +1000 (Fri, 26 Jun 2009) | 1 line Change Screen_HoF::generateGrayOverlay to accept a Palette object as source. ........ r41886 | lordhoto | 2009-06-26 06:00:52 +1000 (Fri, 26 Jun 2009) | 1 line Change Screen_v2::findLeastDifferentColor to take a Palette object as source. ........ r41887 | athrxx | 2009-06-26 07:17:50 +1000 (Fri, 26 Jun 2009) | 2 lines KYRA/LOL: - support speech/text settings in LOL intro - fix possible pc98 music issue ........ r41889 | lordhoto | 2009-06-26 09:03:57 +1000 (Fri, 26 Jun 2009) | 1 line Implement difference in PC98 version. (This actually breaks the text colors in the LoL intro for now...) ........ r41890 | lordhoto | 2009-06-26 09:04:08 +1000 (Fri, 26 Jun 2009) | 1 line Cleanup palette setup. ........ r41891 | lordhoto | 2009-06-26 09:04:21 +1000 (Fri, 26 Jun 2009) | 1 line Store palettes in a Common::Array instead of a fixed size array. ........ r41892 | lordhoto | 2009-06-26 09:04:32 +1000 (Fri, 26 Jun 2009) | 1 line Only initialize palettes with 16 colors in (real) 16 color games. ........ r41893 | lordhoto | 2009-06-26 09:04:43 +1000 (Fri, 26 Jun 2009) | 1 line For now always enable voices in PC98 version of LoL. ........ r41895 | lordhoto | 2009-06-26 10:11:56 +1000 (Fri, 26 Jun 2009) | 1 line Implement PC98 text mode color palette. ........ r41896 | lordhoto | 2009-06-26 10:12:08 +1000 (Fri, 26 Jun 2009) | 1 line Implement palette difference in Kanji drawing code for PC98. ........ r41897 | lordhoto | 2009-06-26 10:12:19 +1000 (Fri, 26 Jun 2009) | 1 line Implement difference in TIM's displayText code for PC98, this should fix the font color in the intro. ........ r41902 | athrxx | 2009-06-27 03:58:27 +1000 (Sat, 27 Jun 2009) | 1 line KYRA/LOL: fixed minor bug by adding reset() call to pc98 audio driver destructor ........ r41903 | drmccoy | 2009-06-27 05:03:37 +1000 (Sat, 27 Jun 2009) | 1 line Fixing text strings embedded in the TOT ........ r41915 | buddha_ | 2009-06-27 22:26:26 +1000 (Sat, 27 Jun 2009) | 11 lines Name Operation Stealth's global variables 251 and 252 and init them in main loop. These are used as a sort of a backup for the mouse position (x, y) variables 249 and 250. Future Wars's VAR_MOUSE_Y_MODE and Operation Stealth's VAR_MOUSE_X_POS_2ND (251) clash and that's possibly why executePlayerInput currently works incorrectly with Operation Stealth. More reverse engineering is needed... ........ r41916 | athrxx | 2009-06-27 22:36:12 +1000 (Sat, 27 Jun 2009) | 1 line LOL: cleanup ........ r41917 | athrxx | 2009-06-27 23:15:47 +1000 (Sat, 27 Jun 2009) | 1 line LOL: fixed regression ........ r41922 | athrxx | 2009-06-28 02:48:47 +1000 (Sun, 28 Jun 2009) | 1 line LOL: add workaround to fix map text display when the language is set to French ........ r41929 | joostp | 2009-06-29 03:51:53 +1000 (Mon, 29 Jun 2009) | 2 lines change link order in .spec file to produce working binaries when building using the configure script ........ r41930 | fingolfin | 2009-06-29 05:56:58 +1000 (Mon, 29 Jun 2009) | 1 line Silenced the reamining warnings reported in patch #2684986 (gcc warnings with -DFORTIFY_SOURCE=2 -fstack-protector) ........ r41931 | fingolfin | 2009-06-29 05:57:27 +1000 (Mon, 29 Jun 2009) | 1 line GUI: Replaced ThemeParser::_drawFunction hashmap by a static function getDrawingFunctionCallback which maps strings to draw funcs ........ r41932 | fingolfin | 2009-06-29 05:58:11 +1000 (Mon, 29 Jun 2009) | 4 lines Changed OSystem::setWindowCaption to expect ISO LATIN 1 encoded input; also intentionally broke WinCE and Symbian ports (in an obvious way that can be undo by commenting out some text) -- hopefully this will get the maintainers' attention during the next release cycle, unlike my emails ........ r41933 | fingolfin | 2009-06-29 05:58:30 +1000 (Mon, 29 Jun 2009) | 1 line PS2: Don't overload fillScreen with a dummy, just use the inherited version ........ r41934 | fingolfin | 2009-06-29 07:04:24 +1000 (Mon, 29 Jun 2009) | 1 line Fix PSP port ........ r41938 | eriktorbjorn | 2009-06-29 08:20:28 +1000 (Mon, 29 Jun 2009) | 2 lines For consistency, use upper-case letter in hex constant. ........ r41940 | lordhoto | 2009-06-29 22:33:47 +1000 (Mon, 29 Jun 2009) | 1 line Indentation fix. ........ r41941 | lordhoto | 2009-06-30 02:05:50 +1000 (Tue, 30 Jun 2009) | 1 line Modified Palette::load*Palette definition. ........ r41942 | lordhoto | 2009-06-30 02:06:02 +1000 (Tue, 30 Jun 2009) | 1 line Change LoLEngine::processMagicIce to use Palette objects internally. ........ r41943 | lordhoto | 2009-06-30 02:06:18 +1000 (Tue, 30 Jun 2009) | 1 line Changed LoLEngine::setPaletteBrightness to take an Palette object. ........ r41944 | lordhoto | 2009-06-30 02:06:31 +1000 (Tue, 30 Jun 2009) | 1 line Change LoLEngine::generateBrightnessPalette to take Palette objects as parameters. ........ r41945 | lordhoto | 2009-06-30 02:07:46 +1000 (Tue, 30 Jun 2009) | 1 line Chang Palette parameter of LolEngine::setPaletteBrightness to be const. ........ r41946 | lordhoto | 2009-06-30 02:08:00 +1000 (Tue, 30 Jun 2009) | 1 line Change raw palette read to Screen::loadPalette call. ........ r41947 | lordhoto | 2009-06-30 02:08:16 +1000 (Tue, 30 Jun 2009) | 1 line Change Screen_LoL::loadSpecialColors to take an Palette object as parameter. ........ r41948 | lordhoto | 2009-06-30 02:08:28 +1000 (Tue, 30 Jun 2009) | 1 line Change LoLEngine::generateFlashPalette to take Palette objects as parameters. ........ r41949 | lordhoto | 2009-06-30 02:08:39 +1000 (Tue, 30 Jun 2009) | 1 line Cleanup KyraEngine_MR::updateCharPal. ........ r41950 | lordhoto | 2009-06-30 02:49:14 +1000 (Tue, 30 Jun 2009) | 1 line Cleanup GUI_HoF::setupPalette. ........ r41951 | lordhoto | 2009-06-30 02:49:26 +1000 (Tue, 30 Jun 2009) | 1 line Replaced some raw palette loads. ........ r41952 | lordhoto | 2009-06-30 02:49:38 +1000 (Tue, 30 Jun 2009) | 1 line Add a "fill" method to Palette. ........ r41953 | lordhoto | 2009-06-30 02:49:53 +1000 (Tue, 30 Jun 2009) | 1 line Adapted various code parts to use Palette::fill. ........ r41954 | lordhoto | 2009-06-30 03:05:49 +1000 (Tue, 30 Jun 2009) | 1 line Removed some obsolete TODOs. ........ r41955 | lordhoto | 2009-06-30 03:06:00 +1000 (Tue, 30 Jun 2009) | 1 line Update the screen animations while dropping items in Hand of Fate. ........ r41956 | lordhoto | 2009-06-30 03:06:17 +1000 (Tue, 30 Jun 2009) | 1 line Removed more obsolete TODO messages. ........ r41957 | lordhoto | 2009-06-30 03:26:43 +1000 (Tue, 30 Jun 2009) | 1 line Resolved some TODOs in Kyra3 code. ........ r41958 | lordhoto | 2009-06-30 03:26:56 +1000 (Tue, 30 Jun 2009) | 1 line Removed obsolete TODOs in HoF code. ........ r41959 | lordhoto | 2009-06-30 04:00:18 +1000 (Tue, 30 Jun 2009) | 3 lines - Get rid of code duplication for mouse cursor setup - Fix mouse cursor colors in LoL PC98 (This commit might introduce regressions, since it changes the key color the mouse cursor uses) ........ r41960 | lordhoto | 2009-06-30 04:49:17 +1000 (Tue, 30 Jun 2009) | 1 line Fix kyra2/kyra3 mouse cursor related regressions, introduced with r41959. ........ r41961 | lordhoto | 2009-06-30 04:49:28 +1000 (Tue, 30 Jun 2009) | 1 line Fix palette regression caused by r41949. ........ r41962 | lordhoto | 2009-06-30 05:02:15 +1000 (Tue, 30 Jun 2009) | 1 line Fix bug in drawShape, which caused invisibility in Kyra1 to be displayed incorrectly. ........ r41963 | lordhoto | 2009-06-30 06:16:59 +1000 (Tue, 30 Jun 2009) | 1 line Fix LoL cursor in DOS version. ........ r41964 | lordhoto | 2009-06-30 06:17:10 +1000 (Tue, 30 Jun 2009) | 1 line Fix bug in drawShape. ........ r41967 | lordhoto | 2009-06-30 09:14:35 +1000 (Tue, 30 Jun 2009) | 1 line Fix invisible mouse cursor, when picking up items. ........ r41968 | lordhoto | 2009-06-30 09:23:29 +1000 (Tue, 30 Jun 2009) | 1 line Add some more explanation to Graphics::CursorManager::showMouse and OSystem::showMouse. ........ r41975 | dreammaster | 2009-06-30 20:36:50 +1000 (Tue, 30 Jun 2009) | 1 line Made the music/sfx volume settings actually affect the in-game music/sfx volume ........ r42007 | anotherguest | 2009-07-02 06:02:33 +1000 (Thu, 02 Jul 2009) | 1 line Move action inits to engineInit and engineDone callbacks. ........ r42008 | anotherguest | 2009-07-02 06:11:44 +1000 (Thu, 02 Jul 2009) | 1 line Use MIN with correct template parameter. ........ r42009 | fingolfin | 2009-07-02 06:51:04 +1000 (Thu, 02 Jul 2009) | 4 lines - Added GCC_PRINTF attribute to several funcs where it makes sense - change some constants from double to float, to avoid "loss of precision due to implicit conversion" warnings - removed duplicate prototypes for some funcs - fixed some "increases required alignment of target type" warnings ........ r42010 | fingolfin | 2009-07-02 06:51:34 +1000 (Thu, 02 Jul 2009) | 1 line Fixed some more warnings observed on buildbot ........ r42011 | fingolfin | 2009-07-02 06:51:47 +1000 (Thu, 02 Jul 2009) | 1 line Flag what looks like a bug in the CMS player code -- somebody should verify and fix this properly ........ r42012 | fingolfin | 2009-07-02 06:53:47 +1000 (Thu, 02 Jul 2009) | 1 line oops ........ r42020 | drmccoy | 2009-07-02 22:15:04 +1000 (Thu, 02 Jul 2009) | 1 line Added support for compressed sample files (patch #2815426 by m_kiewitz) ........ r42038 | fingolfin | 2009-07-03 07:16:36 +1000 (Fri, 03 Jul 2009) | 1 line Enhanced the quicksearch box in the launcher to match words in the search string individually ........ r42039 | fingolfin | 2009-07-03 07:37:13 +1000 (Fri, 03 Jul 2009) | 1 line fixed indention (and trigger a reconfigure in buildbot) ........ r42040 | fingolfin | 2009-07-03 08:05:42 +1000 (Fri, 03 Jul 2009) | 1 line cleanup ........ r42041 | fingolfin | 2009-07-03 08:21:33 +1000 (Fri, 03 Jul 2009) | 1 line Added -Wmissing-format-attribute to build system ........ r42043 | thebluegr | 2009-07-03 09:16:40 +1000 (Fri, 03 Jul 2009) | 1 line Moved all the debug state variables in a separate struct and re-enabled several places where they're used ........ r42044 | thebluegr | 2009-07-03 09:58:05 +1000 (Fri, 03 Jul 2009) | 1 line Moved some more debug state related variables in the DebugState struct ........ r42047 | dreammaster | 2009-07-03 16:19:20 +1000 (Fri, 03 Jul 2009) | 1 line Bugfix for loading savegames where the active resource file database isn't completely filled ........ r42048 | dreammaster | 2009-07-03 16:21:04 +1000 (Fri, 03 Jul 2009) | 1 line Bugfix for displaying text messages when an auto tracking (cut-scene) changes to a user wait ........ r42049 | thebluegr | 2009-07-03 17:06:48 +1000 (Fri, 03 Jul 2009) | 1 line Applied patch #2815937 - "SCI: ReadString fix to repair LSL5 password". This fixes the problems with the LSL5 password for good ........ r42050 | thebluegr | 2009-07-03 19:01:51 +1000 (Fri, 03 Jul 2009) | 1 line Simplified the kernel name loading code: Merged the default SCI0 and SCI1 kernel name tables in one table. vocab.999 is only used in SCI0 and SCI01 games if it exists as an override to the default kernel name table (which works with SCI0/SCI01 demos with no vocab.999, like KQ1 and xmas1998). Removed GF_SCI0_SCI1VOCAB. ........ r42054 | fingolfin | 2009-07-03 20:40:49 +1000 (Fri, 03 Jul 2009) | 1 line Added more GCC_PRINTF attributes, and fixed resulting warnings in format strings ........ r42055 | fingolfin | 2009-07-03 20:41:03 +1000 (Fri, 03 Jul 2009) | 1 line SCI: Fixed warning ........ r42056 | fingolfin | 2009-07-03 21:05:59 +1000 (Fri, 03 Jul 2009) | 1 line If NDEBUG is #defined, then assert does nothing, leading to warnings about 'old_size' not being used -> fix that ........ r42060 | thebluegr | 2009-07-04 00:18:20 +1000 (Sat, 04 Jul 2009) | 1 line Replaced all calls for manipulating the mouse cursor to be made to the CursorManager instead of directly to the graphics backend ........ r42062 | thebluegr | 2009-07-04 00:22:50 +1000 (Sat, 04 Jul 2009) | 2 lines - Pushed debugstate into debug.h - When an error occurs, manipulate the execution stack before error() opens the console inside getDebugger(), like FreeSCI did. Added another method for obtaining the SCI console for use by the engine itself. ........ r42079 | thebluegr | 2009-07-04 07:59:07 +1000 (Sat, 04 Jul 2009) | 1 line Replaced script_error and CORE_ERROR with error() ........ r42081 | thebluegr | 2009-07-04 09:37:08 +1000 (Sat, 04 Jul 2009) | 1 line SCI0 games using older graphics functions are automatically detected now, from the presence of the "TimesSin" and "SinMult" kernel functions. Removed the GF_SCI0_OLDGFXFUNCS game flag ........ svn-id: r42085
author: Travis Howell 2009-07-04 05:56:10 +0000
committer: Travis Howell 2009-07-04 05:56:10 +0000
commit: 4656019e8a2f92f708a685be6d3d95edd7ee8d6d (patch)
tree: 1370ceb14c98da5478d85f207ae421dbaff473c8 /backends
parent: 6ef485f44896ad778d355bc1201f2f143cc9e770 (diff)
parent: df9570cb3265f4d81ac41d66d949355491e2df7e (diff)
download: scummvm-rg350-4656019e8a2f92f708a685be6d3d95edd7ee8d6d.tar.gz
scummvm-rg350-4656019e8a2f92f708a685be6d3d95edd7ee8d6d.tar.bz2
scummvm-rg350-4656019e8a2f92f708a685be6d3d95edd7ee8d6d.zip
56 files changed, 1428 insertions, 398 deletions
diff --git a/backends/events/default/default-events.cpp b/backends/events/default/default-events.cpp
index 9b2c8df287..4fdf96e57e 100644
--- a/backends/events/default/default-events.cpp
+++ b/backends/events/default/default-events.cpp
@@ -278,7 +278,7 @@ void DefaultEventManager::init() {
 	if (ConfMan.hasKey("vkeybd_pack_name")) {
 		_vk->loadKeyboardPack(ConfMan.get("vkeybd_pack_name"));
 	} else {
-		_vk->loadKeyboardPack("vkeybd");
+		_vk->loadKeyboardPack("vkeybd_default");
 	}
 #endif
 }
@@ -553,6 +553,11 @@ bool DefaultEventManager::pollEvent(Common::Event &event) {
 				_shouldRTL = true;
 			break;
 
+		case Common::EVENT_MUTE:
+			if (g_engine)
+				g_engine->flipMute();
+			break;
+
 		case Common::EVENT_QUIT:
 			if (ConfMan.getBool("confirm_exit")) {
 				if (_confirmExitDialogActive) {
diff --git a/backends/keymapper/remap-dialog.cpp b/backends/keymapper/remap-dialog.cpp
index d53ae588f8..0440acdd0a 100644
--- a/backends/keymapper/remap-dialog.cpp
+++ b/backends/keymapper/remap-dialog.cpp
@@ -39,16 +39,17 @@ enum {
 };
 
 RemapDialog::RemapDialog()
-	: Dialog("KeyRemapper"), _keymapTable(0), _activeRemapAction(0), _topAction(0), _remapTimeout(0) {
+	: Dialog("KeyMapper"), _keymapTable(0), _activeRemapAction(0), _topAction(0), _remapTimeout(0) {
 
 	_keymapper = g_system->getEventManager()->getKeymapper();
 	assert(_keymapper);
 
-	_kmPopUp = new GUI::PopUpWidget(this, "KeyRemapper.Popup", "Keymap: ");
+	_kmPopUpDesc = new GUI::StaticTextWidget(this, "KeyMapper.PopupDesc", "Keymap:");
+	_kmPopUp = new GUI::PopUpWidget(this, "KeyMapper.Popup");
 
 	_scrollBar = new GUI::ScrollBarWidget(this, 0, 0, 0, 0);
 
-	new GUI::ButtonWidget(this, "KeyRemapper.Close", "Close", kCloseCmd);
+	new GUI::ButtonWidget(this, "KeyMapper.Close", "Close", kCloseCmd);
 }
 
 RemapDialog::~RemapDialog() {
@@ -137,12 +138,12 @@ void RemapDialog::reflowLayout() {
 
 	int16 areaX, areaY;
 	uint16 areaW, areaH;
-	int spacing = g_gui.xmlEval()->getVar("Globals.KeyRemapper.Spacing");
-	int labelWidth =  g_gui.xmlEval()->getVar("Globals.KeyRemapper.LabelWidth");
-	int buttonWidth = g_gui.xmlEval()->getVar("Globals.KeyRemapper.ButtonWidth");
+	int spacing = g_gui.xmlEval()->getVar("Globals.KeyMapper.Spacing");
+	int labelWidth =  g_gui.xmlEval()->getVar("Globals.KeyMapper.LabelWidth");
+	int buttonWidth = g_gui.xmlEval()->getVar("Globals.KeyMapper.ButtonWidth");
 	int colWidth = labelWidth + buttonWidth + spacing;
 
-	g_gui.xmlEval()->getWidgetData((const String&)String("KeyRemapper.KeymapArea"), areaX, areaY, areaW, areaH);
+	g_gui.xmlEval()->getWidgetData((const String&)String("KeyMapper.KeymapArea"), areaX, areaY, areaW, areaH);
 
 	_colCount = (areaW - scrollbarWidth) / colWidth;
 	_rowCount = (areaH + spacing) / (buttonHeight + spacing);
diff --git a/backends/keymapper/remap-dialog.h b/backends/keymapper/remap-dialog.h
index abec8a2d5c..88f099520a 100644
--- a/backends/keymapper/remap-dialog.h
+++ b/backends/keymapper/remap-dialog.h
@@ -76,6 +76,7 @@ protected:
 
 	Rect _keymapArea;
 
+	GUI::StaticTextWidget *_kmPopUpDesc;
 	GUI::PopUpWidget *_kmPopUp;
 	//GUI::ContainerWidget *_container;
 	GUI::ScrollBarWidget *_scrollBar;
diff --git a/backends/midi/seq.cpp b/backends/midi/seq.cpp
index 5b7f071fd9..3522975679 100644
--- a/backends/midi/seq.cpp
+++ b/backends/midi/seq.cpp
@@ -142,7 +142,7 @@ void MidiDriver_SEQ::send(uint32 b) {
 		warning("MidiDriver_SEQ::send: unknown : %08x", (int)b);
 		break;
 	}
-	write(device, buf, position);
+	(void)write(device, buf, position);
 }
 
 void MidiDriver_SEQ::sysEx (const byte *msg, uint16 length) {
@@ -167,7 +167,7 @@ void MidiDriver_SEQ::sysEx (const byte *msg, uint16 length) {
 	buf[position++] = _device_num;
 	buf[position++] = 0;
 
-	write (device, buf, position);
+	(void)write(device, buf, position);
 }
 
 
diff --git a/backends/midi/timidity.cpp b/backends/midi/timidity.cpp
index ecb6dd7e8a..c813441724 100644
--- a/backends/midi/timidity.cpp
+++ b/backends/midi/timidity.cpp
@@ -221,7 +221,7 @@ int MidiDriver_TIMIDITY::open() {
 	 * "200 Ready data connection" */
 	res = timidity_ctl_command(NULL);
 	if (atoi(res) != 200) {
-		fprintf(stderr, "Can't connect timidity: %s\t(host=%s, port=%d)\n", res, timidity_host, data_port);
+		warning("Can't connect timidity: %s\t(host=%s, port=%d)", res, timidity_host, data_port);
 		close_all();
 		return -1;
 	}
@@ -334,7 +334,7 @@ char *MidiDriver_TIMIDITY::timidity_ctl_command(const char *fmt, ...) {
 			buff[len++] = '\n';
 
 		/* write command to control socket */
-		write(_control_fd, buff, len);
+		(void)write(_control_fd, buff, len);
 	}
 
 	while (1) {
diff --git a/backends/platform/PalmOS/Src/be_os5.cpp b/backends/platform/PalmOS/Src/be_os5.cpp
index aa578dad9c..91e9818c02 100644
--- a/backends/platform/PalmOS/Src/be_os5.cpp
+++ b/backends/platform/PalmOS/Src/be_os5.cpp
@@ -115,6 +115,10 @@ void OSystem_PalmOS5::setFeatureState(Feature f, bool enable) {
 }
 
 void OSystem_PalmOS5::setWindowCaption(const char *caption) {
+FIXME/TODO: Convert caption from ISO Latin 1 to "right" encoding ?
+If the output encoding is unclear or conversion impossible,
+then one could just skip over any chars > 0x7F and display the rest
+
 	Err e;
 	Char buf[64];
 	Coord w, y, h = FntLineHeight() + 2;
diff --git a/backends/platform/dc/dc.h b/backends/platform/dc/dc.h
index 0ccd69593e..f86a2c6065 100644
--- a/backends/platform/dc/dc.h
+++ b/backends/platform/dc/dc.h
@@ -232,5 +232,5 @@ class OSystem_Dreamcast : private DCHardware, public BaseBackend, public Filesys
 extern int handleInput(struct mapledev *pad,
 		       int &mouse_x, int &mouse_y,
 		       byte &shiftFlags, Interactive *inter = NULL);
-extern bool selectGame(char *&, char *&, class Icon &);
+extern bool selectGame(char *&, char *&, Common::Language &, Common::Platform &, class Icon &);
 
diff --git a/backends/platform/dc/dcmain.cpp b/backends/platform/dc/dcmain.cpp
index 7a0f71ad1a..795504d243 100644
--- a/backends/platform/dc/dcmain.cpp
+++ b/backends/platform/dc/dcmain.cpp
@@ -234,8 +234,10 @@ int main()
 int DCLauncherDialog::runModal()
 {
   char *base = NULL, *dir = NULL;
+  Common::Language language = Common::UNK_LANG;
+  Common::Platform platform = Common::kPlatformUnknown;
 
-  if (!selectGame(base, dir, icon))
+  if (!selectGame(base, dir, language, platform, icon))
     g_system->quit();
 
   // Set the game path.
@@ -243,6 +245,14 @@ int DCLauncherDialog::runModal()
   if (dir != NULL)
     ConfMan.set("path", dir, base);
 
+  // Set the game language.
+  if (language != Common::UNK_LANG)
+    ConfMan.set("language", Common::getLanguageCode(language), base);
+
+  // Set the game platform.
+  if (platform != Common::kPlatformUnknown)
+    ConfMan.set("platform", Common::getPlatformCode(platform), base);
+
   // Set the target.
   ConfMan.setActiveDomain(base);
 
diff --git a/backends/platform/dc/selector.cpp b/backends/platform/dc/selector.cpp
index 9465769ea3..e2998234c3 100644
--- a/backends/platform/dc/selector.cpp
+++ b/backends/platform/dc/selector.cpp
@@ -138,6 +138,8 @@ struct Game
   char dir[256];
   char filename_base[256];
   char text[256];
+  Common::Language language;
+  Common::Platform platform;
   Icon icon;
   Label label;
 };
@@ -183,11 +185,15 @@ static void makeDefIcon(Icon &icon)
   icon.load(scummvm_icon, sizeof(scummvm_icon));
 }
 
-static bool uniqueGame(const char *base, const char *dir, Game *games, int cnt)
+static bool uniqueGame(const char *base, const char *dir,
+		       Common::Language lang, Common::Platform plf,
+		       Game *games, int cnt)
 {
   while (cnt--)
     if (!strcmp(dir, games->dir) &&
-       !stricmp(base, games->filename_base))
+	!stricmp(base, games->filename_base) &&
+	lang == games->language &&
+	plf == games->platform)
       return false;
     else
       games++;
@@ -227,14 +233,20 @@ static int findGames(Game *games, int max)
       if (curr_game < max) {
 	strcpy(games[curr_game].filename_base, ge->gameid().c_str());
 	strcpy(games[curr_game].dir, dirs[curr_dir-1].name);
+	games[curr_game].language = ge->language();
+	games[curr_game].platform = ge->platform();
 	if (uniqueGame(games[curr_game].filename_base,
-		      games[curr_game].dir, games, curr_game)) {
+		       games[curr_game].dir,
+		       games[curr_game].language,
+		       games[curr_game].platform, games, curr_game)) {
 
 	  strcpy(games[curr_game].text, ge->description().c_str());
 #if 0
-	  printf("Registered game <%s> in <%s> <%s> because of <%s> <*>\n",
-		 games[curr_game].text, games[curr_game].dir,
-		 games[curr_game].filename_base,
+	  printf("Registered game <%s> (l:%d p:%d) in <%s> <%s> because of <%s> <*>\n",
+		 games[curr_game].text,
+		 (int)games[curr_game].language,
+		 (int)games[curr_game].platform,
+		 games[curr_game].dir, games[curr_game].filename_base,
 		 dirs[curr_dir-1].name);
 #endif
 	  curr_game++;
@@ -405,7 +417,7 @@ int gameMenu(Game *games, int num_games)
   }
 }
 
-bool selectGame(char *&ret, char *&dir_ret, Icon &icon)
+bool selectGame(char *&ret, char *&dir_ret, Common::Language &lang_ret, Common::Platform &plf_ret, Icon &icon)
 {
   Game *games = new Game[MAX_GAMES];
   int selected, num_games;
@@ -449,6 +461,8 @@ bool selectGame(char *&ret, char *&dir_ret, Icon &icon)
     dir_ret = the_game.dir;
 #endif
     ret = the_game.filename_base;
+    lang_ret = the_game.language;
+    plf_ret = the_game.platform;
     icon = the_game.icon;
     return true;
   } else
diff --git a/backends/platform/ds/arm7/Makefile b/backends/platform/ds/arm7/Makefile
index 82637845db..a8dc0efe6e 100644
--- a/backends/platform/ds/arm7/Makefile
+++ b/backends/platform/ds/arm7/Makefile
@@ -151,13 +151,12 @@ $(OUTPUT).elf	:	$(OFILES)
 #---------------------------------------------------------------------------------
 %.bin: %.elf
 	@echo built ... $(notdir $@)
-	@$(OBJCOPY) -O binary  $(TARGET).elf $@
+	$(OBJCOPY) -O binary  $(TARGET).elf $@
 
 #---------------------------------------------------------------------------------
 %.elf:
 	echo ELF
-	@echo $(LD)  $(LDFLAGS) -specs=ds_arm7.specs $(OFILES) $(LIBPATHS) $(LIBS) -o $(TARGET).elf
-	@$(LD)  $(LDFLAGS) -specs=ds_arm7.specs $(OFILES) $(LIBPATHS) $(LIBS) -o $(TARGET).elf
+	$(LD)  $(LDFLAGS) -specs=ds_arm7.specs $(OFILES) $(LIBPATHS) $(LIBS) -o $(TARGET).elf
 
 
 
diff --git a/backends/platform/ds/arm7/source/main.cpp b/backends/platform/ds/arm7/source/main.cpp
index 0e8dd9efeb..7029d96405 100644
--- a/backends/platform/ds/arm7/source/main.cpp
+++ b/backends/platform/ds/arm7/source/main.cpp
@@ -585,7 +585,7 @@ int main(int argc, char ** argv) {
 
   //enable sound
 //  powerOn(POWER_SOUND);
-  REG_SOUNDCNT = SOUND_ENABLE | SOUND_VOL(0x7F);
+  SOUND_CR = SOUND_ENABLE | SOUND_VOL(0x7F);
   IPC->soundData = 0;
   IPC->reset = false;
 
diff --git a/backends/platform/ds/arm9/source/osystem_ds.cpp b/backends/platform/ds/arm9/source/osystem_ds.cpp
index e35e5edea0..954a33b61d 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.cpp
+++ b/backends/platform/ds/arm9/source/osystem_ds.cpp
@@ -642,12 +642,6 @@ void OSystem_DS::quit() {
 	swiSoftReset();*/
 }
 
-void OSystem_DS::setWindowCaption(const char *caption) {
-}
-
-void OSystem_DS::displayMessageOnOSD(const char *msg) {
-}
-
 Common::SaveFileManager* OSystem_DS::getSavefileManager() {
 	bool forceSram;
 
diff --git a/backends/platform/ds/arm9/source/osystem_ds.h b/backends/platform/ds/arm9/source/osystem_ds.h
index 5a26a25c8b..3db23a5687 100644
--- a/backends/platform/ds/arm9/source/osystem_ds.h
+++ b/backends/platform/ds/arm9/source/osystem_ds.h
@@ -134,10 +134,6 @@ public:
 
 	virtual void quit();
 
-	virtual void setWindowCaption(const char *caption);
-
-	virtual void displayMessageOnOSD(const char *msg);
-
 	virtual Common::SaveFileManager *getSavefileManager();
 
 	void addEvent(Common::Event& e);
diff --git a/backends/platform/gp2x/build/bundle.sh b/backends/platform/gp2x/build/bundle.sh
index 8d48dcfb06..560f096ed4 100755
--- a/backends/platform/gp2x/build/bundle.sh
+++ b/backends/platform/gp2x/build/bundle.sh
@@ -12,6 +12,7 @@ export LDFLAGS=-L/opt/open2x/gcc-4.1.1-glibc-2.3.6/lib
 echo Collecting files.
 mkdir "scummvm-gp2x-`date '+%Y-%m-%d'`"
 mkdir "scummvm-gp2x-`date '+%Y-%m-%d'`/saves"
+mkdir "scummvm-gp2x-`date '+%Y-%m-%d'`/plugins"
 mkdir "scummvm-gp2x-`date '+%Y-%m-%d'`/engine-data"
 
 echo "Please put your save games in this dir" >> "scummvm-gp2x-`date '+%Y-%m-%d'`/saves/PUT_SAVES_IN_THIS_DIR"
@@ -28,8 +29,10 @@ cp ../../../../COPYING ./scummvm-gp2x-`date '+%Y-%m-%d'`/
 cp ../../../../COPYRIGHT ./scummvm-gp2x-`date '+%Y-%m-%d'`/
 cp ../../../../NEWS ./scummvm-gp2x-`date '+%Y-%m-%d'`/
 cp ../../../../gui/themes/scummmodern.zip ./scummvm-gp2x-`date '+%Y-%m-%d'`/
+cp ../../../../backends/vkeybd/packs/vkeybd_default.zip ./scummvm-gp2x-`date '+%Y-%m-%d'`/
 cp ../../../../dists/pred.dic ./scummvm-gp2x-`date '+%Y-%m-%d'`/
 cp ../../../../dists/engine-data/* ./scummvm-gp2x-`date '+%Y-%m-%d'`/engine-data
+cp ../../../../plugins/* ./scummvm-gp2x-`date '+%Y-%m-%d'`/plugins
 
 echo Making Stripped GPE.
 arm-open2x-linux-strip ./scummvm-gp2x-`date '+%Y-%m-%d'`/scummvm.gp2x
diff --git a/backends/platform/gp2x/build/config-alleng.sh b/backends/platform/gp2x/build/config-alleng.sh
new file mode 100755
index 0000000000..5724f39dc5
--- /dev/null
+++ b/backends/platform/gp2x/build/config-alleng.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+echo Quick script to make running configure all the time less painful
+echo and let all the build work be done from the backend/build folder.
+
+# Set the paths up here to generate the config.
+
+PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/arm-open2x-linux/bin:$PATH
+PATH=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin:$PATH
+
+# Export the tool names for cross-compiling
+export CXX=arm-open2x-linux-g++
+export CXXFLAGS=-march=armv4t
+export CPPFLAGS=-I/opt/open2x/gcc-4.1.1-glibc-2.3.6/include
+export LDFLAGS=-L/opt/open2x/gcc-4.1.1-glibc-2.3.6/lib
+export DEFINES=-DNDEBUG
+
+# Edit the configure line to suit.
+cd ../../../..
+./configure --backend=gp2x --disable-mt32emu --host=gp2x --disable-flac --disable-nasm --disable-hq-scalers --with-sdl-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin --with-mpeg2-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-tremor --with-tremor-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-zlib --with-zlib-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-mad --with-mad-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-all-engines --enable-vkeybd
+# --enable-plugins --default-dynamic
+
+echo Generating config for GP2X complete. Check for errors.
diff --git a/backends/platform/gp2x/build/config.sh b/backends/platform/gp2x/build/config.sh
index 17083d1ea4..55954d6231 100755
--- a/backends/platform/gp2x/build/config.sh
+++ b/backends/platform/gp2x/build/config.sh
@@ -17,7 +17,7 @@ export DEFINES=-DNDEBUG
 
 # Edit the configure line to suit.
 cd ../../../..
-./configure --backend=gp2x --disable-mt32emu --host=gp2x --disable-flac --disable-nasm --disable-hq-scalers --with-sdl-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin --with-mpeg2-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-tremor --with-tremor-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-zlib --with-zlib-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-mad --with-mad-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-made --enable-m4 
-#--enable-plugins --default-dynamic
+./configure --backend=gp2x --disable-mt32emu --host=gp2x --disable-flac --disable-nasm --disable-hq-scalers --with-sdl-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin --with-mpeg2-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-tremor --with-tremor-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-zlib --with-zlib-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-mad --with-mad-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-vkeybd
+# --enable-plugins --default-dynamic
 
 echo Generating config for GP2X complete. Check for errors.
diff --git a/backends/platform/gp2x/events.cpp b/backends/platform/gp2x/events.cpp
index 1c0fb398db..9a9a59765d 100644
--- a/backends/platform/gp2x/events.cpp
+++ b/backends/platform/gp2x/events.cpp
@@ -38,33 +38,33 @@
 // we should really allow users to map any key to a joystick button
 #define JOY_DEADZONE 2200
 
-// #define JOY_INVERT_Y
 #define JOY_XAXIS 0
 #define JOY_YAXIS 1
 
-// GP2X Stick Buttons (Note: The Stick is read as a set of buttons not a HAT type of setup).
-#define JOY_BUT_LMOUSE 0x0D
-#define JOY_BUT_RMOUSE 0x0E
-
-#define JOY_BUT_RETURN 0x08
-#define JOY_BUT_ESCAPE 0x09
-#define JOY_BUT_F5 0x0B
-#define JOY_BUT_SPACE 0x0F
-#define JOY_BUT_TALKUP 0x10
-#define JOY_BUT_TALKDN 0x11
-#define JOY_BUT_ZERO 0x12
-
-#define JOY_BUT_COMB 0x0A
-#define JOY_BUT_EXIT 0x12
-#define JOY_BUT_PERIOD 0x0C
-
-
-//TODO: Quick hack 101 ;-) Clean this up,
-#define TRUE 1
-#define FALSE 0
-
-static int mapKey(SDLKey key, SDLMod mod, Uint16 unicode)
-{
+/* GP2X Wiz: Main Joystick Mappings */
+enum {
+	GP2X_BUTTON_UP			= 0,
+	GP2X_BUTTON_UPLEFT		= 1,
+	GP2X_BUTTON_LEFT		= 2,
+	GP2X_BUTTON_DOWNLEFT	= 3,
+	GP2X_BUTTON_DOWN		= 4,
+	GP2X_BUTTON_DOWNRIGHT	= 5,
+	GP2X_BUTTON_RIGHT		= 6,
+	GP2X_BUTTON_UPRIGHT		= 7,
+	GP2X_BUTTON_START		= 8,
+	GP2X_BUTTON_SELECT		= 9,
+	GP2X_BUTTON_L			= 10,
+	GP2X_BUTTON_R			= 11,
+	GP2X_BUTTON_A			= 12,
+	GP2X_BUTTON_B			= 13,
+	GP2X_BUTTON_X			= 14,
+	GP2X_BUTTON_Y			= 15,
+	GP2X_BUTTON_VOLUP		= 16,
+	GP2X_BUTTON_VOLDOWN		= 17,
+	GP2X_BUTTON_CLICK		= 18
+};
+
+static int mapKey(SDLKey key, SDLMod mod, Uint16 unicode) {
 	if (key >= SDLK_F1 && key <= SDLK_F9) {
 		return key - SDLK_F1 + Common::ASCII_F1;
 	} else if (key >= SDLK_KP0 && key <= SDLK_KP9) {
@@ -197,10 +197,9 @@ void OSystem_GP2X::moveStick() {
 		if (_km.x_down_count!=2){
 			_km.x_vel = 1;
 			_km.x_down_count = 1;
-		}else
+		} else
 			_km.x_vel = 4;
-	}
-	 else{
+	} else {
 		_km.x_vel = 0;
 		_km.x_down_count = 0;
 	}
@@ -216,36 +215,16 @@ void OSystem_GP2X::moveStick() {
 		if (_km.y_down_count!=2){
 			_km.y_vel = 1;
 			_km.y_down_count = 1;
-		}else
+		} else
 			_km.y_vel = 4;
-	}
-	 else{
+	} else {
 		_km.y_vel = 0;
 		_km.y_down_count = 0;
 	}
 }
 
-	//Quick default button states for modifier.
-
-	//int GP2X_BUTTON_STATE_UP              =	FALSE;
-	//int GP2X_BUTTON_STATE_DOWN            =	FALSE;
-	//int GP2X_BUTTON_STATE_LEFT            =	FALSE;
-	//int GP2X_BUTTON_STATE_RIGHT           =	FALSE;
-	//int GP2X_BUTTON_STATE_UPLEFT          =	FALSE;
-	//int GP2X_BUTTON_STATE_UPRIGHT         =	FALSE;
-	//int GP2X_BUTTON_STATE_DOWNLEFT        =	FALSE;
-	//int GP2X_BUTTON_STATE_DOWNRIGHT       =	FALSE;
-	//int GP2X_BUTTON_STATE_CLICK           =	FALSE;
-	//int GP2X_BUTTON_STATE_A               =	FALSE;
-	//int GP2X_BUTTON_STATE_B               =	FALSE;
-	//int GP2X_BUTTON_STATE_Y               =	FALSE;
-	//int GP2X_BUTTON_STATE_X               =	FALSE;
-	int GP2X_BUTTON_STATE_L					=	FALSE;
-	//int GP2X_BUTTON_STATE_R               =	FALSE;
-	//int GP2X_BUTTON_STATE_START           =	FALSE;
-	//int GP2X_BUTTON_STATE_SELECT          =	FALSE;
-	//int GP2X_BUTTON_STATE_VOLUP           =	FALSE;
-	//int GP2X_BUTTON_STATE_VOLDOWN         =	FALSE;
+/* Quick default button states for modifiers. */
+int GP2X_BUTTON_STATE_L					=	false;
 
 bool OSystem_GP2X::pollEvent(Common::Event &event) {
 	SDL_Event ev;
@@ -273,8 +252,6 @@ bool OSystem_GP2X::pollEvent(Common::Event &event) {
 	GP2X_BUTTON_LEFT            Cursor Left
 	GP2X_BUTTON_RIGHT           Cursor Right
 
-	TODO: Add extra directions to cursor mappings.
-
 	GP2X_BUTTON_UPLEFT          Cursor Up Left
 	GP2X_BUTTON_UPRIGHT         Cursor Up Right
 	GP2X_BUTTON_DOWNLEFT        Cursor Down Left
@@ -288,8 +265,8 @@ bool OSystem_GP2X::pollEvent(Common::Event &event) {
 	GP2X_BUTTON_Y               Space Bar
 	GP2X_BUTTON_X               Right Mouse Click
 	GP2X_BUTTON_L				Combo Modifier (Left Trigger)
-	GP2X_BUTTON_R               F5 (Right Trigger)
-	GP2X_BUTTON_START           Return
+	GP2X_BUTTON_R               Return (Right Trigger)
+	GP2X_BUTTON_START           F5 (Game Menu)
 	GP2X_BUTTON_SELECT          Escape
 	GP2X_BUTTON_VOLUP           /dev/mixer Global Volume Up
 	GP2X_BUTTON_VOLDOWN         /dev/mixer Global Volume Down
@@ -299,6 +276,7 @@ bool OSystem_GP2X::pollEvent(Common::Event &event) {
 	GP2X_BUTTON_VOLUP &	GP2X_BUTTON_VOLDOWN		0 (For Monkey 2 CP)
 	GP2X_BUTTON_L &	GP2X_BUTTON_SELECT			Common::EVENT_QUIT (Calls Sync() to make sure SD is flushed)
 	GP2X_BUTTON_L &	GP2X_BUTTON_Y				Toggles setZoomOnMouse() for larger then 320*240 games to scale to the point + raduis.
+	GP2X_BUTTON_L &	GP2X_BUTTON_START			Common::EVENT_MAINMENU (ScummVM Global Main Menu)
 	GP2X_BUTTON_L &	GP2X_BUTTON_A				Common::EVENT_PREDICTIVE_DIALOG for predictive text entry box (AGI games)
 	*/
 
@@ -357,6 +335,10 @@ bool OSystem_GP2X::pollEvent(Common::Event &event) {
 			else if (ev.button.button == SDL_BUTTON_WHEELDOWN)
 				event.type = Common::EVENT_WHEELDOWN;
 #endif
+#if defined(SDL_BUTTON_MIDDLE)
+			else if (ev.button.button == SDL_BUTTON_MIDDLE)
+				event.type = Common::EVENT_MBUTTONDOWN;
+#endif
 			else
 				break;
 
@@ -369,6 +351,10 @@ bool OSystem_GP2X::pollEvent(Common::Event &event) {
 				event.type = Common::EVENT_LBUTTONUP;
 			else if (ev.button.button == SDL_BUTTON_RIGHT)
 				event.type = Common::EVENT_RBUTTONUP;
+#if defined(SDL_BUTTON_MIDDLE)
+			else if (ev.button.button == SDL_BUTTON_MIDDLE)
+				event.type = Common::EVENT_MBUTTONUP;
+#endif
 			else
 				break;
 			fillMouseEvent(event, ev.button.x, ev.button.y);
@@ -379,16 +365,16 @@ bool OSystem_GP2X::pollEvent(Common::Event &event) {
 
 		case SDL_JOYBUTTONDOWN:
 			_stickBtn[ev.jbutton.button] = 1;
-			if (ev.jbutton.button == JOY_BUT_LMOUSE) {
+			if (ev.jbutton.button == GP2X_BUTTON_B) {
 				event.type = Common::EVENT_LBUTTONDOWN;
 				fillMouseEvent(event, _km.x, _km.y);
 			} else if (ev.jbutton.button == GP2X_BUTTON_CLICK) {
 				event.type = Common::EVENT_LBUTTONDOWN;
 				fillMouseEvent(event, _km.x, _km.y);
-			} else if (ev.jbutton.button == JOY_BUT_RMOUSE) {
+			} else if (ev.jbutton.button == GP2X_BUTTON_X) {
 				event.type = Common::EVENT_RBUTTONDOWN;
 				fillMouseEvent(event, _km.x, _km.y);
-			} else if (_stickBtn[JOY_BUT_COMB] && (ev.jbutton.button == JOY_BUT_EXIT)) {
+			} else if (_stickBtn[GP2X_BUTTON_L] && (ev.jbutton.button == GP2X_BUTTON_SELECT)) {
 				event.type = Common::EVENT_QUIT;
 			} else if (ev.jbutton.button < 8) {
 				moveStick();
@@ -399,19 +385,24 @@ bool OSystem_GP2X::pollEvent(Common::Event &event) {
 				event.kbd.flags = 0;
 				switch (ev.jbutton.button) {
 					case GP2X_BUTTON_L:
-						GP2X_BUTTON_STATE_L = TRUE;
+						GP2X_BUTTON_STATE_L = true;
 						break;
 					case GP2X_BUTTON_R:
-						if (GP2X_BUTTON_STATE_L == TRUE) {
+						if (GP2X_BUTTON_STATE_L == true) {
+#ifdef ENABLE_VKEYBD
+							event.kbd.keycode = Common::KEYCODE_F7;
+							event.kbd.ascii = mapKey(SDLK_F7, ev.key.keysym.mod, 0);
+#else
 							event.kbd.keycode = Common::KEYCODE_0;
 							event.kbd.ascii = mapKey(SDLK_0, ev.key.keysym.mod, 0);
+#endif
 						} else {
-							event.kbd.keycode = Common::KEYCODE_F5;
-							event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
+							event.kbd.keycode = Common::KEYCODE_RETURN;
+							event.kbd.ascii = mapKey(SDLK_RETURN, ev.key.keysym.mod, 0);
 						}
 						break;
 					case GP2X_BUTTON_SELECT:
-						if (GP2X_BUTTON_STATE_L == TRUE) {
+						if (GP2X_BUTTON_STATE_L == true) {
 							event.type = Common::EVENT_QUIT;
 						} else {
 							event.kbd.keycode = Common::KEYCODE_ESCAPE;
@@ -419,7 +410,7 @@ bool OSystem_GP2X::pollEvent(Common::Event &event) {
 						}
 						break;
 					case GP2X_BUTTON_A:
-						if (GP2X_BUTTON_STATE_L == TRUE) {
+						if (GP2X_BUTTON_STATE_L == true) {
 							event.type = Common::EVENT_PREDICTIVE_DIALOG;
 						} else {
 						event.kbd.keycode = Common::KEYCODE_PERIOD;
@@ -427,39 +418,21 @@ bool OSystem_GP2X::pollEvent(Common::Event &event) {
 						}
 						break;
 					case GP2X_BUTTON_Y:
-						if (GP2X_BUTTON_STATE_L == TRUE) {
+						if (GP2X_BUTTON_STATE_L == true) {
 							setZoomOnMouse();
 						} else {
 							event.kbd.keycode = Common::KEYCODE_SPACE;
 							event.kbd.ascii = mapKey(SDLK_SPACE, ev.key.keysym.mod, 0);
 						}
 						break;
-					case JOY_BUT_RETURN:
-						event.kbd.keycode = Common::KEYCODE_RETURN;
-						event.kbd.ascii = mapKey(SDLK_RETURN, ev.key.keysym.mod, 0);
-						break;
-					case JOY_BUT_ZERO:
-						event.kbd.keycode = Common::KEYCODE_0;
-						event.kbd.ascii = mapKey(SDLK_0, ev.key.keysym.mod, 0);
+					case GP2X_BUTTON_START:
+						if (GP2X_BUTTON_STATE_L == true) {
+							event.type = Common::EVENT_MAINMENU;
+						} else {
+							event.kbd.keycode = Common::KEYCODE_F5;
+							event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
+						}
 						break;
-
-					//case GP2X_BUTTON_R:
-					//	if ((ev.jbutton.button == GP2X_BUTTON_L) && (ev.jbutton.button == GP2X_BUTTON_R)) {
-					//		displayMessageOnOSD("Exiting ScummVM");
-					//		//Sync();
-					//		event.type = Common::EVENT_QUIT;
-					//		break;
-					//	} else if ((ev.jbutton.button == GP2X_BUTTON_L) && (ev.jbutton.button != GP2X_BUTTON_R)) {
-					//		displayMessageOnOSD("Left Trigger Pressed");
-					//		break;
-					//	} else if ((ev.jbutton.button == GP2X_BUTTON_R) && (ev.jbutton.button != GP2X_BUTTON_L)) {
-					//		event.kbd.keycode = Common::KEYCODE_F5;
-					//		event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
-					//		break;
-					//	} else {
-					//		break;
-					//	}
-					//	break;
 					case GP2X_BUTTON_VOLUP:
 						//if (GP2X_BUTTON_STATE_L == TRUE) {
 						//	displayMessageOnOSD("Setting CPU Speed at 230MHz");
@@ -490,10 +463,13 @@ bool OSystem_GP2X::pollEvent(Common::Event &event) {
 
 		case SDL_JOYBUTTONUP:
 			_stickBtn[ev.jbutton.button] = 0;
-			if (ev.jbutton.button == JOY_BUT_LMOUSE) {
+			if (ev.jbutton.button == GP2X_BUTTON_B) {
 				event.type = Common::EVENT_LBUTTONUP;
 				fillMouseEvent(event, _km.x, _km.y);
-			} else if (ev.jbutton.button == JOY_BUT_RMOUSE) {
+			} else if (ev.jbutton.button == GP2X_BUTTON_CLICK) {
+				event.type = Common::EVENT_LBUTTONUP;
+				fillMouseEvent(event, _km.x, _km.y);
+			} else if (ev.jbutton.button == GP2X_BUTTON_X) {
 				event.type = Common::EVENT_RBUTTONUP;
 				fillMouseEvent(event, _km.x, _km.y);
 			} else if (ev.jbutton.button < 8) {
@@ -517,15 +493,29 @@ bool OSystem_GP2X::pollEvent(Common::Event &event) {
 						event.kbd.ascii = mapKey(SDLK_SPACE, ev.key.keysym.mod, 0);
 						break;
 					case GP2X_BUTTON_START:
-						event.kbd.keycode = Common::KEYCODE_RETURN;
-						event.kbd.ascii = mapKey(SDLK_RETURN, ev.key.keysym.mod, 0);
+						if (GP2X_BUTTON_STATE_L == true) {
+							event.type = Common::EVENT_MAINMENU;
+						} else {
+							event.kbd.keycode = Common::KEYCODE_F5;
+							event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
+						}
 						break;
 					case GP2X_BUTTON_L:
-						GP2X_BUTTON_STATE_L = FALSE;
+						GP2X_BUTTON_STATE_L = false;
 						break;
 					case GP2X_BUTTON_R:
-						event.kbd.keycode = Common::KEYCODE_F5;
-						event.kbd.ascii = mapKey(SDLK_F5, ev.key.keysym.mod, 0);
+						if (GP2X_BUTTON_STATE_L == true) {
+#ifdef ENABLE_VKEYBD
+							event.kbd.keycode = Common::KEYCODE_F7;
+							event.kbd.ascii = mapKey(SDLK_F7, ev.key.keysym.mod, 0);
+#else
+							event.kbd.keycode = Common::KEYCODE_0;
+							event.kbd.ascii = mapKey(SDLK_0, ev.key.keysym.mod, 0);
+#endif
+						} else {
+							event.kbd.keycode = Common::KEYCODE_RETURN;
+							event.kbd.ascii = mapKey(SDLK_RETURN, ev.key.keysym.mod, 0);
+						}
 						break;
 					case GP2X_BUTTON_VOLUP:
 						break;
diff --git a/backends/platform/gp2x/gp2x-hw.h b/backends/platform/gp2x/gp2x-hw.h
index 0427698bc4..89ad1093e4 100644
--- a/backends/platform/gp2x/gp2x-hw.h
+++ b/backends/platform/gp2x/gp2x-hw.h
@@ -31,29 +31,6 @@
 #ifndef GP2X_HW_H
 #define GP2X_HW_H
 
-//GP2X Main Joystick Mappings
-//TODO: Use these more standard mappings over the custom ones.
-
-#define GP2X_BUTTON_UP              (0)
-#define GP2X_BUTTON_UPLEFT          (1)
-#define GP2X_BUTTON_LEFT            (2)
-#define GP2X_BUTTON_DOWNLEFT        (3)
-#define GP2X_BUTTON_DOWN            (4)
-#define GP2X_BUTTON_DOWNRIGHT       (5)
-#define GP2X_BUTTON_RIGHT           (6)
-#define GP2X_BUTTON_UPRIGHT         (7)
-#define GP2X_BUTTON_START           (8)
-#define GP2X_BUTTON_SELECT          (9)
-#define GP2X_BUTTON_L               (10)
-#define GP2X_BUTTON_R               (11)
-#define GP2X_BUTTON_A               (12)
-#define GP2X_BUTTON_B               (13)
-#define GP2X_BUTTON_X               (14)
-#define GP2X_BUTTON_Y               (15)
-#define GP2X_BUTTON_VOLUP           (16)
-#define GP2X_BUTTON_VOLDOWN         (17)
-#define GP2X_BUTTON_CLICK           (18)
-
 #define GP2X_MAXVOL 100 // Highest level permitted by GP2X's mixer
 #define SYS_CLK_FREQ 7372800 // Clock Frequency
 
diff --git a/backends/platform/gp2x/gp2x.cpp b/backends/platform/gp2x/gp2x.cpp
index 62c65e8f5e..15b5e19e5d 100644
--- a/backends/platform/gp2x/gp2x.cpp
+++ b/backends/platform/gp2x/gp2x.cpp
@@ -33,15 +33,14 @@
 #include "backends/platform/gp2x/gp2x-mem.h"
 #include "common/archive.h"
 #include "common/config-manager.h"
-
+#include "common/debug.h"
 #include "common/events.h"
 #include "common/util.h"
 
-#include "common/debug.h"
 #include "common/file.h"
 #include "base/main.h"
 
-#include "backends/saves/posix/posix-saves.h"
+#include "backends/saves/default/default-saves.h"
 
 #include "backends/timer/default/default-timer.h"
 #include "backends/plugins/posix/posix-provider.h"
@@ -72,15 +71,12 @@ static Uint32 timer_handler(Uint32 interval, void *param) {
 }
 
 int main(int argc, char *argv[]) {
-	//extern OSystem *OSystem_GP2X_create();
-	//g_system = OSystem_GP2X_create();
 	g_system = new OSystem_GP2X();
 	assert(g_system);
 
-	// Check if Plugins are enabled (Using the hacked up GP2X provider)
-	#ifdef DYNAMIC_MODULES
-		PluginManager::instance().addPluginProvider(new GP2XPluginProvider());
-	#endif
+#ifdef DYNAMIC_MODULES
+	PluginManager::instance().addPluginProvider(new POSIXPluginProvider());
+#endif
 
 	// Invoke the actual ScummVM main entry point:
 	int res = scummvm_main(argc, argv);
@@ -115,7 +111,8 @@ void OSystem_GP2X::initBackend() {
 	#endif
 
 	char savePath[PATH_MAX+1];
-	char workDirName[PATH_MAX+1]; /* To be passed to getcwd system call. */
+	char workDirName[PATH_MAX+1];
+
 	if (getcwd(workDirName, PATH_MAX) == NULL) {
 		error("Could not obtain current working directory.");
 	} else {
@@ -133,25 +130,9 @@ void OSystem_GP2X::initBackend() {
 
 	ConfMan.registerDefault("savepath", savePath);
 
-	// Setup default extra data path for engine data files to be workingdir/engine-data
-
-	char enginedataPath[PATH_MAX+1];
-
-	strcpy(enginedataPath, workDirName);
-	strcat(enginedataPath, "/engine-data");
-	printf("Current engine-data directory: %s\n", enginedataPath);
-	//struct stat sb;
-	if (stat(enginedataPath, &sb) == -1)
-		if (errno == ENOENT) // Create the dir if it does not exist
-			if (mkdir(enginedataPath, 0755) != 0)
-				warning("mkdir for '%s' failed", enginedataPath);
-
-	//FIXME: Do not use File::addDefaultDirectory, rather implement OSystem::addSysArchivesToSearchSet() !
-	Common::File::addDefaultDirectory(enginedataPath);
-
-	// Note: Review and clean this, it's OTT at the moment.
+	_savefile = new DefaultSaveFileManager(savePath);
 
-	#if defined(DUMP_STDOUT)
+	#ifdef DUMP_STDOUT
 		// The GP2X has a serial console but most users do not use this so we
 		// output all our STDOUT and STDERR to files for debug purposes.
 		char STDOUT_FILE[PATH_MAX+1];
@@ -168,7 +149,7 @@ void OSystem_GP2X::initBackend() {
 
 		/* Redirect standard input and standard output */
 		FILE *newfp = freopen(STDOUT_FILE, "w", stdout);
-		if (newfp == NULL) {	/* This happens on NT */
+		if (newfp == NULL) {
 		#if !defined(stdout)
 			stdout = fopen(STDOUT_FILE, "w");
 		#else
@@ -178,8 +159,9 @@ void OSystem_GP2X::initBackend() {
 			}
 		#endif
 		}
+
 		newfp = freopen(STDERR_FILE, "w", stderr);
-		if (newfp == NULL) {	/* This happens on NT */
+		if (newfp == NULL) {
 		#if !defined(stderr)
 			stderr = fopen(STDERR_FILE, "w");
 		#else
@@ -189,8 +171,10 @@ void OSystem_GP2X::initBackend() {
 			}
 		#endif
 		}
-		setbuf(stderr, NULL);			/* No buffering */
-	#endif // DUMP_STDOUT
+
+		setbuf(stderr, NULL);
+		printf("%s\n", "Debug: STDOUT and STDERR redirected to text files.");
+	#endif /* DUMP_STDOUT */
 
 	_graphicsMutex = createMutex();
 
@@ -199,7 +183,9 @@ void OSystem_GP2X::initBackend() {
 	// Setup other defaults.
 
 	ConfMan.registerDefault("aspect_ratio", true);
-	ConfMan.registerDefault("music_volume", 220); // Up default volume as we use a seperate volume system anyway.
+
+	/* Up default volume values as we use a seperate system level volume anyway. */
+	ConfMan.registerDefault("music_volume", 220);
 	ConfMan.registerDefault("sfx_volume", 220);
 	ConfMan.registerDefault("speech_volume", 220);
 	ConfMan.registerDefault("autosave_period", 3 * 60);	// Trigger autosave every 3 minutes - On low batts 4 mins is about your warning time.
@@ -223,12 +209,6 @@ void OSystem_GP2X::initBackend() {
 		_joystick = SDL_JoystickOpen(joystick_num);
 	}
 
-	// Create the savefile manager, if none exists yet (we check for this to
-	// allow subclasses to provide their own).
-	if (_savefile == 0) {
-	_savefile = new POSIXSaveFileManager();
-	}
-
 	// Create and hook up the mixer, if none exists yet (we check for this to
 	// allow subclasses to provide their own).
 	if (_mixer == 0) {
@@ -367,32 +347,37 @@ FilesystemFactory *OSystem_GP2X::getFilesystemFactory() {
 }
 
 void OSystem_GP2X::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
+	/* Setup default extra data paths for engine data files and plugins */
+	char workDirName[PATH_MAX+1];
 
-#ifdef DATA_PATH
-	// Add the global DATA_PATH to the directory search list
-	// FIXME: We use depth = 4 for now, to match the old code. May want to change that
-	Common::FSNode dataNode(DATA_PATH);
-	if (dataNode.exists() && dataNode.isDirectory()) {
-		s.add(DATA_PATH, new Common::FSDirectory(dataNode, 4), priority);
+	if (getcwd(workDirName, PATH_MAX) == NULL) {
+		error("Error: Could not obtain current working directory.");
 	}
-#endif
 
-#if defined(MACOSX) || defined(IPHONE)
-	// Get URL of the Resource directory of the .app bundle
-	CFURLRef fileUrl = CFBundleCopyResourcesDirectoryURL(CFBundleGetMainBundle());
-	if (fileUrl) {
-		// Try to convert the URL to an absolute path
-		UInt8 buf[MAXPATHLEN];
-		if (CFURLGetFileSystemRepresentation(fileUrl, true, buf, sizeof(buf))) {
-			// Success: Add it to the search path
-			Common::String bundlePath((const char *)buf);
-			s.add("__OSX_BUNDLE__", new Common::FSDirectory(bundlePath), priority);
-		}
-		CFRelease(fileUrl);
+	Common::FSNode workdirNode(workDirName);
+	if (workdirNode.exists() && workdirNode.isDirectory()) {
+		s.add("__GP2X_WORKDIR__", new Common::FSDirectory(workDirName), priority);
 	}
 
-#endif
+	char enginedataPath[PATH_MAX+1];
+
+	strcpy(enginedataPath, workDirName);
+	strcat(enginedataPath, "/engine-data");
+
+	Common::FSNode engineNode(enginedataPath);
+	if (engineNode.exists() && engineNode.isDirectory()) {
+		s.add("__GP2X_ENGDATA__", new Common::FSDirectory(enginedataPath), priority);
+	}
+
+	char pluginsPath[PATH_MAX+1];
+
+	strcpy(pluginsPath, workDirName);
+	strcat(pluginsPath, "/plugins");
 
+	Common::FSNode pluginsNode(pluginsPath);
+	if (pluginsNode.exists() && pluginsNode.isDirectory()) {
+		s.add("__GP2X_PLUGINS__", new Common::FSDirectory(pluginsPath), priority);
+	}
 }
 
 static Common::String getDefaultConfigFileName() {
@@ -479,6 +464,12 @@ void OSystem_GP2X::quit() {
 
 	delete getEventManager();
 
+	#ifdef DUMP_STDOUT
+		printf("%s\n", "Debug: STDOUT and STDERR text files closed.");
+		fclose(stdout);
+		fclose(stderr);
+	#endif /* DUMP_STDOUT */
+
 	exit(0);
 }
 
diff --git a/backends/platform/gp2xwiz/build/bundle.sh b/backends/platform/gp2xwiz/build/bundle.sh
index 1dcdb6389e..506dfcb742 100755
--- a/backends/platform/gp2xwiz/build/bundle.sh
+++ b/backends/platform/gp2xwiz/build/bundle.sh
@@ -22,6 +22,7 @@ cp ../../../../COPYING ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
 cp ../../../../COPYRIGHT ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
 cp ../../../../NEWS ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
 cp ../../../../gui/themes/scummmodern.zip ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
+cp ../../../../backends/vkeybd/packs/vkeybd_default.zip ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
 cp ../../../../dists/pred.dic ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/
 cp ../../../../dists/engine-data/* ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/engine-data
 cp ../../../../plugins/* ./scummvm-wiz-`date '+%Y-%m-%d'`/scummvm/plugins
diff --git a/backends/platform/gp2xwiz/build/config-alleng.sh b/backends/platform/gp2xwiz/build/config-alleng.sh
index 19ee308908..cfed463edf 100755
--- a/backends/platform/gp2xwiz/build/config-alleng.sh
+++ b/backends/platform/gp2xwiz/build/config-alleng.sh
@@ -17,6 +17,6 @@ export DEFINES=-DNDEBUG
 
 # Edit the configure line to suit.
 cd ../../../..
-./configure --backend=gp2xwiz --disable-mt32emu --host=gp2xwiz --disable-flac --disable-nasm --disable-hq-scalers --with-sdl-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin --with-mpeg2-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-tremor --with-tremor-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-zlib --with-zlib-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-mad --with-mad-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-all-engines --enable-plugins --default-dynamic
+./configure --backend=gp2xwiz --disable-mt32emu --host=gp2xwiz --disable-flac --disable-nasm --disable-hq-scalers --with-sdl-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin --with-mpeg2-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-tremor --with-tremor-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-zlib --with-zlib-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-mad --with-mad-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-all-engines --enable-vkeybd --enable-plugins --default-dynamic
 
 echo Generating config for GP2X Wiz complete. Check for errors.
diff --git a/backends/platform/gp2xwiz/build/config.sh b/backends/platform/gp2xwiz/build/config.sh
index b6889fe3ac..27c1fbf0bf 100755
--- a/backends/platform/gp2xwiz/build/config.sh
+++ b/backends/platform/gp2xwiz/build/config.sh
@@ -17,6 +17,6 @@ export DEFINES=-DNDEBUG
 
 # Edit the configure line to suit.
 cd ../../../..
-./configure --backend=gp2xwiz --disable-mt32emu --host=gp2xwiz --disable-flac --disable-nasm --disable-hq-scalers --with-sdl-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin --with-mpeg2-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-tremor --with-tremor-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-zlib --with-zlib-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-mad --with-mad-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-plugins --default-dynamic
+./configure --backend=gp2xwiz --disable-mt32emu --host=gp2xwiz --disable-flac --disable-nasm --disable-hq-scalers --with-sdl-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6/bin --with-mpeg2-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-tremor --with-tremor-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-zlib --with-zlib-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-mad --with-mad-prefix=/opt/open2x/gcc-4.1.1-glibc-2.3.6 --enable-vkeybd --enable-plugins --default-dynamic 
 
 echo Generating config for GP2X Wiz complete. Check for errors.
diff --git a/backends/platform/gp2xwiz/gp2xwiz-events.cpp b/backends/platform/gp2xwiz/gp2xwiz-events.cpp
index ea1b191213..dfb36742dc 100644
--- a/backends/platform/gp2xwiz/gp2xwiz-events.cpp
+++ b/backends/platform/gp2xwiz/gp2xwiz-events.cpp
@@ -30,7 +30,7 @@
 
 #include "backends/platform/gp2xwiz/gp2xwiz-sdl.h"
 #include "backends/platform/gp2xwiz/gp2xwiz-hw.h"
-#include "backends/keymapper/keymapper.h"
+
 #include "common/util.h"
 #include "common/events.h"
 
@@ -41,6 +41,28 @@
 #define JOY_XAXIS 0
 #define JOY_YAXIS 1
 
+/* GP2X Wiz: Main Joystick Mappings */
+enum {
+	GP2X_BUTTON_UP			= 0,
+	GP2X_BUTTON_UPLEFT		= 1,
+	GP2X_BUTTON_LEFT		= 2,
+	GP2X_BUTTON_DOWNLEFT	= 3,
+	GP2X_BUTTON_DOWN		= 4,
+	GP2X_BUTTON_DOWNRIGHT	= 5,
+	GP2X_BUTTON_RIGHT		= 6,
+	GP2X_BUTTON_UPRIGHT		= 7,
+	GP2X_BUTTON_MENU		= 8,
+	GP2X_BUTTON_SELECT		= 9,
+	GP2X_BUTTON_L			= 10,
+	GP2X_BUTTON_R			= 11,
+	GP2X_BUTTON_A			= 12,
+	GP2X_BUTTON_B			= 13,
+	GP2X_BUTTON_X			= 14,
+	GP2X_BUTTON_Y			= 15,
+	GP2X_BUTTON_VOLUP		= 16,
+	GP2X_BUTTON_VOLDOWN		= 17
+};
+
 static int mapKey(SDLKey key, SDLMod mod, Uint16 unicode) {
 	if (key >= SDLK_F1 && key <= SDLK_F9) {
 		return key - SDLK_F1 + Common::ASCII_F1;
@@ -173,8 +195,8 @@ bool OSystem_GP2XWIZ::pollEvent(Common::Event &event) {
 	GP2X_BUTTON_Y               Space Bar
 	GP2X_BUTTON_X               Right Mouse Click
 	GP2X_BUTTON_L				Combo Modifier (Left Trigger)
-	GP2X_BUTTON_R               F5 (Right Trigger)
-	GP2X_BUTTON_MENU			Return
+	GP2X_BUTTON_R               Return (Right Trigger)
+	GP2X_BUTTON_MENU			F5 (Game Menu)
 	GP2X_BUTTON_SELECT          Escape
 	GP2X_BUTTON_VOLUP           /dev/mixer Global Volume Up
 	GP2X_BUTTON_VOLDOWN         /dev/mixer Global Volume Down
@@ -291,8 +313,13 @@ bool OSystem_GP2XWIZ::pollEvent(Common::Event &event) {
 						break;
 					case GP2X_BUTTON_R:
 						if (GP2X_BUTTON_STATE_L == true) {
+#ifdef ENABLE_VKEYBD
+							event.kbd.keycode = Common::KEYCODE_F7;
+							event.kbd.ascii = mapKey(SDLK_F7, ev.key.keysym.mod, 0);
+#else
 							event.kbd.keycode = Common::KEYCODE_0;
 							event.kbd.ascii = mapKey(SDLK_0, ev.key.keysym.mod, 0);
+#endif
 						} else {
 							event.kbd.keycode = Common::KEYCODE_RETURN;
 							event.kbd.ascii = mapKey(SDLK_RETURN, ev.key.keysym.mod, 0);
@@ -388,8 +415,13 @@ bool OSystem_GP2XWIZ::pollEvent(Common::Event &event) {
 						break;
 					case GP2X_BUTTON_R:
 						if (GP2X_BUTTON_STATE_L == true) {
+#ifdef ENABLE_VKEYBD
+							event.kbd.keycode = Common::KEYCODE_F7;
+							event.kbd.ascii = mapKey(SDLK_F7, ev.key.keysym.mod, 0);
+#else
 							event.kbd.keycode = Common::KEYCODE_0;
 							event.kbd.ascii = mapKey(SDLK_0, ev.key.keysym.mod, 0);
+#endif
 						} else {
 							event.kbd.keycode = Common::KEYCODE_RETURN;
 							event.kbd.ascii = mapKey(SDLK_RETURN, ev.key.keysym.mod, 0);
diff --git a/backends/platform/gp2xwiz/gp2xwiz-hw.cpp b/backends/platform/gp2xwiz/gp2xwiz-hw.cpp
index c804b0d819..4d69915e27 100644
--- a/backends/platform/gp2xwiz/gp2xwiz-hw.cpp
+++ b/backends/platform/gp2xwiz/gp2xwiz-hw.cpp
@@ -42,6 +42,16 @@
 
 namespace WIZ_HW {
 
+enum {
+	VOLUME_NOCHG			= 0,
+	VOLUME_DOWN				= 1,
+	VOLUME_UP				= 2,
+	VOLUME_CHANGE_RATE		= 8,
+	VOLUME_MIN				= 0,
+	VOLUME_INITIAL			= 70,
+	VOLUME_MAX				= 100
+};
+
 int volumeLevel = VOLUME_INITIAL;
 
 void deviceInit() {
diff --git a/backends/platform/gp2xwiz/gp2xwiz-hw.h b/backends/platform/gp2xwiz/gp2xwiz-hw.h
index 577facc437..507841e902 100644
--- a/backends/platform/gp2xwiz/gp2xwiz-hw.h
+++ b/backends/platform/gp2xwiz/gp2xwiz-hw.h
@@ -31,37 +31,8 @@
 #ifndef GP2XWIZ_HW_H
 #define GP2XWIZ_HW_H
 
-/* GP2X Wiz: Main Joystick Mappings */
-
-#define GP2X_BUTTON_UP              (0)
-#define GP2X_BUTTON_UPLEFT          (1)
-#define GP2X_BUTTON_LEFT            (2)
-#define GP2X_BUTTON_DOWNLEFT        (3)
-#define GP2X_BUTTON_DOWN            (4)
-#define GP2X_BUTTON_DOWNRIGHT       (5)
-#define GP2X_BUTTON_RIGHT           (6)
-#define GP2X_BUTTON_UPRIGHT         (7)
-#define GP2X_BUTTON_MENU            (8)
-#define GP2X_BUTTON_SELECT          (9)
-#define GP2X_BUTTON_L               (10)
-#define GP2X_BUTTON_R               (11)
-#define GP2X_BUTTON_A               (12)
-#define GP2X_BUTTON_B               (13)
-#define GP2X_BUTTON_X               (14)
-#define GP2X_BUTTON_Y               (15)
-#define GP2X_BUTTON_VOLUP           (16)
-#define GP2X_BUTTON_VOLDOWN         (17)
-
 namespace WIZ_HW {
 
-#define VOLUME_MIN 0
-#define VOLUME_INITIAL 70 /* Default volume if you call mixerMoveVolume(0) without setting the global var. */
-#define VOLUME_MAX 100
-#define VOLUME_CHANGE_RATE 8
-#define VOLUME_NOCHG 0
-#define VOLUME_DOWN 1
-#define VOLUME_UP 2
-
 extern int volumeLevel;
 
 extern void	deviceInit();
diff --git a/backends/platform/iphone/iphone_video.m b/backends/platform/iphone/iphone_video.m
index 0392172aa2..61770a16c2 100644
--- a/backends/platform/iphone/iphone_video.m
+++ b/backends/platform/iphone/iphone_video.m
@@ -36,6 +36,9 @@ static int _textureHeight = 0;
 NSLock* _lock = nil;
 static int _needsScreenUpdate = 0;
 
+static UITouch* _firstTouch = NULL;
+static UITouch* _secondTouch = NULL;
+
 // static long lastTick = 0;
 // static int frames = 0;
 
@@ -47,14 +50,14 @@ void iPhone_updateScreen() {
 }
 
 void iPhone_updateScreenRect(unsigned short* screen, int x1, int y1, int x2, int y2) {
-	[_lock lock];
+	//[_lock lock];
 
 	int y;
 	for (y = y1; y < y2; ++y) {
 		memcpy(&_textureBuffer[(y * _textureWidth + x1 )* 2], &screen[y * _width + x1], (x2 - x1) * 2);
 	}
 
-	[_lock unlock];
+	//[_lock unlock];
 }
 
 
@@ -192,12 +195,12 @@ uint getSizeNextPOT(uint size) {
 	glVertexPointer(2, GL_FLOAT, 0, vertices);
 	glTexCoordPointer(2, GL_FLOAT, 0, texCoords);
 
-	[_lock lock];
+	//[_lock lock];
 	// Unfortunately we have to update the whole texture every frame, since glTexSubImage2D is actually slower in all cases
 	// due to the iPhone internals having to convert the whole texture back from its internal format when used.
 	// In the future we could use several tiled textures instead.
 	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, _textureWidth, _textureHeight, 0, GL_RGB, GL_UNSIGNED_SHORT_5_6_5, _textureBuffer);
-	[_lock unlock];
+	//[_lock unlock];
 
 	glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
 	glBindRenderbufferOES(GL_RENDERBUFFER_OES, _viewRenderbuffer);
@@ -280,7 +283,7 @@ uint getSizeNextPOT(uint size) {
 	glBindRenderbufferOES(GL_RENDERBUFFER_OES, _viewRenderbuffer);
 
 	// The color buffer is triple-buffered, so we clear it multiple times right away to avid doing any glClears later.
-	int clearCount = 3;
+	int clearCount = 5;
 	while (clearCount-- > 0) {
 		glClear(GL_COLOR_BUFFER_BIT);
 		[_context presentRenderbuffer:GL_RENDERBUFFER_OES];
@@ -366,7 +369,6 @@ uint getSizeNextPOT(uint size) {
 	];
 }
 
-
 - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
 {
 	NSSet *allTouches = [event allTouches];
@@ -374,11 +376,12 @@ uint getSizeNextPOT(uint size) {
 	switch ([allTouches count]) {
 		case 1:
 		{
-			UITouch *touch = [[allTouches allObjects] objectAtIndex:0];
+			UITouch *touch = [touches anyObject];
 			CGPoint point = [touch locationInView:self];
 			if (!getLocalMouseCoords(&point))
 				return;
 
+			_firstTouch = touch;
 			[self addEvent:
 			 [[NSDictionary alloc] initWithObjectsAndKeys:
 			  [NSNumber numberWithInt:kInputMouseDown], @"type",
@@ -391,11 +394,12 @@ uint getSizeNextPOT(uint size) {
 		}
 		case 2:
 		{
-			UITouch *touch = [[allTouches allObjects] objectAtIndex:1];
+			UITouch *touch = [touches anyObject];
 			CGPoint point = [touch locationInView:self];
 			if (!getLocalMouseCoords(&point))
 				return;
 
+			_secondTouch = touch;
 			[self addEvent:
 			 [[NSDictionary alloc] initWithObjectsAndKeys:
 			  [NSNumber numberWithInt:kInputMouseSecondDown], @"type",
@@ -413,14 +417,13 @@ uint getSizeNextPOT(uint size) {
 {
 	NSSet *allTouches = [event allTouches];
 
-	switch ([allTouches count]) {
-		case 1:
-		{
-			UITouch *touch = [[allTouches allObjects] objectAtIndex:0];
+	for (UITouch* touch in touches) {
+		if (touch == _firstTouch) {
+
 			CGPoint point = [touch locationInView:self];
 			if (!getLocalMouseCoords(&point))
 				return;
-
+			
 			[self addEvent:
 			 [[NSDictionary alloc] initWithObjectsAndKeys:
 			  [NSNumber numberWithInt:kInputMouseDragged], @"type",
@@ -429,15 +432,13 @@ uint getSizeNextPOT(uint size) {
 			  nil
 			  ]
 			 ];
-			break;
-		}
-		case 2:
-		{
-			UITouch *touch = [[allTouches allObjects] objectAtIndex:1];
+			
+		} else if (touch == _secondTouch) {
+
 			CGPoint point = [touch locationInView:self];
 			if (!getLocalMouseCoords(&point))
 				return;
-
+			
 			[self addEvent:
 			 [[NSDictionary alloc] initWithObjectsAndKeys:
 			  [NSNumber numberWithInt:kInputMouseSecondDragged], @"type",
@@ -446,7 +447,7 @@ uint getSizeNextPOT(uint size) {
 			  nil
 			  ]
 			 ];
-			break;
+			
 		}
 	}
 }
diff --git a/backends/platform/iphone/osys_iphone.cpp b/backends/platform/iphone/osys_iphone.cpp
index b72e8b65d5..7f30c0caaf 100644
--- a/backends/platform/iphone/osys_iphone.cpp
+++ b/backends/platform/iphone/osys_iphone.cpp
@@ -813,22 +813,22 @@ bool OSystem_IPHONE::handleEvent_mouseSecondDragged(Common::Event &event, int x,
 		return false;
 	}
 
+	static const int kNeededLength = 100;
+	static const int kMaxDeviation = 20;
+
 	int vecX = (x - _gestureStartX);
 	int vecY = (y - _gestureStartY);
-	int lengthSq =  vecX * vecX + vecY * vecY;
-	//printf("Lengthsq: %u\n", lengthSq);
+	
+	int absX = abs(vecX);
+	int absY = abs(vecY);
+
+	//printf("(%d, %d)\n", vecX, vecY);
 
-	if (lengthSq > 15000) { // Long enough gesture to react upon.
+	if (absX >= kNeededLength || absY >= kNeededLength) { // Long enough gesture to react upon.
 		_gestureStartX = -1;
 		_gestureStartY = -1;
 
-		float vecLength = sqrt(lengthSq);
-		float vecXNorm = vecX / vecLength;
-		float vecYNorm = vecY / vecLength;
-
-		//printf("Swipe vector: (%.2f, %.2f)\n", vecXNorm, vecYNorm);
-
-		if (vecXNorm > -0.50 && vecXNorm < 0.50 && vecYNorm > 0.75) {
+		if (absX < kMaxDeviation && vecY >= kNeededLength) {
 			// Swipe down
 			event.type = Common::EVENT_KEYDOWN;
 			_queuedInputEvent.type = Common::EVENT_KEYUP;
@@ -837,7 +837,10 @@ bool OSystem_IPHONE::handleEvent_mouseSecondDragged(Common::Event &event, int x,
 			event.kbd.keycode = _queuedInputEvent.kbd.keycode = Common::KEYCODE_F5;
 			event.kbd.ascii = _queuedInputEvent.kbd.ascii = Common::ASCII_F5;
 			_needEventRestPeriod = true;
-		} else if (vecXNorm > -0.50 && vecXNorm < 0.50 && vecYNorm < -0.75) {
+			return true;
+		}
+		
+		if (absX < kMaxDeviation && -vecY >= kNeededLength) {
 			// Swipe up
 			_mouseClickAndDragEnabled = !_mouseClickAndDragEnabled;
 			const char *dialogMsg;
@@ -849,8 +852,9 @@ bool OSystem_IPHONE::handleEvent_mouseSecondDragged(Common::Event &event, int x,
 			GUI::TimedMessageDialog dialog(dialogMsg, 1500);
 			dialog.runModal();
 			return false;
-
-		} else if (vecXNorm > 0.75 && vecYNorm >  -0.5 && vecYNorm < 0.5) {
+		}
+		
+		if (absY < kMaxDeviation && vecX >= kNeededLength) {
 			// Swipe right
 			_touchpadModeEnabled = !_touchpadModeEnabled;
 			const char *dialogMsg;
@@ -862,7 +866,9 @@ bool OSystem_IPHONE::handleEvent_mouseSecondDragged(Common::Event &event, int x,
 			dialog.runModal();
 			return false;
 
-		} else if (vecXNorm < -0.75 && vecYNorm >  -0.5 && vecYNorm < 0.5) {
+		}
+		
+		if (absY < kMaxDeviation && -vecX >= kNeededLength) {
 			// Swipe left
 			return false;
 		}
@@ -1106,16 +1112,18 @@ void OSystem_IPHONE::AQBufferCallback(void *in, AudioQueueRef inQ, AudioQueueBuf
 		outQB->mAudioDataByteSize = 4 * s_AudioQueue.frameCount;
 		s_soundCallback(s_soundParam, (byte *)outQB->mAudioData, outQB->mAudioDataByteSize);
 		AudioQueueEnqueueBuffer(inQ, outQB, 0, NULL);
-	} else
+	} else {
 		AudioQueueStop(s_AudioQueue.queue, false);
+	}
 }
 
 void OSystem_IPHONE::mixCallback(void *sys, byte *samples, int len) {
 	OSystem_IPHONE *this_ = (OSystem_IPHONE *)sys;
 	assert(this_);
 
-	if (this_->_mixer)
+	if (this_->_mixer) {
 		this_->_mixer->mixCallback(samples, len);
+	}
 }
 
 void OSystem_IPHONE::setupMixer() {
@@ -1202,9 +1210,6 @@ void OSystem_IPHONE::getTimeAndDate(struct tm &t) const {
 	t = *localtime(&curTime);
 }
 
-void OSystem_IPHONE::setWindowCaption(const char *caption) {
-}
-
 Common::SaveFileManager *OSystem_IPHONE::getSavefileManager() {
 	assert(_savefile);
 	return _savefile;
diff --git a/backends/platform/iphone/osys_iphone.h b/backends/platform/iphone/osys_iphone.h
index ceb2102a5f..705f89319a 100644
--- a/backends/platform/iphone/osys_iphone.h
+++ b/backends/platform/iphone/osys_iphone.h
@@ -171,8 +171,6 @@ public:
 	virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0);
 	virtual void getTimeAndDate(struct tm &t) const;
 
-	virtual void setWindowCaption(const char *caption);
-
 	virtual Common::SaveFileManager *getSavefileManager();
 	virtual Audio::Mixer *getMixer();
 	virtual Common::TimerManager *getTimerManager();
diff --git a/backends/platform/null/null.cpp b/backends/platform/null/null.cpp
index 304b7e80eb..ca4eda9158 100644
--- a/backends/platform/null/null.cpp
+++ b/backends/platform/null/null.cpp
@@ -113,8 +113,6 @@ public:
 
 	virtual void quit();
 
-	virtual void setWindowCaption(const char *caption);
-
 	virtual Common::SaveFileManager *getSavefileManager();
 	virtual Audio::Mixer *getMixer();
 	virtual void getTimeAndDate(struct tm &t) const;
@@ -308,9 +306,6 @@ bool OSystem_NULL::setSoundCallback(SoundProc proc, void *param) {
 void OSystem_NULL::quit() {
 }
 
-void OSystem_NULL::setWindowCaption(const char *caption) {
-}
-
 Common::SaveFileManager *OSystem_NULL::getSavefileManager() {
 	assert(_savefile);
 	return _savefile;
diff --git a/backends/platform/ps2/systemps2.h b/backends/platform/ps2/systemps2.h
index 29747c0943..ab27d93574 100644
--- a/backends/platform/ps2/systemps2.h
+++ b/backends/platform/ps2/systemps2.h
@@ -73,7 +73,6 @@ public:
 	virtual void unlockScreen();
 	virtual void updateScreen();
 	/* TODO : check */
-	virtual void fillScreen(unsigned int i) { printf("fillScreen %d\n", i); };
 	virtual void displayMessageOnOSD(const char *msg) { printf("displayMessageOnOSD: %s\n", msg); };
 	/* */
 
diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp
index 63ea5bc0dc..45be0a0cd3 100644
--- a/backends/platform/psp/osys_psp.cpp
+++ b/backends/platform/psp/osys_psp.cpp
@@ -635,12 +635,6 @@ void OSystem_PSP::getTimeAndDate(struct tm &t) const {
 	t = *localtime(&curTime);
 }
 
-void OSystem_PSP::setWindowCaption(const char *caption) {
-}
-
-void OSystem_PSP::displayMessageOnOSD(const char *msg) {
-}
-
 #define PSP_CONFIG_FILE "ms0:/scummvm.ini"
 
 Common::SeekableReadStream *OSystem_PSP::createConfigReadStream() {
diff --git a/backends/platform/psp/osys_psp.h b/backends/platform/psp/osys_psp.h
index 7abba332df..34957b293c 100644
--- a/backends/platform/psp/osys_psp.h
+++ b/backends/platform/psp/osys_psp.h
@@ -140,10 +140,6 @@ public:
 
 	virtual void quit();
 
-	virtual void setWindowCaption(const char *caption);
-
-	virtual void displayMessageOnOSD(const char *msg);
-
 	virtual Common::SeekableReadStream *createConfigReadStream();
 	virtual Common::WriteStream *createConfigWriteStream();
 };
diff --git a/backends/platform/psp/psp.spec b/backends/platform/psp/psp.spec
index 223bd58098..807b8f93b7 100644
--- a/backends/platform/psp/psp.spec
+++ b/backends/platform/psp/psp.spec
@@ -1,3 +1,3 @@
 %rename lib	old_lib
 *lib:
--lg -lm -lstdc++ -lsupc++ -lg -lpsprtc -lpspaudio -lpspuser -lpsputility -lpspdebug -lc -lpspgum -lpspvfpu -lpspgu -lpspctrl -lpspge -lpspdisplay_driver -lpspdisplay -lpsphprm -lpspge_driver -lpspsdk -lpsppower -lpsppower_driver -lpspgum_vfpu -lpspkernel %(old_lib)
+%(old_lib) -lpspdebug -lpspgu -lpspctrl -lpspge -lpspdisplay -lpsphprm -lpspsdk -lpsprtc -lpspaudio -lc -lpspuser -lpsputility -lpspkernel -lpspnet_inet -lz -lstdc++ -lc -lpspdisplay -lpspgu -lpspctrl -lpspsdk -lpspnet -lpspnet_inet -lpsputility -lpspsdk -lpspuser 
diff --git a/backends/platform/sdl/events.cpp b/backends/platform/sdl/events.cpp
index b4fc5e0777..feb2c9a9c5 100644
--- a/backends/platform/sdl/events.cpp
+++ b/backends/platform/sdl/events.cpp
@@ -252,6 +252,11 @@ bool OSystem_SDL::pollEvent(Common::Event &event) {
 			}
 #endif
 
+			if ((ev.key.keysym.mod & KMOD_CTRL) && ev.key.keysym.sym == 'u') {
+				event.type = Common::EVENT_MUTE;
+				return true;
+			}
+
 			// Ctrl-Alt-<key> will change the GFX mode
 			if ((b & (Common::KBD_CTRL|Common::KBD_ALT)) == (Common::KBD_CTRL|Common::KBD_ALT)) {
 
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 3f9b81a912..105206ec07 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -395,13 +395,20 @@ Common::WriteStream *OSystem_SDL::createConfigWriteStream() {
 }
 
 void OSystem_SDL::setWindowCaption(const char *caption) {
-	Common::String cap(caption);
+	Common::String cap;
+	byte c;
+
+	// The string caption is supposed to be in LATIN-1 encoding.
+	// SDL expects UTF-8. So we perform the conversion here.
+	while ((c = *(const byte *)caption++)) {
+		if (c < 0x80)
+			cap += c;
+		else {
+			cap += 0xC0 | (c >> 6);
+			cap += 0x80 | (c & 0x3F);
+		}
+	}
 
-	// Filter out any non-ASCII characters, replacing them by question marks.
-	// At some point, we may wish to allow LATIN 1 or UTF-8.
-	for (uint i = 0; i < cap.size(); ++i)
-		if ((byte)cap[i] > 0x7F)
-			cap.setChar('?', i);
 	SDL_WM_SetCaption(cap.c_str(), cap.c_str());
 }
 
@@ -487,7 +494,7 @@ void OSystem_SDL::quit() {
 void OSystem_SDL::setupIcon() {
 	int x, y, w, h, ncols, nbytes, i;
 	unsigned int rgba[256];
-        unsigned int *icon;
+	unsigned int *icon;
 
 	sscanf(scummvm_icon[0], "%d %d %d %d", &w, &h, &ncols, &nbytes);
 	if ((w > 512) || (h > 512) || (ncols > 255) || (nbytes > 1)) {
diff --git a/backends/platform/symbian/src/SymbianActions.cpp b/backends/platform/symbian/src/SymbianActions.cpp
index c45cef32bd..995b03f200 100644
--- a/backends/platform/symbian/src/SymbianActions.cpp
+++ b/backends/platform/symbian/src/SymbianActions.cpp
@@ -102,8 +102,15 @@ SymbianActions::SymbianActions()
 }
 
 void SymbianActions::initInstanceMain(OSystem *mainSystem) {
+	int i;
+	
 	Actions::initInstanceMain(mainSystem);
 
+	// Disable all mappings before setting main mappings again
+	for (i = 0; i < ACTION_LAST; i++) {		
+		_action_enabled[i] = false;
+	}
+
 	// Mouse Up
 	_action_enabled[ACTION_UP] = true;
 
diff --git a/backends/platform/symbian/src/SymbianOS.cpp b/backends/platform/symbian/src/SymbianOS.cpp
index 452f730110..7af1cade8c 100644
--- a/backends/platform/symbian/src/SymbianOS.cpp
+++ b/backends/platform/symbian/src/SymbianOS.cpp
@@ -471,9 +471,18 @@ bool OSystem_SDL_Symbian::remapKey(SDL_Event &ev, Common::Event &event) {
 
 void OSystem_SDL_Symbian::setWindowCaption(const char *caption) {
 	OSystem_SDL::setWindowCaption(caption);
+}
+
+void OSystem_SDL_Symbian::engineInit() {
+	// Check mappings for the engine just started
 	check_mappings();
 }
 
+void OSystem_SDL_Symbian::engineDone() {
+	// Need to reset engine to basic state after an engine has been running
+	GUI::Actions::Instance()->initInstanceMain(this);
+}
+
 void OSystem_SDL_Symbian::check_mappings() {
 	if (ConfMan.get("gameid").empty() || GUI::Actions::Instance()->initialized())
 		return;
diff --git a/backends/platform/symbian/src/SymbianOS.h b/backends/platform/symbian/src/SymbianOS.h
index efca94b706..b873b503be 100644
--- a/backends/platform/symbian/src/SymbianOS.h
+++ b/backends/platform/symbian/src/SymbianOS.h
@@ -107,6 +107,18 @@ protected:
 
 	void setWindowCaption(const char *caption);
 
+	/**
+	 * Allows the backend to perform engine specific init.
+	 * Called just before the engine is run.
+	 */
+	virtual void engineInit();
+
+	/**
+	 * Allows the backend to perform engine specific de-init.
+	 * Called after the engine finishes.
+	 */
+	virtual void engineDone();
+
 	//
 	// Used to intialized special game mappings
 	//
diff --git a/backends/platform/wii/wii.mk b/backends/platform/wii/wii.mk
index 030cc997eb..f99288c4a6 100644
--- a/backends/platform/wii/wii.mk
+++ b/backends/platform/wii/wii.mk
@@ -1,61 +1,25 @@
-WII_ELF=scummvm.elf
-WII_DOL=scummvm.dol
-WII_DISTPATH=$(srcdir)/dists/wii
-all: $(WII_DOL)
+WII_EXE := scummvm$(EXEEXT)
+WII_EXE_STRIPPED := scummvm_stripped$(EXEEXT)
 
-$(WII_DOL): $(WII_ELF)
-	$(DEVKITPPC)/bin/elf2dol $< $@
+$(WII_EXE_STRIPPED): $(WII_EXE)
+	$(STRIP) $< -o $@
 
 clean: wiiclean
 
 wiiclean:
-	$(RM) $(WII_DOL)
+	$(RM) $(WII_EXE_STRIPPED)
 
-wiiload: $(WII_DOL)
-	$(DEVKITPPC)/bin/wiiload $(WII_DOL) -d3
+wiiload: $(WII_EXE_STRIPPED)
+	$(DEVKITPPC)/bin/wiiload $<
 
-geckoupload: $(WII_DOL)
-	$(DEVKITPPC)/bin/geckoupload $(WII_DOL)
+geckoupload: $(WII_EXE_STRIPPED)
+	$(DEVKITPPC)/bin/geckoupload $<
 
 wiigdb:
-	$(DEVKITPPC)/bin/powerpc-gekko-gdb -n $(WII_ELF)
+	$(DEVKITPPC)/bin/powerpc-gekko-gdb -n $(WII_EXE)
 
 wiidebug:
-	$(DEVKITPPC)/bin/powerpc-gekko-gdb -n $(WII_ELF) -x $(srcdir)/backends/platform/wii/gdb.txt
-
-wiidist:
-	$(MKDIR) dist/scummvm
-	$(CP) $(WII_DOL) dist/scummvm/boot.dol
-	$(CP) $(WII_DISTPATH)/meta.xml dist/scummvm/
-	$(CP) $(WII_DISTPATH)/icon.png dist/scummvm/
-	$(CP) $(WII_DISTPATH)/READMII dist/scummvm/
-	$(CP) $(srcdir)/AUTHORS dist/scummvm/
-	$(CP) $(srcdir)/COPYING dist/scummvm/
-	$(CP) $(srcdir)/COPYING.LGPL dist/scummvm/
-	$(CP) $(srcdir)/COPYRIGHT dist/scummvm/
-	$(CP) $(srcdir)/NEWS dist/scummvm/
-	$(CP) $(srcdir)/README dist/scummvm/
-	$(CP) $(srcdir)/dists/pred.dic dist/scummvm/
-	$(CP) $(DIST_FILES_THEMES) dist/scummvm/
-ifneq ($(DIST_FILES_ENGINEDATA),)
-	$(CP) $(DIST_FILES_ENGINEDATA) dist/scummvm/
-endif
-
-gcdist:
-	$(MKDIR) dist/scummvm
-	$(CP) $(WII_DOL) dist/scummvm/
-	$(CP) $(WII_DISTPATH)/READMII dist/scummvm/
-	$(CP) $(srcdir)/AUTHORS dist/scummvm/
-	$(CP) $(srcdir)/COPYING dist/scummvm/
-	$(CP) $(srcdir)/COPYING.LGPL dist/scummvm/
-	$(CP) $(srcdir)/COPYRIGHT dist/scummvm/
-	$(CP) $(srcdir)/NEWS dist/scummvm/
-	$(CP) $(srcdir)/README dist/scummvm/
-	$(CP) $(srcdir)/dists/pred.dic dist/scummvm/
-	$(CP) $(DIST_FILES_THEMES) dist/scummvm/
-ifneq ($(DIST_FILES_ENGINEDATA),)
-	$(CP) $(DIST_FILES_ENGINEDATA) dist/scummvm/
-endif
-
-.PHONY: wiiclean wiiload geckoupload wiigdb wiidebug wiidist gcdist
+	$(DEVKITPPC)/bin/powerpc-gekko-gdb -n $(WII_EXE) -x $(srcdir)/backends/platform/wii/gdb.txt
+
+.PHONY: wiiclean wiiload geckoupload wiigdb wiidebug
 
diff --git a/backends/platform/wince/wince-sdl.cpp b/backends/platform/wince/wince-sdl.cpp
index 344edd7143..b8261d029e 100644
--- a/backends/platform/wince/wince-sdl.cpp
+++ b/backends/platform/wince/wince-sdl.cpp
@@ -916,6 +916,8 @@ void OSystem_WINCE3::setWindowCaption(const char *caption) {
 	compute_sample_rate();
 	setupMixer();
 
+FIXME: move check_mappings() etc. calls to engineInit() & engineDone()
+
 	// handle the actual event
 	OSystem_SDL::setWindowCaption(caption);
 }
diff --git a/backends/vkeybd/packs/vkeybd_default.zip b/backends/vkeybd/packs/vkeybd_default.zip
new file mode 100644
index 0000000000..9311b2a902
--- /dev/null
+++ b/backends/vkeybd/packs/vkeybd_default.zip
diff --git a/backends/vkeybd/packs/vkeybd_default/lowercase-symbols320x240.bmp b/backends/vkeybd/packs/vkeybd_default/lowercase-symbols320x240.bmp
new file mode 100644
index 0000000000..02254aa3c7
--- /dev/null
+++ b/backends/vkeybd/packs/vkeybd_default/lowercase-symbols320x240.bmp
diff --git a/backends/vkeybd/packs/vkeybd_default/lowercase-symbols640x480.bmp b/backends/vkeybd/packs/vkeybd_default/lowercase-symbols640x480.bmp
new file mode 100644
index 0000000000..98c602acbe
--- /dev/null
+++ b/backends/vkeybd/packs/vkeybd_default/lowercase-symbols640x480.bmp
diff --git a/backends/vkeybd/packs/vkeybd_default/lowercase320x240.bmp b/backends/vkeybd/packs/vkeybd_default/lowercase320x240.bmp
new file mode 100644
index 0000000000..3270bf21e4
--- /dev/null
+++ b/backends/vkeybd/packs/vkeybd_default/lowercase320x240.bmp
diff --git a/backends/vkeybd/packs/vkeybd_default/lowercase640x480.bmp b/backends/vkeybd/packs/vkeybd_default/lowercase640x480.bmp
new file mode 100644
index 0000000000..610f0844d0
--- /dev/null
+++ b/backends/vkeybd/packs/vkeybd_default/lowercase640x480.bmp
diff --git a/backends/vkeybd/packs/vkeybd_default/uppercase-symbols320x240.bmp b/backends/vkeybd/packs/vkeybd_default/uppercase-symbols320x240.bmp
new file mode 100644
index 0000000000..8fd645eb22
--- /dev/null
+++ b/backends/vkeybd/packs/vkeybd_default/uppercase-symbols320x240.bmp
diff --git a/backends/vkeybd/packs/vkeybd_default/uppercase-symbols640x480.bmp b/backends/vkeybd/packs/vkeybd_default/uppercase-symbols640x480.bmp
new file mode 100644
index 0000000000..cbdfbf19e9
--- /dev/null
+++ b/backends/vkeybd/packs/vkeybd_default/uppercase-symbols640x480.bmp
diff --git a/backends/vkeybd/packs/vkeybd_default/uppercase320x240.bmp b/backends/vkeybd/packs/vkeybd_default/uppercase320x240.bmp
new file mode 100644
index 0000000000..6a1132314a
--- /dev/null
+++ b/backends/vkeybd/packs/vkeybd_default/uppercase320x240.bmp
diff --git a/backends/vkeybd/packs/vkeybd_default/uppercase640x480.bmp b/backends/vkeybd/packs/vkeybd_default/uppercase640x480.bmp
new file mode 100644
index 0000000000..e635a3ccf2
--- /dev/null
+++ b/backends/vkeybd/packs/vkeybd_default/uppercase640x480.bmp
diff --git a/backends/vkeybd/packs/vkeybd_default/vkeybd_default.xml b/backends/vkeybd/packs/vkeybd_default/vkeybd_default.xml
new file mode 100644
index 0000000000..982c4f45ef
--- /dev/null
+++ b/backends/vkeybd/packs/vkeybd_default/vkeybd_default.xml
@@ -0,0 +1,920 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<keyboard initial_mode="lowercase" v_align="bottom" h_align="centre">
+
+  <!-- Lowercase -->
+  <mode name="lowercase" resolutions="320x240,640x480">
+    <layout resolution="320x240" bitmap="lowercase320x240.bmp" transparent_color="255,0,255">
+      <map>
+        <area shape="rect" coords="13,8,306,20" target="display_area" />
+        <area shape="rect" coords="9,26,25,42" target="esc" />
+        <area shape="rect" coords="50,25,67,43" target="f2" />
+        <area shape="rect" coords="29,24,46,43" target="f1" />
+        <area shape="rect" coords="71,26,88,44" target="f3" />
+        <area shape="rect" coords="90,25,107,43" target="f4" />
+        <area shape="rect" coords="111,26,128,44" target="f5" />
+        <area shape="rect" coords="132,26,149,44" target="f6" />
+        <area shape="rect" coords="153,25,170,44" target="f7" />
+        <area shape="rect" coords="173,26,190,44" target="f8" />
+        <area shape="rect" coords="194,24,211,43" target="f9" />
+        <area shape="rect" coords="215,26,231,44" target="f10" />
+        <area shape="rect" coords="235,26,253,43" target="f11" />
+        <area shape="rect" coords="255,26,272,45" target="f12" />
+        <area shape="rect" coords="276,27,310,43" target="del" />
+        <area shape="rect" coords="276,47,308,64" target="backspace" />
+        <area shape="rect" coords="8,68,32,85" target="tab" />
+        <area shape="rect" coords="36,68,53,85" target="q" />
+        <area shape="rect" coords="57,68,75,86" target="w" />
+        <area shape="rect" coords="78,67,94,85" target="e" />
+        <area shape="rect" coords="98,67,115,85" target="r" />
+        <area shape="rect" coords="119,67,136,85" target="t" />
+        <area shape="rect" coords="141,68,158,86" target="y" />
+        <area shape="rect" coords="161,67,179,86" target="u" />
+        <area shape="rect" coords="182,67,199,86" target="i" />
+        <area shape="rect" coords="202,67,220,85" target="o" />
+        <area shape="rect" coords="223,68,240,86" target="p" />
+        <area shape="rect" coords="44,88,63,107" target="a" />
+        <area shape="rect" coords="65,88,84,106" target="s" />
+        <area shape="rect" coords="86,89,104,107" target="d" />
+        <area shape="rect" coords="107,89,124,107" target="f" />
+        <area shape="rect" coords="128,89,145,107" target="g" />
+        <area shape="rect" coords="149,88,165,107" target="h" />
+        <area shape="rect" coords="169,89,186,107" target="j" />
+        <area shape="rect" coords="189,89,207,107" target="k" />
+        <area shape="rect" coords="210,89,228,107" target="l" />
+        <area shape="rect" coords="273,89,311,106" target="enter" />
+        <area shape="rect" coords="9,110,50,127" target="shift" />
+        <area shape="rect" coords="8,89,41,106" target="caps" />
+        <area shape="rect" coords="58,110,75,128" target="z" />
+        <area shape="rect" coords="79,110,96,128" target="x" />
+        <area shape="rect" coords="99,109,116,127" target="c" />
+        <area shape="rect" coords="120,110,138,128" target="v" />
+        <area shape="rect" coords="141,109,157,127" target="b" />
+        <area shape="rect" coords="162,110,179,128" target="n" />
+        <area shape="rect" coords="182,110,199,128" target="m" />
+        <area shape="rect" coords="271,109,311,128" target="symbols" />
+        <area shape="rect" coords="9,130,33,148" target="ctrl" />
+        <area shape="rect" coords="38,130,61,147" target="alt" />
+        <area shape="rect" coords="67,130,262,148" target="space" />
+        <area shape="rect" coords="8,47,26,64" target="|" />
+        <area shape="rect" coords="28,47,45,64" target="1" />
+        <area shape="rect" coords="50,47,67,65" target="2" />
+        <area shape="rect" coords="70,46,87,65" target="3" />
+        <area shape="rect" coords="91,46,108,64" target="4" />
+        <area shape="rect" coords="111,46,129,65" target="5" />
+        <area shape="rect" coords="132,47,149,65" target="6" />
+        <area shape="rect" coords="152,47,170,64" target="7" />
+        <area shape="rect" coords="174,46,191,63" target="8" />
+        <area shape="rect" coords="194,47,211,65" target="9" />
+        <area shape="rect" coords="215,46,232,64" target="0" />
+        <area shape="rect" coords="235,47,252,65" target="-" />
+        <area shape="rect" coords="255,46,272,65" target="=" />
+        <area shape="rect" coords="244,68,261,86" target="[" />
+        <area shape="rect" coords="264,67,282,86" target="]" />
+        <area shape="rect" coords="284,68,309,86" target="#" />
+        <area shape="rect" coords="231,88,249,106" target=";" />
+        <area shape="rect" coords="251,89,269,107" target="’" />
+        <area shape="rect" coords="202,110,219,128" target="," />
+        <area shape="rect" coords="223,110,241,128" target="." />
+        <area shape="rect" coords="243,110,261,128" target="/" />
+        <area shape="rect" coords="277,133,292,148" target="ok" />
+        <area shape="rect" coords="292,133,309,148" target="cancel" />
+      </map>
+    </layout>
+    <layout resolution="640x480" bitmap="lowercase640x480.bmp" transparent_color="255,0,255">
+      <map>
+        <area shape="rect" coords="26,23,613,37" target="display_area"	 />
+        <area shape="rect" coords="18,52,51,85" target="esc"   />
+        <area shape="rect" coords="100,51,135,88" target="f2"	/>
+        <area shape="rect" coords="59,49,94,88" target="f1"   />
+        <area shape="rect" coords="142,53,176,89" target="f3"	/>
+        <area shape="rect" coords="181,51,216,87" target="f4"	/>
+        <area shape="rect" coords="223,52,258,88" target="f5"	/>
+        <area shape="rect" coords="265,52,299,89" target="f6"	/>
+        <area shape="rect" coords="306,51,341,90" target="f7"	/>
+        <area shape="rect" coords="347,53,382,89" target="f8"	/>
+        <area shape="rect" coords="389,49,424,88" target="f9"	/>
+        <area shape="rect" coords="431,52,464,89" target="f10"	 />
+        <area shape="rect" coords="470,53,506,88" target="f11"	 />
+        <area shape="rect" coords="511,52,546,90" target="f12"	 />
+        <area shape="rect" coords="552,55,620,87" target="del"	 />
+        <area shape="rect" coords="553,94,618,129" target="backspace"	/>
+        <area shape="rect" coords="17,136,66,171" target="tab"	 />
+        <area shape="rect" coords="73,137,108,171" target="q"	/>
+        <area shape="rect" coords="114,136,150,172" target="w"	 />
+        <area shape="rect" coords="157,134,189,171" target="e"	 />
+        <area shape="rect" coords="197,135,232,171" target="r"	 />
+        <area shape="rect" coords="239,135,274,172" target="t"	 />
+        <area shape="rect" coords="282,136,317,173" target="y"	 />
+        <area shape="rect" coords="322,135,359,173" target="u"	 />
+        <area shape="rect" coords="364,134,399,172" target="i"	 />
+        <area shape="rect" coords="404,135,440,171" target="o"	 />
+        <area shape="rect" coords="446,136,480,172" target="p"	 />
+        <area shape="rect" coords="89,177,127,216" target="a"	/>
+        <area shape="rect" coords="131,177,169,214" target="s"	 />
+        <area shape="rect" coords="173,178,209,215" target="d"	 />
+        <area shape="rect" coords="215,178,250,214" target="f"	 />
+        <area shape="rect" coords="256,178,291,214" target="g"	 />
+        <area shape="rect" coords="299,176,332,214" target="h"	 />
+        <area shape="rect" coords="339,178,374,215" target="j"	 />
+        <area shape="rect" coords="379,178,415,215" target="k"	 />
+        <area shape="rect" coords="421,178,457,215" target="l"	 />
+        <area shape="rect" coords="546,179,622,214" target="enter"	 />
+        <area shape="rect" coords="19,221,101,256" target="shift"	/>
+        <area shape="rect" coords="17,179,84,213" target="caps"   />
+        <area shape="rect" coords="117,220,152,256" target="z"	 />
+        <area shape="rect" coords="158,220,192,256" target="x"	 />
+        <area shape="rect" coords="198,219,233,256" target="c"	 />
+        <area shape="rect" coords="240,220,276,257" target="v"	 />
+        <area shape="rect" coords="283,219,316,255" target="b"	 />
+        <area shape="rect" coords="324,220,359,256" target="n"	 />
+        <area shape="rect" coords="365,220,399,257" target="m"	 />
+        <area shape="rect" coords="542,219,623,257" target="symbols"   />
+        <area shape="rect" coords="19,260,68,296" target="ctrl"   />
+        <area shape="rect" coords="76,261,123,295" target="alt"   />
+        <area shape="rect" coords="135,261,525,297" target="space"	 />
+        <area shape="rect" coords="16,95,53,129" target="|"   />
+        <area shape="rect" coords="57,95,92,129" target="1"   />
+        <area shape="rect" coords="100,94,134,130" target="2"	/>
+        <area shape="rect" coords="140,93,174,131" target="3"	/>
+        <area shape="rect" coords="182,93,217,130" target="4"	/>
+        <area shape="rect" coords="222,93,258,132" target="5"	/>
+        <area shape="rect" coords="265,94,299,131" target="6"	/>
+        <area shape="rect" coords="305,94,341,129" target="7"	/>
+        <area shape="rect" coords="348,93,382,128" target="8"	/>
+        <area shape="rect" coords="389,94,423,130" target="9"	/>
+        <area shape="rect" coords="431,93,465,130" target="0"	/>
+        <area shape="rect" coords="471,94,505,131" target="-"	/>
+        <area shape="rect" coords="511,93,546,131" target="="	/>
+        <area shape="rect" coords="488,136,522,172" target="["	 />
+        <area shape="rect" coords="529,135,565,173" target="]"	 />
+        <area shape="rect" coords="569,136,620,172" target="#"	 />
+        <area shape="rect" coords="462,177,498,214" target=";"	 />
+        <area shape="rect" coords="503,178,539,214" target="’"	 />
+        <area shape="rect" coords="405,220,440,256" target=","	 />
+        <area shape="rect" coords="447,220,483,256" target="."	 />
+        <area shape="rect" coords="487,220,524,256" target="/"	 />
+        <area shape="rect" coords="555,266,585,298" target="ok" />
+        <area shape="rect" coords="585,266,619,298" target="cancel" />
+      </map>
+    </layout>
+    <event name="esc" type="key" code="27" ascii="27" modifiers="" />
+    <event name="f1" type="key" code="282" ascii="315" modifiers="" />
+    <event name="f2" type="key" code="283" ascii="316" modifiers="" />
+    <event name="f3" type="key" code="284" ascii="317" modifiers="" />
+    <event name="f4" type="key" code="285" ascii="318" modifiers="" />
+    <event name="f5" type="key" code="286" ascii="319" modifiers="" />
+    <event name="f6" type="key" code="287" ascii="320" modifiers="" />
+    <event name="f7" type="key" code="288" ascii="321" modifiers="" />
+    <event name="f8" type="key" code="289" ascii="322" modifiers="" />
+    <event name="f9" type="key" code="290" ascii="323" modifiers="" />
+    <event name="f10" type="key" code="291" ascii="324" modifiers="" />
+    <event name="f11" type="key" code="292" ascii="325" modifiers="" />
+    <event name="f12" type="key" code="293" ascii="326" modifiers="" />
+    <event name="del" type="key" code="127" ascii="0" modifiers="" />
+    <event name="ctrl" type="modifier" modifiers="ctrl" />
+    <event name="alt" type="modifier" modifiers="alt" />
+    <event name="shift" type="modifier" modifiers="shift" />
+    <event name="caps" type="switch_mode" mode="uppercase" />
+    <event name="symbols" type="switch_mode" mode="lowercasesymbols" />
+    <event name="backspace" type="key" code="8" ascii="8" modifiers="" />
+    <event name="enter" type="key" code="13" ascii="13" modifiers="" />
+    <event name="|" type="key" code="124" ascii="124" modifiers="" />
+    <event name="-" type="key" code="45" ascii="45" modifiers="" />
+    <event name="=" type="key" code="61" ascii="61" modifiers="" />
+    <event name="[" type="key" code="91" ascii="91" modifiers="" />
+    <event name="]" type="key" code="93" ascii="93" modifiers="" />
+    <event name="#" type="key" code="35" ascii="35" modifiers="" />
+    <event name=";" type="key" code="59" ascii="59" modifiers="" />
+    <event name="'" type="key" code="39" ascii="39" modifiers="" />
+    <event name="," type="key" code="44" ascii="44" modifiers="" />
+    <event name="." type="key" code="46" ascii="46" modifiers="" />
+    <event name="/" type="key" code="47" ascii="47" modifiers="" />
+    <event name="space" type="key" code="32" ascii="32" modifiers="" />
+    <event name="tab" type="key" code="9" ascii="9" modifiers="" />
+    <event name="a" type="key" code="97" ascii="97" modifiers="" />
+    <event name="b" type="key" code="98" ascii="98" modifiers="" />
+    <event name="c" type="key" code="99" ascii="99" modifiers="" />
+    <event name="d" type="key" code="100" ascii="100" modifiers="" />
+    <event name="e" type="key" code="101" ascii="101" modifiers="" />
+    <event name="f" type="key" code="102" ascii="102" modifiers="" />
+    <event name="g" type="key" code="103" ascii="103" modifiers="" />
+    <event name="h" type="key" code="104" ascii="104" modifiers="" />
+    <event name="i" type="key" code="105" ascii="105" modifiers="" />
+    <event name="j" type="key" code="106" ascii="106" modifiers="" />
+    <event name="k" type="key" code="107" ascii="107" modifiers="" />
+    <event name="l" type="key" code="108" ascii="108" modifiers="" />
+    <event name="m" type="key" code="109" ascii="109" modifiers="" />
+    <event name="n" type="key" code="110" ascii="110" modifiers="" />
+    <event name="o" type="key" code="111" ascii="111" modifiers="" />
+    <event name="p" type="key" code="112" ascii="112" modifiers="" />
+    <event name="q" type="key" code="113" ascii="113" modifiers="" />
+    <event name="r" type="key" code="114" ascii="114" modifiers="" />
+    <event name="s" type="key" code="115" ascii="115" modifiers="" />
+    <event name="t" type="key" code="116" ascii="116" modifiers="" />
+    <event name="u" type="key" code="117" ascii="117" modifiers="" />
+    <event name="v" type="key" code="118" ascii="118" modifiers="" />
+    <event name="w" type="key" code="119" ascii="119" modifiers="" />
+    <event name="x" type="key" code="120" ascii="120" modifiers="" />
+    <event name="y" type="key" code="121" ascii="121" modifiers="" />
+    <event name="z" type="key" code="122" ascii="122" modifiers="" />
+    <event name="0" type="key" code="48" ascii="48" modifiers="" />
+    <event name="1" type="key" code="49" ascii="49" modifiers="" />
+    <event name="2" type="key" code="50" ascii="50" modifiers="" />
+    <event name="3" type="key" code="51" ascii="51" modifiers="" />
+    <event name="4" type="key" code="52" ascii="52" modifiers="" />
+    <event name="5" type="key" code="53" ascii="53" modifiers="" />
+    <event name="6" type="key" code="54" ascii="54" modifiers="" />
+    <event name="7" type="key" code="55" ascii="55" modifiers="" />
+    <event name="8" type="key" code="56" ascii="56" modifiers="" />
+    <event name="9" type="key" code="57" ascii="57" modifiers="" />
+    <event name="ok" type="submit" />
+    <event name="cancel" type="cancel" />
+    <event name="quit" type="submit" />
+  </mode>
+
+  <!-- Uppercase -->
+  <mode name="uppercase" resolutions="320x240,640x480">
+    <layout resolution="320x240" bitmap="uppercase320x240.bmp" transparent_color="255,0,255">
+      <map>
+        <area shape="rect" coords="13,8,306,20" target="display_area" />
+        <area shape="rect" coords="9,26,25,42" target="esc" />
+        <area shape="rect" coords="50,25,67,43" target="f2" />
+        <area shape="rect" coords="29,24,46,43" target="f1" />
+        <area shape="rect" coords="71,26,88,44" target="f3" />
+        <area shape="rect" coords="90,25,107,43" target="f4" />
+        <area shape="rect" coords="111,26,128,44" target="f5" />
+        <area shape="rect" coords="132,26,149,44" target="f6" />
+        <area shape="rect" coords="153,25,170,44" target="f7" />
+        <area shape="rect" coords="173,26,190,44" target="f8" />
+        <area shape="rect" coords="194,24,211,43" target="f9" />
+        <area shape="rect" coords="215,26,231,44" target="f10" />
+        <area shape="rect" coords="235,26,253,43" target="f11" />
+        <area shape="rect" coords="255,26,272,45" target="f12" />
+        <area shape="rect" coords="276,27,310,43" target="del" />
+        <area shape="rect" coords="276,47,308,64" target="backspace" />
+        <area shape="rect" coords="8,68,32,85" target="tab" />
+        <area shape="rect" coords="36,68,53,85" target="Q" />
+        <area shape="rect" coords="57,68,75,86" target="W" />
+        <area shape="rect" coords="78,67,94,85" target="E" />
+        <area shape="rect" coords="98,67,115,85" target="R" />
+        <area shape="rect" coords="119,67,136,85" target="T" />
+        <area shape="rect" coords="141,68,158,86" target="Y" />
+        <area shape="rect" coords="161,67,179,86" target="U" />
+        <area shape="rect" coords="182,67,199,86" target="I" />
+        <area shape="rect" coords="202,67,220,85" target="O" />
+        <area shape="rect" coords="223,68,240,86" target="P" />
+        <area shape="rect" coords="44,88,63,107" target="A" />
+        <area shape="rect" coords="65,88,84,106" target="S" />
+        <area shape="rect" coords="86,89,104,107" target="D" />
+        <area shape="rect" coords="107,89,124,107" target="F" />
+        <area shape="rect" coords="128,89,145,107" target="G" />
+        <area shape="rect" coords="149,88,165,107" target="H" />
+        <area shape="rect" coords="169,89,186,107" target="J" />
+        <area shape="rect" coords="189,89,207,107" target="K" />
+        <area shape="rect" coords="210,89,228,107" target="L" />
+        <area shape="rect" coords="273,89,311,106" target="enter" />
+        <area shape="rect" coords="9,110,50,127" target="shift" />
+        <area shape="rect" coords="8,89,41,106" target="caps" />
+        <area shape="rect" coords="58,110,75,128" target="Z" />
+        <area shape="rect" coords="79,110,96,128" target="X" />
+        <area shape="rect" coords="99,109,116,127" target="C" />
+        <area shape="rect" coords="120,110,138,128" target="V" />
+        <area shape="rect" coords="141,109,157,127" target="B" />
+        <area shape="rect" coords="162,110,179,128" target="N" />
+        <area shape="rect" coords="182,110,199,128" target="M" />
+        <area shape="rect" coords="271,109,311,128" target="symbols" />
+        <area shape="rect" coords="9,130,33,148" target="ctrl" />
+        <area shape="rect" coords="38,130,61,147" target="alt" />
+        <area shape="rect" coords="67,130,262,148" target="space" />
+        <area shape="rect" coords="8,47,26,64" target="|" />
+        <area shape="rect" coords="28,47,45,64" target="1" />
+        <area shape="rect" coords="50,47,67,65" target="2" />
+        <area shape="rect" coords="70,46,87,65" target="3" />
+        <area shape="rect" coords="91,46,108,64" target="4" />
+        <area shape="rect" coords="111,46,129,65" target="5" />
+        <area shape="rect" coords="132,47,149,65" target="6" />
+        <area shape="rect" coords="152,47,170,64" target="7" />
+        <area shape="rect" coords="174,46,191,63" target="8" />
+        <area shape="rect" coords="194,47,211,65" target="9" />
+        <area shape="rect" coords="215,46,232,64" target="0" />
+        <area shape="rect" coords="235,47,252,65" target="-" />
+        <area shape="rect" coords="255,46,272,65" target="=" />
+        <area shape="rect" coords="244,68,261,86" target="[" />
+        <area shape="rect" coords="264,67,282,86" target="]" />
+        <area shape="rect" coords="284,68,309,86" target="#" />
+        <area shape="rect" coords="231,88,249,106" target=";" />
+        <area shape="rect" coords="251,89,269,107" target="’" />
+        <area shape="rect" coords="202,110,219,128" target="," />
+        <area shape="rect" coords="223,110,241,128" target="." />
+        <area shape="rect" coords="243,110,261,128" target="/" />
+      </map>
+    </layout>
+    <layout resolution="640x480" bitmap="uppercase640x480.bmp" transparent_color="255,0,255">
+      <map>
+        <area shape="rect" coords="26,23,613,37" target="display_area"	 />
+        <area shape="rect" coords="18,52,51,85" target="esc"   />
+        <area shape="rect" coords="100,51,135,88" target="f2"	/>
+        <area shape="rect" coords="59,49,94,88" target="f1"   />
+        <area shape="rect" coords="142,53,176,89" target="f3"	/>
+        <area shape="rect" coords="181,51,216,87" target="f4"	/>
+        <area shape="rect" coords="223,52,258,88" target="f5"	/>
+        <area shape="rect" coords="265,52,299,89" target="f6"	/>
+        <area shape="rect" coords="306,51,341,90" target="f7"	/>
+        <area shape="rect" coords="347,53,382,89" target="f8"	/>
+        <area shape="rect" coords="389,49,424,88" target="f9"	/>
+        <area shape="rect" coords="431,52,464,89" target="f10"	 />
+        <area shape="rect" coords="470,53,506,88" target="f11"	 />
+        <area shape="rect" coords="511,52,546,90" target="f12"	 />
+        <area shape="rect" coords="552,55,620,87" target="del"	 />
+        <area shape="rect" coords="553,94,618,129" target="backspace"	/>
+        <area shape="rect" coords="17,136,66,171" target="tab"	 />
+        <area shape="rect" coords="73,137,108,171" target="Q"	/>
+        <area shape="rect" coords="114,136,150,172" target="W"	 />
+        <area shape="rect" coords="157,134,189,171" target="E"	 />
+        <area shape="rect" coords="197,135,232,171" target="R"	 />
+        <area shape="rect" coords="239,135,274,172" target="T"	 />
+        <area shape="rect" coords="282,136,317,173" target="Y"	 />
+        <area shape="rect" coords="322,135,359,173" target="U"	 />
+        <area shape="rect" coords="364,134,399,172" target="I"	 />
+        <area shape="rect" coords="404,135,440,171" target="O"	 />
+        <area shape="rect" coords="446,136,480,172" target="P"	 />
+        <area shape="rect" coords="89,177,127,216" target="A"	/>
+        <area shape="rect" coords="131,177,169,214" target="S"	 />
+        <area shape="rect" coords="173,178,209,215" target="D"	 />
+        <area shape="rect" coords="215,178,250,214" target="F"	 />
+        <area shape="rect" coords="256,178,291,214" target="G"	 />
+        <area shape="rect" coords="299,176,332,214" target="H"	 />
+        <area shape="rect" coords="339,178,374,215" target="J"	 />
+        <area shape="rect" coords="379,178,415,215" target="K"	 />
+        <area shape="rect" coords="421,178,457,215" target="L"	 />
+        <area shape="rect" coords="546,179,622,214" target="enter"	 />
+        <area shape="rect" coords="19,221,101,256" target="shift"	/>
+        <area shape="rect" coords="17,179,84,213" target="caps"   />
+        <area shape="rect" coords="117,220,152,256" target="Z"	 />
+        <area shape="rect" coords="158,220,192,256" target="X"	 />
+        <area shape="rect" coords="198,219,233,256" target="C"	 />
+        <area shape="rect" coords="240,220,276,257" target="V"	 />
+        <area shape="rect" coords="283,219,316,255" target="B"	 />
+        <area shape="rect" coords="324,220,359,256" target="N"	 />
+        <area shape="rect" coords="365,220,399,257" target="M"	 />
+        <area shape="rect" coords="542,219,623,257" target="symbols"   />
+        <area shape="rect" coords="19,260,68,296" target="ctrl"   />
+        <area shape="rect" coords="76,261,123,295" target="alt"   />
+        <area shape="rect" coords="135,261,525,297" target="space"	 />
+        <area shape="rect" coords="16,95,53,129" target="|"   />
+        <area shape="rect" coords="57,95,92,129" target="1"   />
+        <area shape="rect" coords="100,94,134,130" target="2"	/>
+        <area shape="rect" coords="140,93,174,131" target="3"	/>
+        <area shape="rect" coords="182,93,217,130" target="4"	/>
+        <area shape="rect" coords="222,93,258,132" target="5"	/>
+        <area shape="rect" coords="265,94,299,131" target="6"	/>
+        <area shape="rect" coords="305,94,341,129" target="7"	/>
+        <area shape="rect" coords="348,93,382,128" target="8"	/>
+        <area shape="rect" coords="389,94,423,130" target="9"	/>
+        <area shape="rect" coords="431,93,465,130" target="0"	/>
+        <area shape="rect" coords="471,94,505,131" target="-"	/>
+        <area shape="rect" coords="511,93,546,131" target="="	/>
+        <area shape="rect" coords="488,136,522,172" target="["	 />
+        <area shape="rect" coords="529,135,565,173" target="]"	 />
+        <area shape="rect" coords="569,136,620,172" target="#"	 />
+        <area shape="rect" coords="462,177,498,214" target=";"	 />
+        <area shape="rect" coords="503,178,539,214" target="’"	 />
+        <area shape="rect" coords="405,220,440,256" target=","	 />
+        <area shape="rect" coords="447,220,483,256" target="."	 />
+        <area shape="rect" coords="487,220,524,256" target="/"	 />
+      </map>
+    </layout>
+    <event name="esc" type="key" code="27" ascii="27" modifiers="" />
+    <event name="f1" type="key" code="282" ascii="315" modifiers="" />
+    <event name="f2" type="key" code="283" ascii="316" modifiers="" />
+    <event name="f3" type="key" code="284" ascii="317" modifiers="" />
+    <event name="f4" type="key" code="285" ascii="318" modifiers="" />
+    <event name="f5" type="key" code="286" ascii="319" modifiers="" />
+    <event name="f6" type="key" code="287" ascii="320" modifiers="" />
+    <event name="f7" type="key" code="288" ascii="321" modifiers="" />
+    <event name="f8" type="key" code="289" ascii="322" modifiers="" />
+    <event name="f9" type="key" code="290" ascii="323" modifiers="" />
+    <event name="f10" type="key" code="291" ascii="324" modifiers="" />
+    <event name="f11" type="key" code="292" ascii="325" modifiers="" />
+    <event name="f12" type="key" code="293" ascii="326" modifiers="" />
+    <event name="del" type="key" code="127" ascii="0" modifiers="" />
+    <event name="ctrl" type="modifier" modifiers="ctrl" />
+    <event name="alt" type="modifier" modifiers="alt" />
+    <event name="shift" type="modifier" modifiers="shift" />
+    <event name="caps" type="switch_mode" mode="lowercase" />
+    <event name="symbols" type="switch_mode" mode="uppercasesymbols" />
+    <event name="backspace" type="key" code="8" ascii="8" modifiers="" />
+    <event name="enter" type="key" code="13" ascii="13" modifiers="" />
+    <event name="|" type="key" code="124" ascii="124" modifiers="" />
+    <event name="-" type="key" code="45" ascii="45" modifiers="" />
+    <event name="=" type="key" code="61" ascii="61" modifiers="" />
+    <event name="[" type="key" code="91" ascii="91" modifiers="" />
+    <event name="]" type="key" code="93" ascii="93" modifiers="" />
+    <event name="#" type="key" code="35" ascii="35" modifiers="" />
+    <event name=";" type="key" code="59" ascii="59" modifiers="" />
+    <event name="'" type="key" code="39" ascii="39" modifiers="" />
+    <event name="," type="key" code="44" ascii="44" modifiers="" />
+    <event name="." type="key" code="46" ascii="46" modifiers="" />
+    <event name="/" type="key" code="47" ascii="47" modifiers="" />
+    <event name="space" type="key" code="32" ascii="32" modifiers="" />
+    <event name="tab" type="key" code="9" ascii="9" modifiers="" />
+    <event name="A" type="key" code="97" ascii="65" modifiers="shift" />
+    <event name="B" type="key" code="98" ascii="66" modifiers="shift" />
+    <event name="C" type="key" code="99" ascii="67" modifiers="shift" />
+    <event name="D" type="key" code="100" ascii="68" modifiers="shift" />
+    <event name="E" type="key" code="101" ascii="69" modifiers="shift" />
+    <event name="F" type="key" code="102" ascii="70" modifiers="shift" />
+    <event name="G" type="key" code="103" ascii="71" modifiers="shift" />
+    <event name="H" type="key" code="104" ascii="72" modifiers="shift" />
+    <event name="I" type="key" code="105" ascii="73" modifiers="shift" />
+    <event name="J" type="key" code="106" ascii="74" modifiers="shift" />
+    <event name="K" type="key" code="107" ascii="75" modifiers="shift" />
+    <event name="L" type="key" code="108" ascii="76" modifiers="shift" />
+    <event name="M" type="key" code="109" ascii="77" modifiers="shift" />
+    <event name="N" type="key" code="110" ascii="78" modifiers="shift" />
+    <event name="O" type="key" code="111" ascii="79" modifiers="shift" />
+    <event name="P" type="key" code="112" ascii="80" modifiers="shift" />
+    <event name="Q" type="key" code="113" ascii="81" modifiers="shift" />
+    <event name="R" type="key" code="114" ascii="82" modifiers="shift" />
+    <event name="S" type="key" code="115" ascii="83" modifiers="shift" />
+    <event name="T" type="key" code="116" ascii="84" modifiers="shift" />
+    <event name="U" type="key" code="117" ascii="85" modifiers="shift" />
+    <event name="V" type="key" code="118" ascii="86" modifiers="shift" />
+    <event name="W" type="key" code="119" ascii="87" modifiers="shift" />
+    <event name="X" type="key" code="120" ascii="88" modifiers="shift" />
+    <event name="Y" type="key" code="121" ascii="89" modifiers="shift" />
+    <event name="Z" type="key" code="122" ascii="90" modifiers="shift" />
+    <event name="0" type="key" code="48" ascii="48" modifiers="" />
+    <event name="1" type="key" code="49" ascii="49" modifiers="" />
+    <event name="2" type="key" code="50" ascii="50" modifiers="" />
+    <event name="3" type="key" code="51" ascii="51" modifiers="" />
+    <event name="4" type="key" code="52" ascii="52" modifiers="" />
+    <event name="5" type="key" code="53" ascii="53" modifiers="" />
+    <event name="6" type="key" code="54" ascii="54" modifiers="" />
+    <event name="7" type="key" code="55" ascii="55" modifiers="" />
+    <event name="8" type="key" code="56" ascii="56" modifiers="" />
+    <event name="9" type="key" code="57" ascii="57" modifiers="" />
+    <event name="quit" type="submit" />
+  </mode>
+
+  <!-- Lowercase Symbols -->
+  <mode name="lowercasesymbols" resolutions="320x240,640x480">
+    <layout resolution="320x240" bitmap="lowercase-symbols320x240.bmp" transparent_color="255,0,255">
+      <map>
+        <area shape="rect" coords="13,8,306,20" target="display_area" />
+        <area shape="rect" coords="9,26,25,42" target="esc" />
+        <area shape="rect" coords="50,25,67,43" target="f2" />
+        <area shape="rect" coords="29,24,46,43" target="f1" />
+        <area shape="rect" coords="71,26,88,44" target="f3" />
+        <area shape="rect" coords="90,25,107,43" target="f4" />
+        <area shape="rect" coords="111,26,128,44" target="f5" />
+        <area shape="rect" coords="132,26,149,44" target="f6" />
+        <area shape="rect" coords="153,25,170,44" target="f7" />
+        <area shape="rect" coords="173,26,190,44" target="f8" />
+        <area shape="rect" coords="194,24,211,43" target="f9" />
+        <area shape="rect" coords="215,26,231,44" target="f10" />
+        <area shape="rect" coords="235,26,253,43" target="f11" />
+        <area shape="rect" coords="255,26,272,45" target="f12" />
+        <area shape="rect" coords="276,27,310,43" target="del" />
+        <area shape="rect" coords="8,47,26,64" target="¬" />
+        <area shape="rect" coords="28,47,45,64" target="!" />
+        <area shape="rect" coords="50,47,67,65" target="quote" />
+        <area shape="rect" coords="70,46,87,65" target="£" />
+        <area shape="rect" coords="91,46,108,64" target="$" />
+        <area shape="rect" coords="111,46,129,65" target="%" />
+        <area shape="rect" coords="132,47,149,65" target="^" />
+        <area shape="rect" coords="152,47,170,64" target="&amp;" />
+        <area shape="rect" coords="174,46,191,63" target="*" />
+        <area shape="rect" coords="194,47,211,65" target="(" />
+        <area shape="rect" coords="215,46,232,64" target=")" />
+        <area shape="rect" coords="235,47,252,65" target="_" />
+        <area shape="rect" coords="255,46,272,65" target="+" />
+        <area shape="rect" coords="276,47,308,64" target="backspace" />
+        <area shape="rect" coords="8,68,32,85" target="tab" />
+        <area shape="rect" coords="36,68,53,85" target="q" />
+        <area shape="rect" coords="57,68,75,86" target="w" />
+        <area shape="rect" coords="78,67,94,85" target="e" />
+        <area shape="rect" coords="98,67,115,85" target="r" />
+        <area shape="rect" coords="119,67,136,85" target="t" />
+        <area shape="rect" coords="141,68,158,86" target="y" />
+        <area shape="rect" coords="161,67,179,86" target="u" />
+        <area shape="rect" coords="182,67,199,86" target="i" />
+        <area shape="rect" coords="202,67,220,85" target="o" />
+        <area shape="rect" coords="223,68,240,86" target="p" />
+        <area shape="rect" coords="244,68,261,86" target="{" />
+        <area shape="rect" coords="264,67,282,86" target="}" />
+        <area shape="rect" coords="284,68,309,86" target="~" />
+        <area shape="rect" coords="8,89,41,106" target="caps" />
+        <area shape="rect" coords="44,88,63,107" target="a" />
+        <area shape="rect" coords="65,88,84,106" target="s" />
+        <area shape="rect" coords="86,89,104,107" target="d" />
+        <area shape="rect" coords="107,89,124,107" target="f" />
+        <area shape="rect" coords="128,89,145,107" target="g" />
+        <area shape="rect" coords="149,88,165,107" target="h" />
+        <area shape="rect" coords="169,89,186,107" target="j" />
+        <area shape="rect" coords="189,89,207,107" target="k" />
+        <area shape="rect" coords="210,89,228,107" target="l" />
+        <area shape="rect" coords="231,88,249,106" target=":" />
+        <area shape="rect" coords="251,89,269,107" target="@" />
+        <area shape="rect" coords="273,89,311,106" target="enter" />
+        <area shape="rect" coords="9,110,50,127" target="shift" />
+        <area shape="rect" coords="58,110,75,128" target="z" />
+        <area shape="rect" coords="79,110,96,128" target="x" />
+        <area shape="rect" coords="99,109,116,127" target="c" />
+        <area shape="rect" coords="120,110,138,128" target="v" />
+        <area shape="rect" coords="141,109,157,127" target="b" />
+        <area shape="rect" coords="162,110,179,128" target="n" />
+        <area shape="rect" coords="182,110,199,128" target="m" />
+        <area shape="rect" coords="202,110,219,128" target="&lt;" />
+        <area shape="rect" coords="223,110,241,128" target="&gt;" />
+        <area shape="rect" coords="243,110,261,128" target="?" />
+        <area shape="rect" coords="271,109,311,128" target="symbols" />
+        <area shape="rect" coords="9,130,33,148" target="ctrl" />
+        <area shape="rect" coords="38,130,61,147" target="alt" />
+        <area shape="rect" coords="67,130,262,148" target="space" />
+      </map>
+    </layout>
+    <layout resolution="640x480" bitmap="lowercase-symbols640x480.bmp" transparent_color="255,0,255">
+      <map>
+        <area shape="rect" coords="26,23,613,37" target="display_area"	 />
+        <area shape="rect" coords="18,52,51,85" target="esc"   />
+        <area shape="rect" coords="100,51,135,88" target="f2"	/>
+        <area shape="rect" coords="59,49,94,88" target="f1"   />
+        <area shape="rect" coords="142,53,176,89" target="f3"	/>
+        <area shape="rect" coords="181,51,216,87" target="f4"	/>
+        <area shape="rect" coords="223,52,258,88" target="f5"	/>
+        <area shape="rect" coords="265,52,299,89" target="f6"	/>
+        <area shape="rect" coords="306,51,341,90" target="f7"	/>
+        <area shape="rect" coords="347,53,382,89" target="f8"	/>
+        <area shape="rect" coords="389,49,424,88" target="f9"	/>
+        <area shape="rect" coords="431,52,464,89" target="f10"	 />
+        <area shape="rect" coords="470,53,506,88" target="f11"	 />
+        <area shape="rect" coords="511,52,546,90" target="f12"	 />
+        <area shape="rect" coords="552,55,620,87" target="del"	 />
+        <area shape="rect" coords="16,95,53,129" target="¬"   />
+        <area shape="rect" coords="57,95,92,129" target="!"   />
+        <area shape="rect" coords="100,94,134,130" target="quote"	/>
+        <area shape="rect" coords="140,93,174,131" target="£"	/>
+        <area shape="rect" coords="182,93,217,130" target="$"	/>
+        <area shape="rect" coords="222,93,258,132" target="%"	/>
+        <area shape="rect" coords="265,94,299,131" target="^"	/>
+        <area shape="rect" coords="305,94,341,129" target="&amp;"	/>
+        <area shape="rect" coords="348,93,382,128" target="*"	/>
+        <area shape="rect" coords="389,94,423,130" target="("	/>
+        <area shape="rect" coords="431,93,465,130" target=")"	/>
+        <area shape="rect" coords="471,94,505,131" target="_"	/>
+        <area shape="rect" coords="511,93,546,131" target="+"	/>
+        <area shape="rect" coords="553,94,618,129" target="backspace"	/>
+        <area shape="rect" coords="17,136,66,171" target="tab"	 />
+        <area shape="rect" coords="73,137,108,171" target="q"	/>
+        <area shape="rect" coords="114,136,150,172" target="w"	 />
+        <area shape="rect" coords="157,134,189,171" target="e"	 />
+        <area shape="rect" coords="197,135,232,171" target="r"	 />
+        <area shape="rect" coords="239,135,274,172" target="t"	 />
+        <area shape="rect" coords="282,136,317,173" target="y"	 />
+        <area shape="rect" coords="322,135,359,173" target="u"	 />
+        <area shape="rect" coords="364,134,399,172" target="i"	 />
+        <area shape="rect" coords="404,135,440,171" target="o"	 />
+        <area shape="rect" coords="446,136,480,172" target="p"	 />
+        <area shape="rect" coords="488,136,522,172" target="{"	 />
+        <area shape="rect" coords="529,135,565,173" target="}"	 />
+        <area shape="rect" coords="569,136,620,172" target="~"	 />
+        <area shape="rect" coords="17,179,84,213" target="caps"   />
+        <area shape="rect" coords="89,177,127,216" target="a"	/>
+        <area shape="rect" coords="131,177,169,214" target="s"	 />
+        <area shape="rect" coords="173,178,209,215" target="d"	 />
+        <area shape="rect" coords="215,178,250,214" target="f"	 />
+        <area shape="rect" coords="256,178,291,214" target="g"	 />
+        <area shape="rect" coords="299,176,332,214" target="h"	 />
+        <area shape="rect" coords="339,178,374,215" target="j"	 />
+        <area shape="rect" coords="379,178,415,215" target="k"	 />
+        <area shape="rect" coords="421,178,457,215" target="l"	 />
+        <area shape="rect" coords="462,177,498,214" target=":"	 />
+        <area shape="rect" coords="503,178,539,214" target="@"	 />
+        <area shape="rect" coords="546,179,622,214" target="enter"	 />
+        <area shape="rect" coords="19,221,101,256" target="shift"	/>
+        <area shape="rect" coords="117,220,152,256" target="z"	 />
+        <area shape="rect" coords="158,220,192,256" target="x"	 />
+        <area shape="rect" coords="198,219,233,256" target="c"	 />
+        <area shape="rect" coords="240,220,276,257" target="v"	 />
+        <area shape="rect" coords="283,219,316,255" target="b"	 />
+        <area shape="rect" coords="324,220,359,256" target="n"	 />
+        <area shape="rect" coords="365,220,399,257" target="m"	 />
+        <area shape="rect" coords="405,220,440,256" target="&lt;"	 />
+        <area shape="rect" coords="447,220,483,256" target="&gt;"	 />
+        <area shape="rect" coords="487,220,524,256" target="?"	 />
+        <area shape="rect" coords="542,219,623,257" target="symbols"   />
+        <area shape="rect" coords="19,260,68,296" target="ctrl"   />
+        <area shape="rect" coords="76,261,123,295" target="alt"   />
+        <area shape="rect" coords="135,261,525,297" target="space"	 />
+      </map>
+    </layout>
+    <event name="esc" type="key" code="27" ascii="27" modifiers="" />
+    <event name="f1" type="key" code="282" ascii="315" modifiers="" />
+    <event name="f2" type="key" code="283" ascii="316" modifiers="" />
+    <event name="f3" type="key" code="284" ascii="317" modifiers="" />
+    <event name="f4" type="key" code="285" ascii="318" modifiers="" />
+    <event name="f5" type="key" code="286" ascii="319" modifiers="" />
+    <event name="f6" type="key" code="287" ascii="320" modifiers="" />
+    <event name="f7" type="key" code="288" ascii="321" modifiers="" />
+    <event name="f8" type="key" code="289" ascii="322" modifiers="" />
+    <event name="f9" type="key" code="290" ascii="323" modifiers="" />
+    <event name="f10" type="key" code="291" ascii="324" modifiers="" />
+    <event name="f11" type="key" code="292" ascii="325" modifiers="" />
+    <event name="f12" type="key" code="293" ascii="326" modifiers="" />
+    <event name="del" type="key" code="127" ascii="0" modifiers="" />
+    <event name="ctrl" type="modifier" modifiers="ctrl" />
+    <event name="alt" type="modifier" modifiers="alt" />
+    <event name="shift" type="modifier" modifiers="shift" />
+    <event name="symbols" type="switch_mode" mode="lowercase" />
+    <event name="caps" type="switch_mode" mode="uppercasesymbols" />
+    <event name="backspace" type="key" code="8" ascii="8" modifiers="" />
+    <event name="enter" type="key" code="13" ascii="13" modifiers="" />
+    <event name="quote" type="key" code="34" ascii="34" modifiers="" />
+    <event name="£" type="key" code="163" ascii="163" modifiers="" />
+    <event name="$" type="key" code="36" ascii="36" modifiers="" />
+    <event name="%" type="key" code="37" ascii="37" modifiers="" />
+    <event name="^" type="key" code="94" ascii="94" modifiers="" />
+    <event name="&amp;" type="key" code="38" ascii="38" modifiers="" />
+    <event name="*" type="key" code="42" ascii="42" modifiers="" />
+    <event name="(" type="key" code="40" ascii="40" modifiers="" />
+    <event name=")" type="key" code="41" ascii="41" modifiers="" />
+    <event name="_" type="key" code="95" ascii="95" modifiers="" />
+    <event name="+" type="key" code="43" ascii="43" modifiers="" />
+    <event name="¬" type="key" code="172" ascii="172" modifiers="" />
+    <event name="!" type="key" code="33" ascii="33" modifiers="" />
+    <event name="{" type="key" code="123" ascii="123" modifiers="" />
+    <event name="}" type="key" code="125" ascii="125" modifiers="" />
+    <event name="~" type="key" code="126" ascii="126" modifiers="" />
+    <event name=":" type="key" code="58" ascii="58" modifiers="" />
+    <event name="@" type="key" code="64" ascii="64" modifiers="" />
+    <event name="&lt;" type="key" code="60" ascii="60" modifiers="" />
+    <event name="&gt;" type="key" code="62" ascii="62" modifiers="" />
+    <event name="?" type="key" code="63" ascii="63" modifiers="" />
+    <event name="space" type="key" code="32" ascii="32" modifiers="" />
+    <event name="tab" type="key" code="9" ascii="9" modifiers="" />
+    <event name="a" type="key" code="97" ascii="97" modifiers="" />
+    <event name="b" type="key" code="98" ascii="98" modifiers="" />
+    <event name="c" type="key" code="99" ascii="99" modifiers="" />
+    <event name="d" type="key" code="100" ascii="100" modifiers="" />
+    <event name="e" type="key" code="101" ascii="101" modifiers="" />
+    <event name="f" type="key" code="102" ascii="102" modifiers="" />
+    <event name="g" type="key" code="103" ascii="103" modifiers="" />
+    <event name="h" type="key" code="104" ascii="104" modifiers="" />
+    <event name="i" type="key" code="105" ascii="105" modifiers="" />
+    <event name="j" type="key" code="106" ascii="106" modifiers="" />
+    <event name="k" type="key" code="107" ascii="107" modifiers="" />
+    <event name="l" type="key" code="108" ascii="108" modifiers="" />
+    <event name="m" type="key" code="109" ascii="109" modifiers="" />
+    <event name="n" type="key" code="110" ascii="110" modifiers="" />
+    <event name="o" type="key" code="111" ascii="111" modifiers="" />
+    <event name="p" type="key" code="112" ascii="112" modifiers="" />
+    <event name="q" type="key" code="113" ascii="113" modifiers="" />
+    <event name="r" type="key" code="114" ascii="114" modifiers="" />
+    <event name="s" type="key" code="115" ascii="115" modifiers="" />
+    <event name="t" type="key" code="116" ascii="116" modifiers="" />
+    <event name="u" type="key" code="117" ascii="117" modifiers="" />
+    <event name="v" type="key" code="118" ascii="118" modifiers="" />
+    <event name="w" type="key" code="119" ascii="119" modifiers="" />
+    <event name="x" type="key" code="120" ascii="120" modifiers="" />
+    <event name="y" type="key" code="121" ascii="121" modifiers="" />
+    <event name="z" type="key" code="122" ascii="122" modifiers="" />
+    <event name="quit" type="submit" />
+  </mode>
+
+  <!-- Uppercase Symbols -->
+  <mode name="uppercasesymbols" resolutions="320x240,640x480">
+    <layout resolution="320x240" bitmap="uppercase-symbols320x240.bmp" transparent_color="255,0,255">
+      <map>
+        <area shape="rect" coords="13,8,306,20" target="display_area" />
+        <area shape="rect" coords="9,26,25,42" target="esc" />
+        <area shape="rect" coords="50,25,67,43" target="f2" />
+        <area shape="rect" coords="29,24,46,43" target="f1" />
+        <area shape="rect" coords="71,26,88,44" target="f3" />
+        <area shape="rect" coords="90,25,107,43" target="f4" />
+        <area shape="rect" coords="111,26,128,44" target="f5" />
+        <area shape="rect" coords="132,26,149,44" target="f6" />
+        <area shape="rect" coords="153,25,170,44" target="f7" />
+        <area shape="rect" coords="173,26,190,44" target="f8" />
+        <area shape="rect" coords="194,24,211,43" target="f9" />
+        <area shape="rect" coords="215,26,231,44" target="f10" />
+        <area shape="rect" coords="235,26,253,43" target="f11" />
+        <area shape="rect" coords="255,26,272,45" target="f12" />
+        <area shape="rect" coords="276,27,310,43" target="del" />
+        <area shape="rect" coords="8,47,26,64" target="¬" />
+        <area shape="rect" coords="28,47,45,64" target="!" />
+        <area shape="rect" coords="50,47,67,65" target="quote" />
+        <area shape="rect" coords="70,46,87,65" target="£" />
+        <area shape="rect" coords="91,46,108,64" target="$" />
+        <area shape="rect" coords="111,46,129,65" target="%" />
+        <area shape="rect" coords="132,47,149,65" target="^" />
+        <area shape="rect" coords="152,47,170,64" target="&amp;" />
+        <area shape="rect" coords="174,46,191,63" target="*" />
+        <area shape="rect" coords="194,47,211,65" target="(" />
+        <area shape="rect" coords="215,46,232,64" target=")" />
+        <area shape="rect" coords="235,47,252,65" target="_" />
+        <area shape="rect" coords="255,46,272,65" target="+" />
+        <area shape="rect" coords="276,47,308,64" target="backspace" />
+        <area shape="rect" coords="8,68,32,85" target="tab" />
+        <area shape="rect" coords="36,68,53,85" target="Q" />
+        <area shape="rect" coords="57,68,75,86" target="W" />
+        <area shape="rect" coords="78,67,94,85" target="E" />
+        <area shape="rect" coords="98,67,115,85" target="R" />
+        <area shape="rect" coords="119,67,136,85" target="T" />
+        <area shape="rect" coords="141,68,158,86" target="Y" />
+        <area shape="rect" coords="161,67,179,86" target="U" />
+        <area shape="rect" coords="182,67,199,86" target="I" />
+        <area shape="rect" coords="202,67,220,85" target="O" />
+        <area shape="rect" coords="223,68,240,86" target="P" />
+        <area shape="rect" coords="244,68,261,86" target="{" />
+        <area shape="rect" coords="264,67,282,86" target="}" />
+        <area shape="rect" coords="284,68,309,86" target="~" />
+        <area shape="rect" coords="8,89,41,106" target="caps" />
+        <area shape="rect" coords="44,88,63,107" target="A" />
+        <area shape="rect" coords="65,88,84,106" target="S" />
+        <area shape="rect" coords="86,89,104,107" target="D" />
+        <area shape="rect" coords="107,89,124,107" target="F" />
+        <area shape="rect" coords="128,89,145,107" target="G" />
+        <area shape="rect" coords="149,88,165,107" target="H" />
+        <area shape="rect" coords="169,89,186,107" target="J" />
+        <area shape="rect" coords="189,89,207,107" target="K" />
+        <area shape="rect" coords="210,89,228,107" target="L" />
+        <area shape="rect" coords="231,88,249,106" target=":" />
+        <area shape="rect" coords="251,89,269,107" target="@" />
+        <area shape="rect" coords="273,89,311,106" target="enter" />
+        <area shape="rect" coords="9,110,50,127" target="shift" />
+        <area shape="rect" coords="58,110,75,128" target="z" />
+        <area shape="rect" coords="79,110,96,128" target="x" />
+        <area shape="rect" coords="99,109,116,127" target="c" />
+        <area shape="rect" coords="120,110,138,128" target="v" />
+        <area shape="rect" coords="141,109,157,127" target="b" />
+        <area shape="rect" coords="162,110,179,128" target="n" />
+        <area shape="rect" coords="182,110,199,128" target="m" />
+        <area shape="rect" coords="202,110,219,128" target="&lt;" />
+        <area shape="rect" coords="223,110,241,128" target="&gt;" />
+        <area shape="rect" coords="243,110,261,128" target="?" />
+        <area shape="rect" coords="271,109,311,128" target="symbols" />
+        <area shape="rect" coords="9,130,33,148" target="ctrl" />
+        <area shape="rect" coords="38,130,61,147" target="alt" />
+        <area shape="rect" coords="67,130,262,148" target="space" />
+      </map>
+    </layout>
+    <layout resolution="640x480" bitmap="uppercase-symbols640x480.bmp" transparent_color="255,0,255">
+      <map>
+        <area shape="rect" coords="26,23,613,37" target="display_area"	 />
+        <area shape="rect" coords="18,52,51,85" target="esc"   />
+        <area shape="rect" coords="100,51,135,88" target="f2"	/>
+        <area shape="rect" coords="59,49,94,88" target="f1"   />
+        <area shape="rect" coords="142,53,176,89" target="f3"	/>
+        <area shape="rect" coords="181,51,216,87" target="f4"	/>
+        <area shape="rect" coords="223,52,258,88" target="f5"	/>
+        <area shape="rect" coords="265,52,299,89" target="f6"	/>
+        <area shape="rect" coords="306,51,341,90" target="f7"	/>
+        <area shape="rect" coords="347,53,382,89" target="f8"	/>
+        <area shape="rect" coords="389,49,424,88" target="f9"	/>
+        <area shape="rect" coords="431,52,464,89" target="f10"	 />
+        <area shape="rect" coords="470,53,506,88" target="f11"	 />
+        <area shape="rect" coords="511,52,546,90" target="f12"	 />
+        <area shape="rect" coords="552,55,620,87" target="del"	 />
+        <area shape="rect" coords="16,95,53,129" target="¬"   />
+        <area shape="rect" coords="57,95,92,129" target="!"   />
+        <area shape="rect" coords="100,94,134,130" target="quote"	/>
+        <area shape="rect" coords="140,93,174,131" target="£"	/>
+        <area shape="rect" coords="182,93,217,130" target="$"	/>
+        <area shape="rect" coords="222,93,258,132" target="%"	/>
+        <area shape="rect" coords="265,94,299,131" target="^"	/>
+        <area shape="rect" coords="305,94,341,129" target="&amp;"	/>
+        <area shape="rect" coords="348,93,382,128" target="*"	/>
+        <area shape="rect" coords="389,94,423,130" target="("	/>
+        <area shape="rect" coords="431,93,465,130" target=")"	/>
+        <area shape="rect" coords="471,94,505,131" target="_"	/>
+        <area shape="rect" coords="511,93,546,131" target="+"	/>
+        <area shape="rect" coords="553,94,618,129" target="backspace"	/>
+        <area shape="rect" coords="17,136,66,171" target="tab"	 />
+        <area shape="rect" coords="73,137,108,171" target="Q"	/>
+        <area shape="rect" coords="114,136,150,172" target="W"	 />
+        <area shape="rect" coords="157,134,189,171" target="E"	 />
+        <area shape="rect" coords="197,135,232,171" target="R"	 />
+        <area shape="rect" coords="239,135,274,172" target="T"	 />
+        <area shape="rect" coords="282,136,317,173" target="Y"	 />
+        <area shape="rect" coords="322,135,359,173" target="U"	 />
+        <area shape="rect" coords="364,134,399,172" target="I"	 />
+        <area shape="rect" coords="404,135,440,171" target="O"	 />
+        <area shape="rect" coords="446,136,480,172" target="P"	 />
+        <area shape="rect" coords="488,136,522,172" target="{"	 />
+        <area shape="rect" coords="529,135,565,173" target="}"	 />
+        <area shape="rect" coords="569,136,620,172" target="~"	 />
+        <area shape="rect" coords="17,179,84,213" target="caps"   />
+        <area shape="rect" coords="89,177,127,216" target="A"	/>
+        <area shape="rect" coords="131,177,169,214" target="S"	 />
+        <area shape="rect" coords="173,178,209,215" target="D"	 />
+        <area shape="rect" coords="215,178,250,214" target="F"	 />
+        <area shape="rect" coords="256,178,291,214" target="G"	 />
+        <area shape="rect" coords="299,176,332,214" target="H"	 />
+        <area shape="rect" coords="339,178,374,215" target="J"	 />
+        <area shape="rect" coords="379,178,415,215" target="K"	 />
+        <area shape="rect" coords="421,178,457,215" target="L"	 />
+        <area shape="rect" coords="462,177,498,214" target=":"	 />
+        <area shape="rect" coords="503,178,539,214" target="@"	 />
+        <area shape="rect" coords="546,179,622,214" target="enter"	 />
+        <area shape="rect" coords="19,221,101,256" target="shift"	/>
+        <area shape="rect" coords="117,220,152,256" target="z"	 />
+        <area shape="rect" coords="158,220,192,256" target="x"	 />
+        <area shape="rect" coords="198,219,233,256" target="c"	 />
+        <area shape="rect" coords="240,220,276,257" target="v"	 />
+        <area shape="rect" coords="283,219,316,255" target="b"	 />
+        <area shape="rect" coords="324,220,359,256" target="n"	 />
+        <area shape="rect" coords="365,220,399,257" target="m"	 />
+        <area shape="rect" coords="405,220,440,256" target="&lt;"	 />
+        <area shape="rect" coords="447,220,483,256" target="&gt;"	 />
+        <area shape="rect" coords="487,220,524,256" target="?"	 />
+        <area shape="rect" coords="542,219,623,257" target="symbols"   />
+        <area shape="rect" coords="19,260,68,296" target="ctrl"   />
+        <area shape="rect" coords="76,261,123,295" target="alt"   />
+        <area shape="rect" coords="135,261,525,297" target="space"	 />
+      </map>
+    </layout>
+    <event name="esc" type="key" code="27" ascii="27" modifiers="" />
+    <event name="f1" type="key" code="282" ascii="315" modifiers="" />
+    <event name="f2" type="key" code="283" ascii="316" modifiers="" />
+    <event name="f3" type="key" code="284" ascii="317" modifiers="" />
+    <event name="f4" type="key" code="285" ascii="318" modifiers="" />
+    <event name="f5" type="key" code="286" ascii="319" modifiers="" />
+    <event name="f6" type="key" code="287" ascii="320" modifiers="" />
+    <event name="f7" type="key" code="288" ascii="321" modifiers="" />
+    <event name="f8" type="key" code="289" ascii="322" modifiers="" />
+    <event name="f9" type="key" code="290" ascii="323" modifiers="" />
+    <event name="f10" type="key" code="291" ascii="324" modifiers="" />
+    <event name="f11" type="key" code="292" ascii="325" modifiers="" />
+    <event name="f12" type="key" code="293" ascii="326" modifiers="" />
+    <event name="del" type="key" code="127" ascii="0" modifiers="" />
+    <event name="ctrl" type="modifier" modifiers="ctrl" />
+    <event name="alt" type="modifier" modifiers="alt" />
+    <event name="shift" type="switch_mode" mode="shiftlowercase" />
+    <event name="caps" type="switch_mode" mode="lowercasesymbols" />
+    <event name="symbols" type="switch_mode" mode="uppercase" />
+    <event name="backspace" type="key" code="8" ascii="8" modifiers="" />
+    <event name="enter" type="key" code="13" ascii="13" modifiers="" />
+    <event name="quote" type="key" code="34" ascii="34" modifiers="" />
+    <event name="£" type="key" code="163" ascii="163" modifiers="" />
+    <event name="$" type="key" code="36" ascii="36" modifiers="" />
+    <event name="%" type="key" code="37" ascii="37" modifiers="" />
+    <event name="^" type="key" code="94" ascii="94" modifiers="" />
+    <event name="&amp;" type="key" code="38" ascii="38" modifiers="" />
+    <event name="*" type="key" code="42" ascii="42" modifiers="" />
+    <event name="(" type="key" code="40" ascii="40" modifiers="" />
+    <event name=")" type="key" code="41" ascii="41" modifiers="" />
+    <event name="_" type="key" code="95" ascii="95" modifiers="" />
+    <event name="+" type="key" code="43" ascii="43" modifiers="" />
+    <event name="¬" type="key" code="172" ascii="172" modifiers="" />
+    <event name="!" type="key" code="33" ascii="33" modifiers="" />
+    <event name="{" type="key" code="123" ascii="123" modifiers="" />
+    <event name="}" type="key" code="125" ascii="125" modifiers="" />
+    <event name="~" type="key" code="126" ascii="126" modifiers="" />
+    <event name=":" type="key" code="58" ascii="58" modifiers="" />
+    <event name="@" type="key" code="64" ascii="64" modifiers="" />
+    <event name="&lt;" type="key" code="60" ascii="60" modifiers="" />
+    <event name="&gt;" type="key" code="62" ascii="62" modifiers="" />
+    <event name="?" type="key" code="63" ascii="63" modifiers="" />
+    <event name="space" type="key" code="32" ascii="32" modifiers="" />
+    <event name="tab" type="key" code="9" ascii="9" modifiers="" />
+    <event name="A" type="key" code="97" ascii="65" modifiers="shift" />
+    <event name="B" type="key" code="98" ascii="66" modifiers="shift" />
+    <event name="C" type="key" code="99" ascii="67" modifiers="shift" />
+    <event name="D" type="key" code="100" ascii="68" modifiers="shift" />
+    <event name="E" type="key" code="101" ascii="69" modifiers="shift" />
+    <event name="F" type="key" code="102" ascii="70" modifiers="shift" />
+    <event name="G" type="key" code="103" ascii="71" modifiers="shift" />
+    <event name="H" type="key" code="104" ascii="72" modifiers="shift" />
+    <event name="I" type="key" code="105" ascii="73" modifiers="shift" />
+    <event name="J" type="key" code="106" ascii="74" modifiers="shift" />
+    <event name="K" type="key" code="107" ascii="75" modifiers="shift" />
+    <event name="L" type="key" code="108" ascii="76" modifiers="shift" />
+    <event name="M" type="key" code="109" ascii="77" modifiers="shift" />
+    <event name="N" type="key" code="110" ascii="78" modifiers="shift" />
+    <event name="O" type="key" code="111" ascii="79" modifiers="shift" />
+    <event name="P" type="key" code="112" ascii="80" modifiers="shift" />
+    <event name="Q" type="key" code="113" ascii="81" modifiers="shift" />
+    <event name="R" type="key" code="114" ascii="82" modifiers="shift" />
+    <event name="S" type="key" code="115" ascii="83" modifiers="shift" />
+    <event name="T" type="key" code="116" ascii="84" modifiers="shift" />
+    <event name="U" type="key" code="117" ascii="85" modifiers="shift" />
+    <event name="V" type="key" code="118" ascii="86" modifiers="shift" />
+    <event name="W" type="key" code="119" ascii="87" modifiers="shift" />
+    <event name="X" type="key" code="120" ascii="88" modifiers="shift" />
+    <event name="Y" type="key" code="121" ascii="89" modifiers="shift" />
+    <event name="Z" type="key" code="122" ascii="90" modifiers="shift" />
+    <event name="0" type="key" code="48" ascii="48" modifiers="" />
+    <event name="1" type="key" code="49" ascii="49" modifiers="" />
+    <event name="2" type="key" code="50" ascii="50" modifiers="" />
+    <event name="3" type="key" code="51" ascii="51" modifiers="" />
+    <event name="4" type="key" code="52" ascii="52" modifiers="" />
+    <event name="5" type="key" code="53" ascii="53" modifiers="" />
+    <event name="6" type="key" code="54" ascii="54" modifiers="" />
+    <event name="7" type="key" code="55" ascii="55" modifiers="" />
+    <event name="8" type="key" code="56" ascii="56" modifiers="" />
+    <event name="9" type="key" code="57" ascii="57" modifiers="" />
+    <event name="quit" type="submit" />
+  </mode>
+
+</keyboard>
diff --git a/backends/vkeybd/packs/vkeybdpack.py b/backends/vkeybd/packs/vkeybdpack.py
new file mode 100755
index 0000000000..130e4b737b
--- /dev/null
+++ b/backends/vkeybd/packs/vkeybdpack.py
@@ -0,0 +1,63 @@
+#!/usr/bin/env python
+# encoding: utf-8
+import sys
+import re
+import os
+import zipfile
+try:
+    import zlib
+    compression = zipfile.ZIP_DEFLATED
+except:
+    compression = zipfile.ZIP_STORED
+
+PACK_FILE_EXTENSIONS = ('.xml', '.bmp')
+
+def buildPack(packName):
+	if not os.path.isdir(packName):
+		print ("Invalid pack name: " + packName)
+		return
+	
+	zf = zipfile.ZipFile(packName + ".zip", 'w')
+	
+	zf.compress_type = zipfile.ZIP_DEFLATED
+
+	print ("Building '" + packName + "' pack:")
+	os.chdir(packName)
+
+	for filename in os.listdir('.'):
+		if os.path.isfile(filename) and not filename[0] == '.' and filename.endswith(PACK_FILE_EXTENSIONS):
+			zf.write(filename, './' + filename, compress_type=compression)
+			print ("    Adding file: " + filename)
+			
+	os.chdir('../')
+	
+	zf.close()
+
+def buildAllPacks():
+	for f in os.listdir('.'):
+		if os.path.isdir(os.path.join('.', f)) and not f[0] == '.':
+			buildPack(f)
+
+def printUsage():
+	print ("===============================================")
+	print ("ScummVM Virtual Keyboard Pack Generation Script")
+	print ("===============================================")
+	print ("Usage:")
+	print ("vkeybdpack.py makeall")
+	print ("    Builds all the available pack.\n")
+	print ("vkeybdpack.py make [packname]")
+	print ("    Builds the pack called 'packname'.\n")
+
+def main():
+		
+	if len(sys.argv) == 2 and sys.argv[1] == "makeall":
+		buildAllPacks()
+		
+	elif len(sys.argv) == 3 and sys.argv[1] == "make":
+		buildPack(sys.argv[2])
+		
+	else:
+		printUsage()
+
+if __name__ == "__main__":
+	sys.exit(main())
diff --git a/backends/vkeybd/virtual-keyboard-gui.cpp b/backends/vkeybd/virtual-keyboard-gui.cpp
index 54b9b3d43d..e1c076ad24 100644
--- a/backends/vkeybd/virtual-keyboard-gui.cpp
+++ b/backends/vkeybd/virtual-keyboard-gui.cpp
@@ -117,8 +117,12 @@ void VirtualKeyboardGUI::setupDisplayArea(Rect& r, OverlayColor forecolor) {
 	if (!fontIsSuitable(_dispFont, r)) {
 		_dispFont = FontMan.getFontByUsage(Graphics::FontManager::kGUIFont);
 		if (!fontIsSuitable(_dispFont, r)) {
-			_displayEnabled = false;
-			return;
+			/* FIXME: We 'ab'use the kConsoleFont to get a font that fits in a small display_area on 320*240 keyboard images */
+			_dispFont = FontMan.getFontByUsage(Graphics::FontManager::kConsoleFont);
+			if (!fontIsSuitable(_dispFont, r)) {
+				_displayEnabled = false;
+				return;
+			}
 		}
 	}
 	_dispX = _kbdBound.left + r.left;
diff --git a/backends/vkeybd/virtual-keyboard-parser.cpp b/backends/vkeybd/virtual-keyboard-parser.cpp
index 3e40ffc1fa..5ae53f08ec 100644
--- a/backends/vkeybd/virtual-keyboard-parser.cpp
+++ b/backends/vkeybd/virtual-keyboard-parser.cpp
@@ -87,7 +87,7 @@ bool VirtualKeyboardParser::parserCallback_keyboard(ParserNode *node) {
 	}
 
 	if (node->values.contains("v_align")) {
-		String v = node->values["h_align"];
+		String v = node->values["v_align"];
 		if (v.equalsIgnoreCase("top"))
 			_keyboard->_vAlignment = VirtualKeyboard::kAlignTop;
 		else if (v.equalsIgnoreCase("middle") || v.equalsIgnoreCase("center"))
diff --git a/backends/vkeybd/virtual-keyboard.cpp b/backends/vkeybd/virtual-keyboard.cpp
index a95b79d213..4ca4a5f586 100644
--- a/backends/vkeybd/virtual-keyboard.cpp
+++ b/backends/vkeybd/virtual-keyboard.cpp
@@ -31,7 +31,6 @@
 #include "backends/vkeybd/virtual-keyboard-parser.h"
 #include "backends/vkeybd/keycode-descriptions.h"
 #include "common/config-manager.h"
-#include "common/fs.h"
 #include "common/unzip.h"
 
 #define KEY_START_CHAR ('[')
@@ -77,51 +76,77 @@ void VirtualKeyboard::reset() {
 	_kbdGUI->reset();
 }
 
-bool VirtualKeyboard::loadKeyboardPack(String packName) {
-	_kbdGUI->initSize(_system->getOverlayWidth(), _system->getOverlayHeight());
-
-	delete _fileArchive;
-	_fileArchive = 0;
-
-	FSNode vkDir;
-	if (ConfMan.hasKey("vkeybdpath"))
-		vkDir = FSNode(ConfMan.get("vkeybdpath"));
-	else if (ConfMan.hasKey("extrapath"))
-		vkDir = FSNode(ConfMan.get("extrapath"));
-	else // use current directory
-		vkDir = FSNode(".");
-
-	if (vkDir.getChild(packName + ".xml").exists()) {
-		_fileArchive = new FSDirectory(vkDir, 1);
+bool VirtualKeyboard::openPack(const String &packName, const FSNode &node) {
+	if (node.getChild(packName + ".xml").exists()) {
+		_fileArchive = new FSDirectory(node, 1);
 
 		// uncompressed keyboard pack
-		if (!_parser->loadFile(vkDir.getChild(packName + ".xml")))
+		if (!_parser->loadFile(node.getChild(packName + ".xml"))) {
+			delete _fileArchive;
+			_fileArchive = 0;
 			return false;
+		}
+
+		return true;
+	}
 
-	} else if (vkDir.getChild(packName + ".zip").exists()) {
-		// compressed keyboard pack
 #ifdef USE_ZLIB
-		_fileArchive = new ZipArchive(vkDir.getChild(packName + ".zip"));
+	if (node.getChild(packName + ".zip").exists()) {
+		// compressed keyboard pack
+		_fileArchive = new ZipArchive(node.getChild(packName + ".zip"));
 		if (_fileArchive->hasFile(packName + ".xml")) {
-			if (!_parser->loadStream(_fileArchive->createReadStreamForMember(packName + ".xml")))
+			if (!_parser->loadStream(_fileArchive->createReadStreamForMember(packName + ".xml"))) {
+				delete _fileArchive;
+				_fileArchive = 0;
 				return false;
+			}
 		} else {
 			warning("Could not find %s.xml file in %s.zip keyboard pack", packName.c_str(), packName.c_str());
+			delete _fileArchive;
+			_fileArchive = 0;
 			return false;
 		}
-#else
-		return false;
+
+		return true;
+	}
 #endif
+
+	return false;
+}
+
+bool VirtualKeyboard::loadKeyboardPack(const String &packName) {
+	_kbdGUI->initSize(_system->getOverlayWidth(), _system->getOverlayHeight());
+
+	delete _fileArchive;
+	_fileArchive = 0;
+	_loaded = false;
+
+	bool opened = false;
+	if (ConfMan.hasKey("vkeybdpath"))
+		opened = openPack(packName, FSNode(ConfMan.get("vkeybdpath")));
+	else if (ConfMan.hasKey("extrapath"))
+		opened = openPack(packName, FSNode(ConfMan.get("extrapath")));
+
+	// fallback to the current dir
+	if (!opened)
+		opened = openPack(packName, FSNode("."));
+
+	if (opened) {
+		_parser->setParseMode(VirtualKeyboardParser::kParseFull);
+		_loaded = _parser->parse();
+
+		if (_loaded) {
+			printf("Keyboard pack '%s' loaded successfully!\n", packName.c_str());
+		} else {
+			warning("Error parsing the keyboard pack '%s'", packName.c_str());
+
+			delete _fileArchive;
+			_fileArchive = 0;
+		}
 	} else {
 		warning("Keyboard pack not found");
-		return false;
 	}
 
-	_parser->setParseMode(VirtualKeyboardParser::kParseFull);
-	_loaded = _parser->parse();
-	if (_loaded)
-		printf("Keyboard pack '%s' loaded successfully!\n", packName.c_str());
-
 	return _loaded;
 }
 
diff --git a/backends/vkeybd/virtual-keyboard.h b/backends/vkeybd/virtual-keyboard.h
index e3a9cd3600..2c31afcb35 100644
--- a/backends/vkeybd/virtual-keyboard.h
+++ b/backends/vkeybd/virtual-keyboard.h
@@ -37,6 +37,7 @@ class OSystem;
 #include "common/keyboard.h"
 #include "common/list.h"
 #include "common/str.h"
+#include "common/fs.h"
 
 #include "backends/vkeybd/image-map.h"
 #include "graphics/surface.h"
@@ -190,7 +191,7 @@ public:
 	 * searches for a compressed keyboard pack by looking for packName.zip.
 	 * @param packName	name of the keyboard pack
 	 */
-	bool loadKeyboardPack(String packName);
+	bool loadKeyboardPack(const String &packName);
 
 	/**
 	 * Shows the keyboard, starting an event loop that will intercept all
@@ -232,6 +233,7 @@ protected:
 	VirtualKeyboardParser *_parser;
 
 	void reset();
+	bool openPack(const String &packName, const FSNode &node);
 	void deleteEvents();
 	bool checkModeResolutions();
 	void switchMode(Mode *newMode);
diff --git a/backends/vkeybd/vkeybd.zip b/backends/vkeybd/vkeybd.zip
deleted file mode 100644
index 70f84ad0ce..0000000000
--- a/backends/vkeybd/vkeybd.zip
+++ /dev/null
author	Travis Howell	2009-07-04 05:56:10 +0000
committer	Travis Howell	2009-07-04 05:56:10 +0000
commit	4656019e8a2f92f708a685be6d3d95edd7ee8d6d (patch)
tree	1370ceb14c98da5478d85f207ae421dbaff473c8 /backends
parent	6ef485f44896ad778d355bc1201f2f143cc9e770 (diff)
parent	df9570cb3265f4d81ac41d66d949355491e2df7e (diff)
download	scummvm-rg350-4656019e8a2f92f708a685be6d3d95edd7ee8d6d.tar.gz scummvm-rg350-4656019e8a2f92f708a685be6d3d95edd7ee8d6d.tar.bz2 scummvm-rg350-4656019e8a2f92f708a685be6d3d95edd7ee8d6d.zip