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
Travis Howell 97545e41fb Add missing break 
Skip auto save slot.

svn-id: r9953
 2003-09-01 07:50:47 +00:00
Torbjörn Andersson 178b0d82df Another attempt at fixing the music1.clu / music2.clu thing. 
svn-id: r9952
 2003-09-01 06:40:07 +00:00
Paweł Kołodziejski 56ca9f03df possibly fixes for not exist id stream channel 
svn-id: r9951
 2003-09-01 06:23:04 +00:00
Paweł Kołodziejski beb138d4d8 added warkaround for not exist music stream id at appendStream call 
svn-id: r9950
 2003-09-01 06:13:47 +00:00
Travis Howell e9727c157e Minor cleanup of color cycle resource loading 
svn-id: r9949
 2003-09-01 06:11:41 +00:00
Travis Howell db6cd68196 Add work around for color cycling been used in monkeyvga when it shouldn't. 
svn-id: r9948
 2003-09-01 05:07:43 +00:00
Travis Howell c5141005e0 Add CD audio check for loomcd 
Revert last change, since it wipped out intro. text.

svn-id: r9947
 2003-09-01 03:08:32 +00:00
Travis Howell b43a6f6496 Override default initial setting of subtitles enabled in loomcd 
svn-id: r9946
 2003-09-01 01:50:07 +00:00
Paweł Kołodziejski 82fea49671 added comments: 
volume: 0 - 127
pan: (-127 <-> 0 <-> 127) (left <-> center <-> right)

svn-id: r9945
 2003-08-31 20:36:53 +00:00
Paweł Kołodziejski 2533b23a60 added mixer features: volume and pan control per channel 
svn-id: r9944
 2003-08-31 20:26:21 +00:00
Torbjörn Andersson 54f5caedc5 Untested (because I don't have any savegames on this computer) support for 
using music1.clu and music2.clu instead of music.clu

svn-id: r9943
 2003-08-31 18:09:21 +00:00
Torbjörn Andersson e60ee06e2d When a fading music channel is freed to make room for new music, or when a 
music channel has faded out, destroy the channel immediately. Don't wait
for the mixer to finish it off.

This seems to fix a problem where the mixer would eventually run out of
slots if you left the Quit dialog showing for too long.

Unfortunately I don't know if it fixes the "out of slots" errors I
encountered once during normal play. Oh well, time will tell...

svn-id: r9942
 2003-08-31 17:28:36 +00:00
Jonathan Gray b5ece53748 cleanup and make script_v2 use o5_saveLoadGame 
svn-id: r9941
 2003-08-31 15:39:27 +00:00
Jonathan Gray f77faa2313 some things needed for supporting original save/load screens in v3 games, doesn't fully work but doesn't break anything either 
svn-id: r9940
 2003-08-31 14:58:56 +00:00
Torbjörn Andersson 3b62d9b4da No longer assume that all sound effects are 22 kHz. Some are 11 kHz. 
svn-id: r9939
 2003-08-31 10:45:14 +00:00
Torbjörn Andersson 155f4591c9 Cleaned up StreamCompMusic(), including some untested endian-fixes. 
This should also fix the bug where music sometimes didn't start playing.

svn-id: r9938
 2003-08-31 10:38:32 +00:00
Jonathan Gray 25a7c5de67 support having speech clusters named speech1.clu and speech2.clu cd.bin is needed if you want to use this scheme 
svn-id: r9937
 2003-08-31 03:19:43 +00:00
Travis Howell ce23cdfe50 Update indy3 
If there are any graphical glitches left, please add a bug report.

svn-id: r9936
 2003-08-31 01:21:01 +00:00
Travis Howell f28581cd89 Add note about roland update for loom/mi1 [ega] 
svn-id: r9935
 2003-08-31 00:34:20 +00:00
Jonathan Gray 4ea7eeb563 fix compilation 
svn-id: r9934
 2003-08-31 00:00:09 +00:00
Torbjörn Andersson c54baa429b BS2 crashed because it passed a buffer of uneven length to the mixer. This 
is the only place I can think of where this could have happened, so I've
added a paranoid check to ensure the buffer length is even.

Let's see how that works out...

svn-id: r9933
 2003-08-30 22:17:59 +00:00
Torbjörn Andersson f00b48b4cf Set a default music volume so that we can actually hear it. :-) 
svn-id: r9932
 2003-08-30 21:58:10 +00:00
Paweł Kołodziejski 7b3aae7c03 fixed not cleared sound handle for music 
svn-id: r9931
 2003-08-30 21:09:13 +00:00
Torbjörn Andersson f72681b10a Made PlayingSoundHandle unsigned again, since the mixer change was 
reverted.

svn-id: r9930
 2003-08-30 20:36:44 +00:00
Torbjörn Andersson dfe5d067bb Reverted previous change since the mixer change was reverted. 
svn-id: r9929
 2003-08-30 20:35:07 +00:00
