Commit Graph

4559 Commits

Author SHA1 Message Date
Oliver Kiehl
9fe94049f3 fix VC warnings
svn-id: r7915
2003-05-24 23:27:24 +00:00
Jonathan Gray
0bd1f1d958 er oops
svn-id: r7914
2003-05-24 23:21:08 +00:00
Oliver Kiehl
35b362495e and a little bit more...
svn-id: r7913
2003-05-24 23:17:12 +00:00
Max Horn
0d2ddf2381 work around for comi script calling o6_getActorRoom(255)
svn-id: r7912
2003-05-24 23:08:03 +00:00
Max Horn
fcb5cf36c9 updated NEWS a bit
svn-id: r7911
2003-05-24 22:56:24 +00:00
Max Horn
684b7288f3 change behaviour for loading save games from the command line so that if you load a COMI save game from disk 2, you don't have to first insert disk 1
svn-id: r7910
2003-05-24 22:42:26 +00:00
Oliver Kiehl
3fda1e4a7c and some more functions
svn-id: r7909
2003-05-24 22:22:23 +00:00
Max Horn
0384d27e83 (somewhat hackish) support for COMI CD changing on Mac OS X; reordered stuff in scumm.h
svn-id: r7908
2003-05-24 22:17:45 +00:00
Max Horn
4cda099c57 don't use _gameDataPath directly; minor cleanup
svn-id: r7907
2003-05-24 22:13:01 +00:00
Oliver Kiehl
1457f95ec8 add some more functions
svn-id: r7906
2003-05-24 21:52:35 +00:00
Oliver Kiehl
24d9eb4ddb fix EVIL bug
svn-id: r7905
2003-05-24 21:40:17 +00:00
Max Horn
41a9cd8ac4 fixed flashlight oddities in Zak256
svn-id: r7904
2003-05-24 21:33:54 +00:00
Jamieson Christian
0768f103ea Put the comment back on IMUSE_DEBUG. Duh.
svn-id: r7903
2003-05-24 19:51:29 +00:00
Jamieson Christian
66c2533681 Possible fix for hanging notes in iMuse
svn-id: r7902
2003-05-24 19:50:34 +00:00
Jamieson Christian
34162afd9e Removed more unnecessary code
svn-id: r7901
2003-05-24 19:43:20 +00:00
Jamieson Christian
30affb5fbc Various iMuse cleanup
svn-id: r7900
2003-05-24 19:20:52 +00:00
Jamieson Christian
f8e9e55fba allNotesOff() now sends to all 16 channels, not just the first 15. Duh.
svn-id: r7899
2003-05-24 19:11:49 +00:00
Oliver Kiehl
d7bc94e810 add fnInteract
svn-id: r7898
2003-05-24 18:56:19 +00:00
Oliver Kiehl
14dd35b976 added some more functions
svn-id: r7897
2003-05-24 18:48:43 +00:00
Oliver Kiehl
afda37693f fix compact
svn-id: r7896
2003-05-24 18:25:09 +00:00
Oliver Kiehl
d7573468aa off by one. *sigh*
svn-id: r7895
2003-05-24 18:24:39 +00:00
Max Horn
9d95b025cd fixed roomOps:1 (thanks to Hoenicke)
svn-id: r7894
2003-05-24 17:18:23 +00:00
Max Horn
7bc1399e00 this change seems to be 'logical', but could be wrong; would be nice to check the assembly...
svn-id: r7893
2003-05-24 17:07:50 +00:00
Max Horn
2efa2e1c67 cleanup
svn-id: r7892
2003-05-24 17:04:54 +00:00
Max Horn
f75c148c8c corrected FIXME
svn-id: r7891
2003-05-24 16:45:49 +00:00
Max Horn
07df5bd181 cleanup / minor tweak
svn-id: r7890
2003-05-24 16:11:47 +00:00
Max Horn
41df21ed6b temporary work around for bug #742676 (game won't exit anymore, but behaviour is incorrect)
svn-id: r7889
2003-05-24 16:09:29 +00:00
Max Horn
ac3f871910 some more debug output
svn-id: r7888
2003-05-24 16:02:07 +00:00
Jamieson Christian
0ffc4fe7da Fix for bug [742688] FOA: Missing music at Sophia's lecture.
Added check for 0-length parameter fades, just in case.

