Commit Graph
86814 Commits
Author SHA1 Message Date
Filippos Karapetis 3dfb1c3a96 Made sound effect playing code consistent for compressed and uncompressed sounds. MemoryReadStream is used again instead of SeekableSubReadStream, as there will be issues when multiple sound effects or voices are played simultaneously
svn-id: r43466
2009-08-17 11:06:27 +00:00
Johannes Schickel b0a5ec8947 - Add note about that modifing the parent stream will mess up SeekableSubReadStream and SeekableSubReadStreamEndian.
- Link to SubReadStream documentation from SeekableSubReadStream and SeekableSubReadStreamEndian.

svn-id: r43465
2009-08-17 10:48:03 +00:00
Arnaud Boutonné 90336c88ac Add back parenthesis (I wasn't aware of this convention, sorry) in saveload, and mimic this code in oPlaytoons_openItk
svn-id: r43464
2009-08-17 10:05:02 +00:00
Johannes Schickel b8fd79486f Formatting.
svn-id: r43463
2009-08-17 09:57:09 +00:00
Arnaud Boutonné e214755107 Suppress useless parentheses
svn-id: r43462
2009-08-17 09:54:49 +00:00
Arnaud Boutonné f3918d14d6 Added OPCODEDRAW 0x85, with a specific workaround for Bambou hardcoded paths in scripts
svn-id: r43461
2009-08-17 09:50:35 +00:00
Filippos Karapetis 374dccc905 Cleanup
svn-id: r43460
2009-08-17 09:19:53 +00:00
Johannes Schickel 71c9700420 Fix compilation of the SCI engine. It seems that all of the SCI header files I touched (and probably others I luckily didn't touch) seem to assume that files including them will supply needed types. That looks like a major issue in SCI. Someone with knowledge of the SCI code should look into this and cleanup the includes of *all* SCI headers.
svn-id: r43459
2009-08-17 07:36:08 +00:00
Filippos Karapetis c38f58598b - Simplified some functions to accept only the parts of the EngineState they need as parameters, instead of the whole EngineState
- Moved the class table in the Segment manager - it's the only class using it directly
- Removed the sci11 flag from save games (we already know this, we don't need to store it)
- Moved script_get_segment() and get_class_address() inside the segment manager class
- Removed the script_locate_by_segment wrapper
- Simplified script_lookup_export() a lot by removing some paranoia checks
- Added some WIP code for automatically determining the game id in the fallback detector (still not working)
- General cleanup

svn-id: r43458
2009-08-17 05:55:21 +00:00
Travis Howell 445b01676e Merged revisions 43417,43420,43425-43426,43428,43431,43434,43436-43438,43440-43441,43444-43447,43449-43452 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

........
  r43417 | Kirben | 2009-08-16 10:53:55 +1000 (Sun, 16 Aug 2009) | 1 line
  
  Fix overflow in convertFilePath().
........
  r43420 | mthreepwood | 2009-08-16 11:43:18 +1000 (Sun, 16 Aug 2009) | 1 line
  
  Fix using the backspace key on Mac OS X in HE games.
........
  r43425 | lordhoto | 2009-08-16 15:38:03 +1000 (Sun, 16 Aug 2009) | 1 line
  
  Fix options dialog's reflowLayout.
........
  r43426 | lordhoto | 2009-08-16 15:38:16 +1000 (Sun, 16 Aug 2009) | 1 line
  
  Added Ninteno DS specific hack, which takes care of tab button width problems. This actually is not a NDS specific problem, but so far the NDS seems to be the only backend, which has a custom (hardcoded) dialog, which makes problems with our theme layouts. Instead of r43423, which enabled auto width calculaction for tab buttons on all platforms, this commit limits this to the Nintendo DS backend. This takes care of possible layout changes, caused by the changes of the commit. I also added a comment with possible solutions to this problem.
........
  r43428 | lordhoto | 2009-08-16 16:33:34 +1000 (Sun, 16 Aug 2009) | 1 line
  
  Fix valgrind warnings.
........
  r43431 | lordhoto | 2009-08-16 21:28:59 +1000 (Sun, 16 Aug 2009) | 1 line
  
  Fix bug #2838464 "SCUMM: GUI messages misaligned".
........
  r43434 | dreammaster | 2009-08-16 22:03:48 +1000 (Sun, 16 Aug 2009) | 1 line
  
  Added detection entry for the UK 16 colour version
........
  r43436 | lordhoto | 2009-08-16 22:10:37 +1000 (Sun, 16 Aug 2009) | 1 line
  
  Fix F5's save button in DOTT CD for me. Actually I was able to reproduce the issue before I wrote this code, after reverting it for more testing, I couldn't reproduce it anymore. Probably it was some random problem, at least this code should now assure the "Save" button's state is always matching the return value of ScummEngine::canSaveGameStateCurrently.
........
  r43437 | lordhoto | 2009-08-16 22:10:51 +1000 (Sun, 16 Aug 2009) | 1 line
  
  For a better user experience, clear all meta infos, when clicking on an unused slot in the GMM save/load dialog.
........
  r43438 | lordhoto | 2009-08-16 22:11:45 +1000 (Sun, 16 Aug 2009) | 1 line
  
  Cleanup.
........
  r43440 | mthreepwood | 2009-08-16 23:47:48 +1000 (Sun, 16 Aug 2009) | 1 line
  
  Fix for bug #2838517 (FF: backspace does not work when typing save game name).
........
  r43441 | mthreepwood | 2009-08-17 00:04:54 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Introduce a better fix for the Mac OS X backspace problem by adding the workaround to default-events.cpp.
........
  r43444 | lordhoto | 2009-08-17 03:35:59 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Fix format arugments in LoL code. (triggered via -Wformat-security)
........
  r43445 | lordhoto | 2009-08-17 03:36:16 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Fix warning caused by -Wformat-security, also fixed a possible buffer overflow along with it.
........
  r43446 | lordhoto | 2009-08-17 03:36:31 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Fix warning caused by -Wformat-security.
........
  r43447 | lordhoto | 2009-08-17 03:38:09 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Fix for bug #2838568 "AMIGAOS4: Compiler error in audiostream.cpp"
........
  r43449 | waltervn | 2009-08-17 05:18:19 +1000 (Mon, 17 Aug 2009) | 3 lines
  
  SCI: Stage 1 of the game detection overhaul. The end goal is to autodetect
  as much as possible. All SCI_VERSION_* information was removed from
  detection.cpp (much of it was incorrect anyway).
........
  r43450 | waltervn | 2009-08-17 05:19:26 +1000 (Mon, 17 Aug 2009) | 1 line
  
  SCI: Fix regression in previous commit (QFG2).
........
  r43451 | waltervn | 2009-08-17 05:20:09 +1000 (Mon, 17 Aug 2009) | 1 line
  
  SCI: Fix whitespace.
........
  r43452 | sev | 2009-08-17 05:48:13 +1000 (Mon, 17 Aug 2009) | 2 lines
  
  Fix bug #2838551: "PSP: AGI games are unbearably slow"
........

svn-id: r43457
2009-08-17 01:42:39 +00:00
Eugene Sandulenko 0d4fc81698 Fix bug #2838551: "PSP: AGI games are unbearably slow"
svn-id: r43452
2009-08-16 19:48:13 +00:00
Walter van Niftrik 2ac6e260b6 SCI: Fix whitespace.
svn-id: r43451
2009-08-16 19:20:09 +00:00
Walter van Niftrik 83e541900d SCI: Fix regression in previous commit (QFG2).
svn-id: r43450
2009-08-16 19:19:26 +00:00
Walter van Niftrik 00f4794c0a SCI: Stage 1 of the game detection overhaul. The end goal is to autodetect
as much as possible. All SCI_VERSION_* information was removed from
detection.cpp (much of it was incorrect anyway).

svn-id: r43449
2009-08-16 19:18:19 +00:00
Johannes Schickel 582eb13fa2 Fix for bug #2838568 "AMIGAOS4: Compiler error in audiostream.cpp"
svn-id: r43447
2009-08-16 17:38:09 +00:00
Johannes Schickel c88cf041a4 Fix warning caused by -Wformat-security.
svn-id: r43446
2009-08-16 17:36:31 +00:00
Johannes Schickel ecb6423055 Fix warning caused by -Wformat-security, also fixed a possible buffer overflow along with it.
svn-id: r43445
2009-08-16 17:36:16 +00:00
Johannes Schickel 418fb485c9 Fix format arugments in LoL code. (triggered via -Wformat-security)
svn-id: r43444
2009-08-16 17:35:59 +00:00
Norbert Lange c96affd0c1 merge with trunk
svn-id: r43443
2009-08-16 16:39:34 +00:00
Matthew Hoops ce30a513ac Introduce a better fix for the Mac OS X backspace problem by adding the workaround to default-events.cpp.
svn-id: r43441
2009-08-16 14:04:54 +00:00
Matthew Hoops a718e608f4 Fix for bug #2838517 (FF: backspace does not work when typing save game name).
svn-id: r43440
2009-08-16 13:47:48 +00:00
Johannes Schickel 2b32a651ec Cleanup.
svn-id: r43438
2009-08-16 12:11:45 +00:00
Johannes Schickel b1c22cfc42 For a better user experience, clear all meta infos, when clicking on an unused slot in the GMM save/load dialog.
svn-id: r43437
2009-08-16 12:10:51 +00:00
Johannes Schickel 5a89bc058c Fix F5's save button in DOTT CD for me. Actually I was able to reproduce the issue before I wrote this code, after reverting it for more testing, I couldn't reproduce it anymore. Probably it was some random problem, at least this code should now assure the "Save" button's state is always matching the return value of ScummEngine::canSaveGameStateCurrently.
svn-id: r43436
2009-08-16 12:10:37 +00:00
Paul Gilbert 86fdd698ad Added detection entry for the UK 16 colour version
svn-id: r43434
2009-08-16 12:03:48 +00:00
Johannes Schickel 0e32d53341 Fix bug #2838464 "SCUMM: GUI messages misaligned".
svn-id: r43431
2009-08-16 11:28:59 +00:00
Jody Northup cbffcb609f Replaced KeyStates with ActionKeys in the keymapper, removed SDL ASCII code mismatch workaround hacks, fixed the memory leaks I had previously created.
svn-id: r43430
2009-08-16 07:40:13 +00:00
Johannes Schickel 871f832fe1 Fix valgrind warnings.
svn-id: r43428
2009-08-16 06:33:34 +00:00
Johannes Schickel a9ac38ea23 Added Ninteno DS specific hack, which takes care of tab button width problems. This actually is not a NDS specific problem, but so far the NDS seems to be the only backend, which has a custom (hardcoded) dialog, which makes problems with our theme layouts. Instead of r43423, which enabled auto width calculaction for tab buttons on all platforms, this commit limits this to the Nintendo DS backend. This takes care of possible layout changes, caused by the changes of the commit. I also added a comment with possible solutions to this problem.
svn-id: r43426
2009-08-16 05:38:16 +00:00
Johannes Schickel 9f981303d2 Fix options dialog's reflowLayout.
svn-id: r43425
2009-08-16 05:38:03 +00:00
Denis Kasak 74d4392a78 Added struct GameItem.
svn-id: r43424
2009-08-16 04:21:17 +00:00
Travis Howell 43d57fd333 Update branch specific save game changes, to prevent conflicts.
svn-id: r43421
2009-08-16 01:46:47 +00:00
Matthew Hoops 34380d9335 Fix using the backspace key on Mac OS X in HE games.
svn-id: r43420
2009-08-16 01:43:18 +00:00
Travis Howell ac45cf6f6f Merged revisions 43338-43340,43342,43344-43347,43349-43350,43352-43354,43357-43358,43362,43366,43369,43375,43377,43380,43383-43384,43386,43388,43390,43393,43400,43402,43404,43406-43409,43411,43413-43414 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

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

svn-id: r43418
2009-08-16 01:03:09 +00:00
Travis Howell 58486725ec Fix overflow in convertFilePath().
svn-id: r43417
2009-08-16 00:53:55 +00:00
Travis Howell 09845556e0 Revert revision 43410, and add alternative fix.
svn-id: r43416
2009-08-16 00:20:23 +00:00
Kari Salminen b6a0f3e371 Fix for bug #2835581 (KQ3: Game Crash When Leaving Tavern as Fly):
- Use AGI version 0x3149 instead of the previous 0x3086
- Makes ESC pause the game (Identical to original in this respect)

svn-id: r43414
2009-08-15 19:04:21 +00:00
Johannes Schickel 6c3a440aa5 Yet another slight graphic fix for the Kyrandia 1 Amiga credits.
svn-id: r43413
2009-08-15 15:30:35 +00:00
Johannes Schickel 02e3f31bf5 Added const qualifiers to static data.
svn-id: r43411
2009-08-15 14:59:11 +00:00
Matthew Hoops 8e417b0884 Fix compile when compiling with --disable-he
svn-id: r43410
2009-08-15 14:50:21 +00:00
Torbjörn Andersson 762d2dc03a Removed unnecessary semi-colons.
svn-id: r43409
2009-08-15 14:13:48 +00:00
Walter van Niftrik 17e7f46501 SCI: Add missing versions to exe version parsing
svn-id: r43408
2009-08-15 12:17:23 +00:00
Walter van Niftrik 5709e524f9 SCI: Rename sci_version_t to SciVersion
svn-id: r43407
2009-08-15 12:09:47 +00:00
Paul Gilbert 49a4df3c8c Added Dirty Rect handling functionality
svn-id: r43406
2009-08-15 11:50:59 +00:00
Joost Peters aae6c98945 Properly implement PSPFilesystemFactory::makeCurrentDirectoryFileNode()
svn-id: r43404
2009-08-15 10:44:58 +00:00
Travis Howell a73523533c Restore code to clear screen, before playing videos with smaller resolution in the Amiga version of The Feeble Files.
svn-id: r43402
2009-08-15 10:31:20 +00:00
Travis Howell 0630c20722 Fix regression, that caused multiple sounds in Simon the Sorcerer 2 to be cut off.
svn-id: r43400
2009-08-15 10:09:32 +00:00
Jody Northup 7ff9bb3a6b Commented a memory leak whose fix requires a fundamental modification to the Action structure (replacing KeyState with ActionKey should do it)
svn-id: r43399
2009-08-15 09:15:09 +00:00
Jody Northup 8d051e24fe Added support for mapping keys to ctrl, alt, shift, or combinations thereof (though ctrl+alt will never trigger for some reason)
svn-id: r43398
2009-08-15 09:12:36 +00:00
Jody Northup 6ede831093 Added hash function for ActionKey in preparation for replacing KeyStates in the main keymapper hashtable with ActionKeys, removed a duplicated comment line.
svn-id: r43397
2009-08-15 08:55:22 +00:00