Commit Graph
86814 Commits
Author SHA1 Message Date
Johannes Schickel dd67cb7c94 Add missing "break" in switch statement.
svn-id: r43536
2009-08-19 09:01:04 +00:00
Johannes Schickel ca6fa52b1a Cleanup.
svn-id: r43535
2009-08-19 08:55:04 +00:00
Johannes Schickel 6145ed384b Cleanup.
svn-id: r43534
2009-08-19 08:54:41 +00:00
Johannes Schickel a37c9164ee Cleanup.
svn-id: r43533
2009-08-19 08:46:59 +00:00
Johannes Schickel 2597814af3 Add another range check in our SJIS font code to avoid out of bounds access.
svn-id: r43532
2009-08-19 08:37:20 +00:00
Johannes Schickel 0c2ab20663 Implemented proper character selection of Lands of Lore PC98.
svn-id: r43531
2009-08-19 08:30:15 +00:00
Paul Gilbert 416fb4f309 Corrected comments in the bug workaround list
svn-id: r43529
2009-08-19 08:24:40 +00:00
Johannes Schickel 2f162c72c9 Comment out unused function (which was also currently only enabled when SCI32 is enabled).
svn-id: r43528
2009-08-19 07:13:29 +00:00
Johannes Schickel 5e92db6001 Skip the whole Lore of the Lands special when the user does any input, like the original did.
svn-id: r43527
2009-08-19 07:12:33 +00:00
Joost Peters 2ea0df7b2e Take advantage of extra memory on newer PSP models
svn-id: r43525
2009-08-19 01:40:22 +00:00
Travis Howell 89d7fea4e6 Merged revisions 43458-43468,43470-43471,43473-43475,43477,43479-43483,43485,43497-43498,43500,43503-43504,43507,43509-43510,43512-43515,43517,43519,43521,43523 via svnmerge from
https://scummvm.svn.sourceforge.net/svnroot/scummvm/scummvm/trunk

........
  r43458 | thebluegr | 2009-08-17 15:55:21 +1000 (Mon, 17 Aug 2009) | 8 lines
  
  - 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
........
  r43459 | lordhoto | 2009-08-17 17:36:08 +1000 (Mon, 17 Aug 2009) | 1 line
  
  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.
........
  r43460 | thebluegr | 2009-08-17 19:19:53 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Cleanup
........
  r43461 | strangerke | 2009-08-17 19:50:35 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Added OPCODEDRAW 0x85, with a specific workaround for Bambou hardcoded paths in scripts
........
  r43462 | strangerke | 2009-08-17 19:54:49 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Suppress useless parentheses
........
  r43463 | lordhoto | 2009-08-17 19:57:09 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Formatting.
