Commit Graph

6304 Commits

Author SHA1 Message Date
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
Torbjörn Andersson
d900ea66bd Cleanup.
svn-id: r9903
2003-08-29 06:19:34 +00:00
Travis Howell
f1d9afc56a Only needed for versions 1 - 4
svn-id: r9902
2003-08-29 04:08:48 +00:00
Jamieson Christian
5507d75228 Replaced VER_V* notation for savegames with
a simple number. So that it's still obvious
that the number refers to version, a VER()
macro does nothing to the number but makes
it obvious what the number is for. This
has the exact same effect as the enum that
was going to get more and more lengthy
as the savegame version evolved.

svn-id: r9901
2003-08-29 04:05:23 +00:00
Jamieson Christian
20aaf3c365 Added _roomPalette to savegame.
Savegame version now at 21.

svn-id: r9900
2003-08-29 03:54:47 +00:00
Jamieson Christian
cec02390ed Fix for bug [770687] MI1: palette effect missing
Added support for CC resources in small-header
games. Right now this is enabled for monkeyvga
only. loomcd has CC resources but they don't
make any sense, and the game doesn't use palette
effects anyway.

svn-id: r9899
2003-08-29 03:35:15 +00:00
Jonathan Gray
e32f17d803 don't try to read objectRoomTable for HEv7 games right now
svn-id: r9898
2003-08-29 02:45:38 +00:00
Jonathan Gray
176803cb90 make the 2nd gen windows based humongous games that have things like a different layout in the MAXS block at least start the bootscript, added pjs-demo target to test with
svn-id: r9897
2003-08-29 02:39:05 +00:00
Oliver Kiehl
2a89cd9c9d fix killLastWord
svn-id: r9896
2003-08-28 19:46:52 +00:00
Max Horn
898bbc85d0 double cursor animation speed (see bug #757191)
svn-id: r9895
2003-08-28 19:20:30 +00:00
Jonathan Gray
876fe0ac8a add readINI stub (a HEv7 op)
svn-id: r9894
2003-08-28 15:23:23 +00:00