svn-id: r7887
2003-05-24 16:00:18 +00:00
Travis Howell
84195fe444 Add some extra code for simon1dos/talkie, doesn't seem to function yet though
svn-id: r7886
2003-05-24 13:05:56 +00:00
Travis Howell
cf29056768 Typo
svn-id: r7885
2003-05-24 12:28:56 +00:00
Travis Howell
13739f18ef More renames
svn-id: r7884
2003-05-24 12:26:28 +00:00
Travis Howell
e95d717fb1 A few function renames
svn-id: r7883
2003-05-24 12:13:23 +00:00
Jonathan Gray
9b0e0d14db we want a word not a byte for object numbers, bug pointed out by Hoenicke
svn-id: r7882
2003-05-24 10:39:13 +00:00
Travis Howell
fa33a173ac Missed one line
svn-id: r7881
2003-05-24 10:01:24 +00:00
Travis Howell
7febca050b Remove a few old asserts and xxx which was not needed
svn-id: r7880
2003-05-24 09:05:25 +00:00
Travis Howell
3fbae51dc0 Small cleanup
svn-id: r7879
2003-05-24 07:55:53 +00:00
Jamieson Christian
bc5511c514 Fixed hanging notes when switching tracks
svn-id: r7878
2003-05-24 04:39:47 +00:00
Jamieson Christian
807f3e1e86 Fixed MIDI channel conflict between music and MIDI sound effects in simon1dos.
Also added notes about the GMF header for posterity's sake.

svn-id: r7877
2003-05-24 03:55:37 +00:00
Travis Howell
cd37b391b2 Correct fixme comment
svn-id: r7876
2003-05-24 03:51:33 +00:00
Jamieson Christian
e23f76b742 Hack to prevent bad music looping at end of simon1win
svn-id: r7875
2003-05-24 03:26:12 +00:00
Jamieson Christian
1b4b6030fe Added support for GMF loop specifier
svn-id: r7874
2003-05-24 03:10:14 +00:00
Jamieson Christian
bcdf2286f8 Fixed problem with hanging notes when switching music tracks
svn-id: r7873
2003-05-24 01:42:57 +00:00
Jamieson Christian
aacbaac131 Added support for simultaneous music and MIDI sound effects to simon1dos.
Note that 's' still toggles MIDI sound effects on and off.

svn-id: r7872
2003-05-24 01:26:05 +00:00
Jonathan Gray
c8276b4684 returning 1 instead of the id is the correct behaviour I believe, but the scripts check for a 0 result so either will work. I'm just picky :)
svn-id: r7871
2003-05-24 01:20:50 +00:00
Max Horn
0361f5a6c0 bypass for Zak256 copy protection (can't test this right now, though)
svn-id: r7870
2003-05-23 23:24:48 +00:00
Jamieson Christian
eb09051517 Added XMIDI support to IMuse. IMuse now plays music from Humongous games.
Added some IMuse property options to support some assumptions that seem to be made by Humongous games.

This is still preliminary. It will play music, and it will switch between songs. But I don't know if it's switching to the right song at the right time.

svn-id: r7869
2003-05-23 18:35:53 +00:00
Max Horn
ad4eb36093 oops, fixed ScummVM::Rect constructor (this fixes various string redraw bugs)
svn-id: r7868
2003-05-23 17:01:35 +00:00
Max Horn
0439e0fe58 fixed nasty deadlock I recently introduced
svn-id: r7867
2003-05-23 16:47:45 +00:00
Torbjörn Andersson
8feba0dfaf cleanup
svn-id: r7866
2003-05-23 15:48:07 +00:00