........
  r43464 | strangerke | 2009-08-17 20:05:02 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Add back parenthesis (I wasn't aware of this convention, sorry) in saveload, and mimic this code in oPlaytoons_openItk
........
  r43465 | lordhoto | 2009-08-17 20:48:03 +1000 (Mon, 17 Aug 2009) | 2 lines
  
  - Add note about that modifing the parent stream will mess up SeekableSubReadStream and SeekableSubReadStreamEndian.
  - Link to SubReadStream documentation from SeekableSubReadStream and SeekableSubReadStreamEndian.
........
  r43466 | thebluegr | 2009-08-17 21:06:27 +1000 (Mon, 17 Aug 2009) | 1 line
  
  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
........
  r43467 | thebluegr | 2009-08-17 21:11:38 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Ignore speech and sound effect samples with unknown compression, instead of trying to play them as raw sound. Some cleanup
........
  r43468 | dreammaster | 2009-08-17 21:36:09 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Fix for some more !!HIGH STRINGS!! when talking to the palace guards
........
  r43470 | thebluegr | 2009-08-17 21:49:07 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Simplified the sound playing code by removing the boolean variables for signed, stereo, endian and sample bit information - now sound flags are used instead. Some cleanup.
........
  r43471 | dreammaster | 2009-08-17 21:51:42 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Switched event loop while/do to do/while, to ensure event handling occurs even when the game is under heavy load
........
  r43473 | lordhoto | 2009-08-17 22:22:15 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Cleanup: don't copy the Kyrandia 1 Amiga credits data in a temporary buffer, and thus keeping it twice in memory.
........
  r43474 | lordhoto | 2009-08-17 22:22:30 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Clear input queue before displaying the credits in Kyrandia 1.
........
  r43475 | lordhoto | 2009-08-17 22:47:57 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Fix possible out of bounds access in Screen::drawShape.
........
  r43477 | joostp | 2009-08-17 22:57:37 +1000 (Mon, 17 Aug 2009) | 2 lines
  
  Commit (slightly) modified version of patch #2831248: Allow suspend/resume for PSP
........
  r43479 | thebluegr | 2009-08-17 23:16:40 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Added looping support to LinearDiskStream, needed by SAGA and perhaps other engines. Note that the loop end parameter is still not implemented
........
  r43480 | thebluegr | 2009-08-17 23:25:44 +1000 (Mon, 17 Aug 2009) | 2 lines
  
  - Removed the custom DigitalMusicInputStream used in SAGA for the digital music in ITE CD and replaced it with the common LinearDiskStream class
  - Removed leftover code which plays standalone tracks (it's not used anywhere)
........
  r43481 | lordhoto | 2009-08-17 23:49:56 +1000 (Mon, 17 Aug 2009) | 1 line
  
  Slight cleanup to makeLinearDiskStream interface.
........
  r43482 | waltervn | 2009-08-18 01:49:22 +1000 (Tue, 18 Aug 2009) | 1 line
  
  SCI: Add autodetection for DoSound. Cleanup.
........
  r43483 | waltervn | 2009-08-18 02:07:47 +1000 (Tue, 18 Aug 2009) | 1 line
  
  SCI: Build fix.
........
  r43485 | thebluegr | 2009-08-18 04:25:51 +1000 (Tue, 18 Aug 2009) | 1 line
  
  Put back the code for playing external digital music, used by the MIDI enhancement project, which was removed in rev. #43480
........
  r43497 | waltervn | 2009-08-18 09:11:25 +1000 (Tue, 18 Aug 2009) | 1 line
  
  SCI: Fix kernel table for multilingual SCI01 games. Cleanup.
........
  r43498 | joostp | 2009-08-18 09:54:40 +1000 (Tue, 18 Aug 2009) | 2 lines
  
  PSP: increase optimization level and change clock rate to 333mhz
........
  r43500 | thebluegr | 2009-08-18 16:43:06 +1000 (Tue, 18 Aug 2009) | 1 line
  
  Applied agent-q's patch to the SAGA pathfinding code for all platforms - x and y should not ever be greater than 640 and 480 respectively, so it looks safe enough to be applied
........
  r43503 | thebluegr | 2009-08-18 19:12:41 +1000 (Tue, 18 Aug 2009) | 1 line
  
  Removed the maxMemory parameter of the resource manager and replaced it with a define
........
  r43504 | thebluegr | 2009-08-18 20:01:18 +1000 (Tue, 18 Aug 2009) | 2 lines
  
  - Added game ID detection to the fallback detector. We still need to map some of Sierra's internal IDs to our own ones
  - The class table is now created in the segment manager constructor
........
  r43507 | dreammaster | 2009-08-18 22:25:04 +1000 (Tue, 18 Aug 2009) | 1 line
  
  Bugfix for Castle Skorl problem reported on the list
........
  r43509 | thebluegr | 2009-08-18 22:49:34 +1000 (Tue, 18 Aug 2009) | 1 line
  
  Mapped some Sierra internal IDs to our own ones, and added a note about a hack currently used in the fallback detector
........
  r43510 | thebluegr | 2009-08-19 00:10:31 +1000 (Wed, 19 Aug 2009) | 1 line
  
  Started rewriting the SCI engine to use FSNode instead of file names. This is the proper solution for removing the hack in the fallback detector, but it still needs work. Also, reduced the things needed to be initialized a bit, so that the detection is a bit faster
........
  r43512 | lordhoto | 2009-08-19 01:31:26 +1000 (Wed, 19 Aug 2009) | 1 line
  
  Made AGOS, DRASCULA, GOB, GROOVIE, MADE, SCUMM and TINSEL properly stop CD audio playback on engine quit. (This only problem affected playback from CD, not from ripped audio files)
........
  r43513 | lordhoto | 2009-08-19 01:32:26 +1000 (Wed, 19 Aug 2009) | 2 lines
  
  - Destory AudioCDManager singleton after user quits a game, this saves a few bytes memory
  - Added FIXME to audiocd.h, concering why destroying the AudioCDManager can not quit CD playback right now
........
  r43514 | joostp | 2009-08-19 01:39:47 +1000 (Wed, 19 Aug 2009) | 2 lines
  
  PSP: disable dosbox OPL
........
  r43515 | lordhoto | 2009-08-19 01:41:00 +1000 (Wed, 19 Aug 2009) | 1 line
  
  Typos.
........
  r43517 | joostp | 2009-08-19 03:12:01 +1000 (Wed, 19 Aug 2009) | 2 lines
  
  PSP: Make R-trigger act as a context sensitive modifier key, remap ENTER to triangle
........
  r43519 | joostp | 2009-08-19 04:06:50 +1000 (Wed, 19 Aug 2009) | 2 lines
  
  Implement setCursorPalette(), correct hasFeature() <-> getFeatureState() mixup.
........
  r43521 | john_doe | 2009-08-19 05:42:13 +1000 (Wed, 19 Aug 2009) | 2 lines
  
  - PMV player: Use frame count from PVM file and fix incorrect "invalid chunk type" warning
  - Fix sprite drawing glitch with vertically flipped sprites (bug #2825925)
........
  r43523 | buddha_ | 2009-08-19 07:37:31 +1000 (Wed, 19 Aug 2009) | 1 line
  
  Possible fix for #2828330 (AGI: KQ1: Fast text box). If doesn't break anything else then should go to the branch-1-0-0 too, but haven't had the time to do much testing yet - thus committing to the trunk first.
........

svn-id: r43524
closed/gsoc2009-16bit
2009-08-19 01:22:43 +00:00
Kari Salminen 2bd1f51d92 Possible fix for #2828330 (AGI: KQ1: Fast text box). If doesn't break anything else then should go to the branch-1-0-0 too, but haven't had the time to do much testing yet - thus committing to the trunk first.
svn-id: r43523
2009-08-18 21:37:31 +00:00
Benjamin Haisch 0762bb7cf6 - PMV player: Use frame count from PVM file and fix incorrect "invalid chunk type" warning
- Fix sprite drawing glitch with vertically flipped sprites (bug #2825925)

svn-id: r43521
2009-08-18 19:42:13 +00:00
Joost Peters a35056b555 Implement setCursorPalette(), correct hasFeature() <-> getFeatureState() mixup.
svn-id: r43519
2009-08-18 18:06:50 +00:00
Joost Peters ed2a733b2a PSP: Make R-trigger act as a context sensitive modifier key, remap ENTER to triangle
svn-id: r43517
2009-08-18 17:12:01 +00:00
Johannes Schickel 3ade77dfb0 Typos.
svn-id: r43515
2009-08-18 15:41:00 +00:00
Joost Peters 426dd7d241 PSP: disable dosbox OPL
svn-id: r43514
2009-08-18 15:39:47 +00:00
Johannes Schickel 5c11ec51bc - Destory AudioCDManager singleton after user quits a game, this saves a few bytes memory
- Added FIXME to audiocd.h, concering why destroying the AudioCDManager can not quit CD playback right now

svn-id: r43513
2009-08-18 15:32:26 +00:00
Johannes Schickel b33b90ecd0 Made AGOS, DRASCULA, GOB, GROOVIE, MADE, SCUMM and TINSEL properly stop CD audio playback on engine quit. (This only problem affected playback from CD, not from ripped audio files)
svn-id: r43512
2009-08-18 15:31:26 +00:00
Filippos Karapetis db0cd620f6 Started rewriting the SCI engine to use FSNode instead of file names. This is the proper solution for removing the hack in the fallback detector, but it still needs work. Also, reduced the things needed to be initialized a bit, so that the detection is a bit faster
svn-id: r43510
2009-08-18 14:10:31 +00:00
Filippos Karapetis 766cdac9f3 Mapped some Sierra internal IDs to our own ones, and added a note about a hack currently used in the fallback detector
svn-id: r43509
2009-08-18 12:49:34 +00:00
Paul Gilbert 2b945eabf1 Bugfix for Castle Skorl problem reported on the list
svn-id: r43507
2009-08-18 12:25:04 +00:00
Norbert Lange 56c23731e7 dont keep some unused parts of the mdatfile in memory
svn-id: r43506
2009-08-18 11:48:38 +00:00
Norbert Lange 5e1e7d0191 added tiebreaking to pickVoice, now the use of channels is better distributed
added a fixedpoint pow2 function (similar to the original) - no floats used anymore at the expense of a 512 byte table
added a sinetable for the modulation effect.

svn-id: r43505
2009-08-18 11:34:55 +00:00
Filippos Karapetis ca9bbce9b3 - Added game ID detection to the fallback detector. We still need to map some of Sierra's internal IDs to our own ones
- The class table is now created in the segment manager constructor

svn-id: r43504
2009-08-18 10:01:18 +00:00
Filippos Karapetis 65ac355efa Removed the maxMemory parameter of the resource manager and replaced it with a define
svn-id: r43503
2009-08-18 09:12:41 +00:00
Jody Northup dfaa5acbee Starting to simplify the Action structure, and rework it to facilitate making the automatic mapper smarter, at least when there is a keyboard present. Fixed a minor whitespace issue in a comment.
svn-id: r43502
2009-08-18 08:00:24 +00:00
Filippos Karapetis c9402c5559 Applied agent-q's patch to the SAGA pathfinding code for all platforms - x and y should not ever be greater than 640 and 480 respectively, so it looks safe enough to be applied
svn-id: r43500
2009-08-18 06:43:06 +00:00
Joost Peters eb11cca788 PSP: increase optimization level and change clock rate to 333mhz
svn-id: r43498
2009-08-17 23:54:40 +00:00
Walter van Niftrik 2fc7660e43 SCI: Fix kernel table for multilingual SCI01 games. Cleanup.
svn-id: r43497
2009-08-17 23:11:25 +00:00
Denis Kasak be0cfa50f2 Removed public data variables of Game concerning dialogues and added getters/setters.
svn-id: r43492
2009-08-17 19:37:55 +00:00
Denis Kasak 85bf130a50 Enabled hotkey 'i' for accessing or exiting the inventory.
svn-id: r43488
2009-08-17 18:51:45 +00:00
Denis Kasak b0fea939f4 Added inventory and item handling support (monster patch, sorry). Items were previously called "icons" as in the original player. This commit also renamed every such instance to the proper "item".
svn-id: r43487
2009-08-17 18:50:38 +00:00
Denis Kasak e5774d2881 * Added pause support for animations.
* Added AnimationManager::addItem() for adding inventory items animations.

svn-id: r43486
2009-08-17 18:47:17 +00:00
Filippos Karapetis 4a4ae33825 Put back the code for playing external digital music, used by the MIDI enhancement project, which was removed in rev. #43480
svn-id: r43485
2009-08-17 18:25:51 +00:00
Denis Kasak 680bed134b * Set the _x and _y position for the mouse only when an EVENT_MOUSEMOVE happens.
* Stop calling Mouse::setPosition() on EVENT_MOUSEMOVE since it's not needed (the engine warps the mouse automatically; I still left the method for situations when we want to warp the mouse explicitly).

svn-id: r43484
2009-08-17 18:23:05 +00:00
Walter van Niftrik 4b9bfe2013 SCI: Build fix.
svn-id: r43483
2009-08-17 16:07:47 +00:00
Walter van Niftrik 260a2019b6 SCI: Add autodetection for DoSound. Cleanup.
svn-id: r43482
2009-08-17 15:49:22 +00:00
Johannes Schickel 516dd5c9a4 Slight cleanup to makeLinearDiskStream interface.
svn-id: r43481
2009-08-17 13:49:56 +00:00
Filippos Karapetis 77689a05a2 - Removed the custom DigitalMusicInputStream used in SAGA for the digital music in ITE CD and replaced it with the common LinearDiskStream class
- Removed leftover code which plays standalone tracks (it's not used anywhere)

svn-id: r43480
2009-08-17 13:25:44 +00:00
Filippos Karapetis 76a339ecd0 Added looping support to LinearDiskStream, needed by SAGA and perhaps other engines. Note that the loop end parameter is still not implemented
svn-id: r43479
2009-08-17 13:16:40 +00:00
Norbert Lange cc3a20c13c merge with trunk
svn-id: r43478
2009-08-17 12:58:53 +00:00
Joost Peters 62bcb2e51b Commit (slightly) modified version of patch #2831248: Allow suspend/resume for PSP
svn-id: r43477
2009-08-17 12:57:37 +00:00
Johannes Schickel e548e71ba1 Fix possible out of bounds access in Screen::drawShape.
svn-id: r43475
2009-08-17 12:47:57 +00:00
Johannes Schickel 09a8fa4efb Clear input queue before displaying the credits in Kyrandia 1.
svn-id: r43474
2009-08-17 12:22:30 +00:00
Johannes Schickel b7b6370463 Cleanup: don't copy the Kyrandia 1 Amiga credits data in a temporary buffer, and thus keeping it twice in memory.
svn-id: r43473
2009-08-17 12:22:15 +00:00
Paul Gilbert 58ec3e67ef Switched event loop while/do to do/while, to ensure event handling occurs even when the game is under heavy load
svn-id: r43471
2009-08-17 11:51:42 +00:00
Filippos Karapetis a9eb98c218 Simplified the sound playing code by removing the boolean variables for signed, stereo, endian and sample bit information - now sound flags are used instead. Some cleanup.
svn-id: r43470
2009-08-17 11:49:07 +00:00
Paul Gilbert c368f60a1d Fix for some more !!HIGH STRINGS!! when talking to the palace guards
svn-id: r43468
2009-08-17 11:36:09 +00:00
Filippos Karapetis a5e4eed30e Ignore speech and sound effect samples with unknown compression, instead of trying to play them as raw sound. Some cleanup
svn-id: r43467
2009-08-17 11:11:38 +00:00