ScummVM/scummvm
1
0 Fork 0
mirror of https://github.com/scummvm/scummvm.git synced 2026-06-20 05:45:29 +00:00
Code Issues Packages Projects Releases Wiki Activity
86,814 Commits 45 Branches 139 Tags
578a6794de9ba7679966fee9aec02c6b2bdbce94
Commit Graph
86814 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Filippos Karapetis 0e63912970 SCI32: added some of clone2727's changes to kArray and kString, and implemented kListIndexOf 
svn-id: r46739
 2009-12-30 12:55:24 +00:00
Filippos Karapetis dbfdd74426 Updated documentation of the VMD decoder to indicate which SCI32 games used VMD videos 
svn-id: r46738
 2009-12-30 10:42:52 +00:00
Filippos Karapetis bcc33871c1 The wrapper for the VMD decoder is only used in the SCI engine for SCI32 games, so moved it inside the engine, instead of common code. Added support for VMD video playing from the "play_video" console command 
svn-id: r46737
 2009-12-30 10:09:48 +00:00
Torbjörn Andersson 69c71c7628 Removed some unnecessary whitespace. Changed some spaces to tabs. 
svn-id: r46735
 2009-12-30 07:30:04 +00:00
Torbjörn Andersson 1a66ad80a4 Re-indentet switch() blocks to follow ScummVM indentation style. (I've always 
found this style a bit unusual, but I value consistency.)

svn-id: r46734
 2009-12-30 07:14:09 +00:00
Matthew Hoops 516495a4a1 Silence some warnings seen in the buildbot. 
svn-id: r46733
 2009-12-30 07:00:16 +00:00
Martin Kiewitz 2576f4b0bd SCI/newmusic: fixed fading (fixes gk1 demo, park area) 
svn-id: r46730
 2009-12-29 23:25:24 +00:00
Eugene Sandulenko fb8ecae7f1 Add Mohawk engine code. Part 2/3: common code changes. 
svn-id: r46728
 2009-12-29 23:20:23 +00:00
Eugene Sandulenko 0ea022d076 Add Mohawk engine code. Part 1/3: main code. 
svn-id: r46727
 2009-12-29 23:18:24 +00:00
Eugene Sandulenko 5f1d2a88b5 Fix warning 
svn-id: r46726
 2009-12-29 23:13:30 +00:00
Martin Kiewitz c992cd018c SCI: returning back raw == 0, when script trying to access invalid memory 
svn-id: r46720
 2009-12-29 22:26:09 +00:00
Martin Kiewitz 3e5d8280fa SCI: dont crash when scripts are trying to access invalid memory (fixes intro of lb2cd) 
svn-id: r46718
 2009-12-29 21:37:26 +00:00
Johannes Schickel bca313c6fc Typo. 
svn-id: r46717
 2009-12-29 20:41:09 +00:00
Filippos Karapetis c453790efc Updated module.mk 
svn-id: r46716
 2009-12-29 19:44:08 +00:00
Filippos Karapetis 14d4b75afb Added a thin wrapper around the VMD player class, so that it can be used with the common VideoPlayer interface, to be used with videos from SCI32 games 
svn-id: r46715
 2009-12-29 19:42:26 +00:00
Martin Kiewitz ef0f485847 SCI/newmusic: Removed playlist-feature from cmdResumeHandle cause that is sci0 only 
svn-id: r46714
 2009-12-29 18:28:26 +00:00
Martin Kiewitz 0fb1c8b106 SCI/newmusic: dont do pause/resume on the whole playlist prior sci1late (soundversion) 
svn-id: r46713
 2009-12-29 18:17:14 +00:00
Sven Hesse 10e62ea992 Adding a getFrameWaitTime() method to get the frame waiting time instead of directly waiting 
svn-id: r46712
 2009-12-29 18:07:06 +00:00
Sven Hesse 881b831074 Adding CoktelVideo::hasExtraData(void), for checking if /any/ extra data files are embedded in the video file 
svn-id: r46710
 2009-12-29 17:10:14 +00:00
Martin Kiewitz b7206b048c SCI/newmusic: changed pauseCounter again ;) 
svn-id: r46707
 2009-12-29 12:25:53 +00:00
Martin Kiewitz e44cc2c72d SCI/newmusic: changed pausecounter behaviour within resume 
svn-id: r46706
 2009-12-29 09:28:05 +00:00
Paul Gilbert 2d7c1e2c71 Corrected the Russian Discworld 1 MD5 values 
svn-id: r46704
 2009-12-29 08:56:41 +00:00
Filippos Karapetis dabfe53c66 Reverted rev #46647 - the title music in Codename: Iceman works correctly again 
svn-id: r46701
 2009-12-29 02:21:04 +00:00
Filippos Karapetis dbbe7fd7f8 SCI/new music code: Fixed loading of saved games. Also, stopped sounds are no longer paused 
svn-id: r46700
 2009-12-29 01:36:54 +00:00
Filippos Karapetis a6aa3d6363 Better checking for the cmdMuteSound and cmdVolume special cases 
svn-id: r46699
 2009-12-29 01:27:15 +00:00