Paweł Kołodziejski b321a7a468 ah 
svn-id: r9928
 2003-08-30 20:27:48 +00:00
Paweł Kołodziejski c684a076ee revert id handle stuff 
svn-id: r9927
 2003-08-30 20:25:07 +00:00
Torbjörn Andersson e7bebcf7aa Fixed Simon 2 intro regression (and possibly others as well) caused by 
recent mixer change.

svn-id: r9926
 2003-08-30 20:14:30 +00:00
Torbjörn Andersson bfee72f757 If -1 is going to be a valid value for a PlayingSoundHandle, the data type 
had better be signed...

svn-id: r9925
 2003-08-30 20:07:09 +00:00
Paweł Kołodziejski 9c05d44d00 added func isChannelActive for mixer, and fixed handling numbers of channel 0 
svn-id: r9924
 2003-08-30 18:12:49 +00:00
Paweł Kołodziejski a2dad74da1 added sfx support, increased speech support, and music code(streaming works fine but you don't hear anything) newStream, and appendStream doesn't work but playRaw works for music 
svn-id: r9923
 2003-08-30 18:06:08 +00:00
Travis Howell 890c5cde04 Very basic sfx support for Amiga version of maniac/zak 
svn-id: r9922
 2003-08-30 15:32:57 +00:00
Jonathan Gray 5825a28330 properly close down when playing demo 
svn-id: r9921
 2003-08-30 15:21:51 +00:00
Torbjörn Andersson 23ba54ec92 Fixed sprite clipping issues, I hope. 
svn-id: r9920
 2003-08-30 10:23:40 +00:00
Travis Howell 144b9ed71c Alter last commit, since looping would never be stopped on Mac version. 
svn-id: r9919
 2003-08-30 09:42:29 +00:00
Travis Howell 5fe5bd2e0d *** empty log message *** 
svn-id: r9918
 2003-08-30 09:15:10 +00:00
Travis Howell 21814137c2 indy3ega [mac] use same sound effects format as indy3ega [amiga] 
svn-id: r9917
 2003-08-30 09:12:45 +00:00
Travis Howell f76725b38f Update comment 
svn-id: r9916
 2003-08-30 08:03:01 +00:00
Jamieson Christian 8a4eaa51f0 Feature Request [778833] '-F' not documented 
Added -F and --fullscreen to the ScummVM
--help output. These were added to the README
already as part of the fix for Bug [779013].

svn-id: r9915
 2003-08-30 03:34:46 +00:00
Jamieson Christian cf3de3784b Fixed bad AND operator. May invalidate savegames from the last 24 hours 
svn-id: r9914
 2003-08-30 02:38:39 +00:00
Travis Howell f2e8033edc Adjust music timer for game with no music support. 
svn-id: r9913
 2003-08-30 01:32:32 +00:00
Travis Howell ae183c8c8c Opcode change to load/save screen in original loom 
svn-id: r9912
 2003-08-29 15:06:00 +00:00
Travis Howell a917313307 Adjust music timer 
svn-id: r9911
 2003-08-29 09:01:19 +00:00
Chris Apers 5f8630d41b Memory leak 
svn-id: r9910
 2003-08-29 08:04:54 +00:00
Jonathan Gray ea1cd18354 fix dottdemo by checking that room exists before trying to set a custom cursor from it, fixes bug #796971 
svn-id: r9909
 2003-08-29 07:57:20 +00:00
Travis Howell ef4fdd03f0 My last commit was wrong, this is correct solution. 
svn-id: r9908
 2003-08-29 07:07:55 +00:00
Travis Howell bed0061362 Fix verbs been shown in cutscenes in v1-v2 games if loading/saving during cutscene. 
svn-id: r9907
 2003-08-29 06:53:00 +00:00
Torbjörn Andersson fb060c6cbd Disabled debug output. (I really need to get the debug message level to 
work for BS2! :-)

svn-id: r9906
 2003-08-29 06:46:52 +00:00
Travis Howell 33f9cb35a3 Change zak room color remapping, so it work correctly after load/save in room with remapped colors. 
svn-id: r9905
 2003-08-29 06:46:12 +00:00
Torbjörn Andersson ed698cb635 Added some code to stop producing interpolation frames if the scene has 
already reached its scroll target. This keeps BS2 from using all available
CPU time all of the time.

It may still be that we need a mechanism for throttling the frame rate when
the scene is moving towards a scroll target, but my computer isn't really
fast enough to test that.

Two other bugs fixed in the process:

* I think the last frame of the render cycle was rendered, but not
  displayed. If so, that should be fixed now.

* I discovered that there are cases where we do need to clear the screen
  (e.g. at the "Meanwhile..." message when George has found out about the
  Glease Gallery), so I've re-enabled the function and disabled it in the
  render cycle.

svn-id: r9904
 2003-08-29 06:42:34 +00:00