Filippos Karapetis 53068b9e42 Removed leftover debug output 
svn-id: r46698
 2009-12-29 01:24:02 +00:00
Filippos Karapetis ac4551a39f SCI/new music code: cmdPauseHandle/cmdResumeHandle now work for SCI0 games 
svn-id: r46697
 2009-12-29 00:22:39 +00:00
Martin Kiewitz b65e4a8f74 SCI/newmusic: Added pausecounter cause sierra sci also does this 
svn-id: r46693
 2009-12-28 22:57:43 +00:00
Filippos Karapetis dd1fc9c14b SCI/new music code: Implemented cmdSendMidi, and removed access to _argc from sound commands 
svn-id: r46692
 2009-12-28 22:52:07 +00:00
Martin Kiewitz faff5b2123 SCI/newmusic: Added comment about weird sierra sci behaviour 
svn-id: r46691
 2009-12-28 22:45:26 +00:00
Martin Kiewitz f8abf06276 SCI/newmusic: Accept object 0:0 in cmdPauseHandle, pause the whole playlist then (fixes castle of dr. brain during intro) 
svn-id: r46690
 2009-12-28 22:35:53 +00:00
Max Horn 34e21c3767 SCI: Further objectify MusicEntry 
svn-id: r46689
 2009-12-28 21:06:44 +00:00
Max Horn ebbc33c3ca Spelling: Par*r*tition 
svn-id: r46688
 2009-12-28 21:04:35 +00:00
Max Horn 81a1d45821 SCI: Start objectifying MusicEntry 
svn-id: r46687
 2009-12-28 21:03:13 +00:00
Max Horn 594e202683 cleanup 
svn-id: r46686
 2009-12-28 21:00:59 +00:00
Max Horn 3aded71f55 SCI: Make some code comply to our naming conventions 
svn-id: r46685
 2009-12-28 20:58:00 +00:00
Filippos Karapetis 5cb5fe22ea SCI/new sound code: 
- Made the SciMusic class private, and added wrapper functions for invoking specific methods of SciMusic from outside the SoundCommandParser class
- Many SCI games keep creating and destroying sound effects constantly (i.e. many times per second). Therefore, another scheme has been devised, which replaces the mutex that was in place. Whenever a sound command is run which operates on a specific object in the play list, we disallow onTimer() from kicking in. This isn't ideal, but it does stop random deadlocks because of locked mutexes without any noticeable side effects

svn-id: r46681
 2009-12-28 20:10:15 +00:00
Filippos Karapetis 871d5c534d Moved the OLD_PATHFINDING define inside sci.h, together with the others 
svn-id: r46679
 2009-12-28 17:17:22 +00:00
Filippos Karapetis 0a6e2127ac SCI/new music code: Added a workaround for a music-related game bug in Castle of Dr. Brain 
svn-id: r46678
 2009-12-28 16:23:00 +00:00
Filippos Karapetis 3c6b7ce3b5 Fixed music pausing 
svn-id: r46677
 2009-12-28 16:21:59 +00:00
Torbjörn Andersson b6ca638180 Create the stream dynamically in playSoundData(), to avoid a crash (spotted by 
salty-horse) when makeWAVStream() deletes it.

svn-id: r46676
 2009-12-28 15:53:13 +00:00
Florian Kagerer 9f63095688 LOL: fixed debug message 
svn-id: r46675
 2009-12-28 15:08:53 +00:00
Filippos Karapetis 2973862488 Added a workaround for an off-by-one invalid species access bug in the LSL2 demo 
svn-id: r46673
 2009-12-28 14:22:11 +00:00
Filippos Karapetis 62c1c2633d SCI/new music code: Implemented the "songlib" debug command 
svn-id: r46670
 2009-12-28 11:23:20 +00:00
Filippos Karapetis f41674fd51 SCI/new music code: Hanging notes now stop when a sound is paused/stopped 
svn-id: r46669
 2009-12-28 10:42:14 +00:00
Filippos Karapetis f93537b2e5 SCI/new music code: Fixed a race condition when removing a sound from the playlist 
svn-id: r46668
 2009-12-28 10:27:56 +00:00
Paul Gilbert 84569c4792 Added MD5 data for Russian Discworld 1 
svn-id: r46667
 2009-12-28 06:24:06 +00:00
Filippos Karapetis 6c8ee76f80 SCI/new music code: Fixed music fading in SCI2 - seems like setting the signal when fading is done isn't necessary 
svn-id: r46666
 2009-12-28 00:15:31 +00:00
Filippos Karapetis 5adb6277eb SCI/new music code: 
- Switched to Common::StackLock for mutexes
- Renamed Music::stopAll() -> Music::clearPlayList()
- Implemented a better Music::stopAll method, which stops all sounds with proper signals, instead of destroying them
- Renamed the SCI0 command cmdGetPlayNext -> cmdStopAllSounds and implemented it

svn-id: r46665
 2009-12-27 23:46:11 +00:00
Matthew Hoops fedd4f1076 Fix regression in SCI1/1.1 wave sound from r46660. I knew it was a bad omen to have that revision number :P 
svn-id: r46664
 2009-12-27 23:35:22 +00:00