254 Commits

Author SHA1 Message Date
Eugene Sandulenko
ea42bad781 Update copyright notice
svn-id: r20088
2006-01-18 17:39:49 +00:00
Max Horn
899eb271c6 Got rid of 'ref' code (or rather: hack) in the save/load system
svn-id: r19246
2005-10-22 23:42:12 +00:00
Max Horn
8269b7bdc2 Switch iMuse to use Serialiazable, too (at least partially)
svn-id: r19243
2005-10-22 22:18:44 +00:00
Max Horn
ffc5e1718f Started to make the save/load system slightly more object oriented
svn-id: r19224
2005-10-21 23:01:13 +00:00
Eugene Sandulenko
b36677af71 Update FSF address. Eek. Actually that took place on May 1, 2005
svn-id: r19142
2005-10-18 01:30:26 +00:00
Travis Howell
18febcb94d Replace warnings with debug, errors or printfs:
-To catch any missing cases/functions used.
-To prevent users reporting warnings as bugs

svn-id: r18682
2005-08-14 02:04:26 +00:00
Eugene Sandulenko
6b4484472b Remove trailing whitespaces.
svn-id: r18604
2005-07-30 21:11:48 +00:00
Max Horn
8b1d7b9166 When including files from common/, explicitly use the common/ prefix
svn-id: r18444
2005-06-24 15:23:51 +00:00
Torbjörn Andersson
8f4077d992 Fixed warning. (And made some whitespace changes.)
svn-id: r18433
2005-06-22 06:37:02 +00:00
Lars Persson
1c69696a9a Patches needed to build for SYMBIAN32 WINS/GCC added.
Test built for Symbian and run on P910i without any major problems.
Test built for MSVC6. Changed parts seems to compile ok but there are some problems with MSVC6 and some of the targets which the EPOC build does n't support (KYRA,SAGA).

svn-id: r18430
2005-06-21 22:08:21 +00:00
Torbjörn Andersson
4fbb6c29cb Whitespace
svn-id: r18296
2005-05-29 18:14:59 +00:00
Torbjörn Andersson
e27f13d164 Swapped the last two parameters to Sam & Max iMUSE command 257. This fixes
bug  and probably (it's much less obvious) bug  as well.

Since these parameters are both zero in all other known uses of this
particular iMUSE command, it doesn't affect anything else.

I don't know if it's correct, or if it sounds like in the original, but it
sounds good to me.

svn-id: r18284
2005-05-28 12:29:31 +00:00
Torbjörn Andersson
bdee380fd9 Very minor cleanup.
svn-id: r18272
2005-05-27 10:25:15 +00:00
Torbjörn Andersson
894f630cd0 Added workaround for Sam & Max music issue at the Dino Bungie Memorial. As
far as I can telL, the issue was caused by sloppy scripting, though it is
of course perfectly possible that it worked with the original interpreter
anyway.

svn-id: r18270
2005-05-27 07:01:04 +00:00
Max Horn
228121ae2d Add 'MIDI' chunk to list of known iMuse music chunks
svn-id: r18265
2005-05-26 16:30:19 +00:00
Torbjörn Andersson
4b82800cc5 Be less agressive about re-using trigger slots. This fixes bug ,
hopefully without causing any regressions.

svn-id: r18261
2005-05-26 12:56:29 +00:00
Max Horn
c060d56cc8 Properly use operator '%' to compute a queue wrap around, instead of relying on the queue size to be a power of 2 and then abusing the '&' operator
svn-id: r18259
2005-05-26 11:30:56 +00:00
Torbjörn Andersson
d733a4ec46 Cleanup. (Mostly whitespace.)
svn-id: r18258
2005-05-26 11:13:42 +00:00
Torbjörn Andersson
f3f58ec9eb Fixed a glitch that could cause the music to stop when Sam & Max were
thrown out of Bumpusville.

svn-id: r18254
2005-05-26 06:38:52 +00:00
Max Horn
e3db264d89 cleanup
svn-id: r18251
2005-05-25 19:40:30 +00:00
Max Horn
83a3507507 Changed misleading 'isGM' name to 'isMIDI'; cleanup in the isMIDI/isMT32 methods
svn-id: r18248
2005-05-25 09:32:19 +00:00
Torbjörn Andersson
37d4e9499d Save the "Sam & Max" iMUSE triggers, otherwise we won't always be able to
restore the music state correctly. The one example I know of is when saving
between using the hair and the powder on Frog Rock, but there are probably
others as well.

svn-id: r18229
2005-05-23 07:05:42 +00:00
Eugene Sandulenko
bdbd56406c Patches "Updated GS Support + Percussion Remapping Patch" and
 "Updated Native MIDI documentation". Thanks _tom a lot.

svn-id: r17571
2005-04-13 00:11:49 +00:00
Eugene Sandulenko
7c831c9c4c Patch "GM/GS Percussion Remapping"
svn-id: r17569
2005-04-12 22:41:25 +00:00
Torbjörn Andersson
eb4dce05ee Extremely minor consistency change.
svn-id: r17332
2005-04-02 13:58:00 +00:00
Torbjörn Andersson
eb1c999ad0 Use _chorus, not _effect_level, as parameter to chorusLevel(). I don't
know for sure that this is correct - the MIDI device I'm using at the
moment doesn't seem to support chorus level - but the more I look at it the
more sense it makes.

And it might fix bug . ("DOTT/SAM: GM Instrument Chorus Level
Improperly Set")

svn-id: r17049
2005-03-09 13:17:05 +00:00
Max Horn
cffd917165 system.h was being included in tons of places, without any good reason; reduced this (total dependencies on system.h went down from 193 to 85 files)
svn-id: r16527
2005-01-10 22:06:49 +00:00
Max Horn
b4d547c736 cleanup
svn-id: r16476
2005-01-07 14:42:05 +00:00
Max Horn
47280d9433 Updated copyright
svn-id: r16398
2005-01-01 16:09:25 +00:00
Torbjörn Andersson
75645cbd40 Fixed an Adlib regression with older games (e.g. EGA Loom, Indy 3 and
Monkey VGA) that was introduced by a recent "multi MIDI" change.

The "old Adlib" property was set too late in the iMUSE player, so the Adlib
driver would always think the game was new. I've removed this property from
the iMUSE player, since it's only function appeared to be to pass it on to
the Adlib player, and now set it in the Adlib player directly instead.

Also removed some remaining "multi MIDI" traces from the iMUSE player that
I believe were obsoleted by the aforementioned "multi MIDI" change.

svn-id: r15974
2004-12-03 13:17:57 +00:00
Max Horn
1ae87c0fbb Trying to cleanup the volume control mess inside the SCUMM engine: renamed MusicEngine::setMasterVolume to setMusicVolume; fixed iMuse to use the correct method for setMusicVolume (previously modified the iMuse internal volume control); hooked up the volume control of various other music engines; added ScummEngine::setupVolume method which can be called whenever volume settings change, and which gurantees that those are handled uniformly
svn-id: r15944
2004-11-28 21:24:02 +00:00
Jerome Fisher
8d0ab890f8 To really, truly fix the multi-midi race condition, the adlib driver is now always created before iMuse initialisation. This necessitated removing the multimidi toggle from the debug console.
svn-id: r15912
2004-11-27 14:53:37 +00:00
Jerome Fisher
1733863e71 - driver being NULL there is perfectly fine, Fingolfin :)
DCVS: ----------------------------------------------------------------------

svn-id: r15910
2004-11-27 13:27:17 +00:00
Max Horn
d56cd17183 paranoia
svn-id: r15900
2004-11-26 23:51:56 +00:00
Jerome Fisher
51bafda43a The Adlib MidiDriver is now initialised immediately when it is determined that it may be used. Doing this lazily potentially deadlocked when using MT-32 emulation in mixed MIDI/Adlib mode.
svn-id: r15899
2004-11-26 21:53:12 +00:00
Max Horn
ce8c99bf62 Rename remaining OSystem methods to match our coding guidelines
svn-id: r15332
2004-09-28 20:19:37 +00:00
Max Horn
c6752cccf5 renamed more OSystem methods to follow our naming scheme; renamed NewGuiColor to OverlayColor; fixed some calls to error() in the SDL backend
svn-id: r13087
2004-02-28 12:58:13 +00:00
Max Horn
1141ff1ac2 Modified version of patch (Let scumvm -v show supported libs)
svn-id: r12780
2004-02-09 01:27:27 +00:00
Max Horn
033ff78ae9 updated copyright notice
svn-id: r12176
2004-01-06 12:45:34 +00:00
Max Horn
80aac33327 cleanup
svn-id: r11620
2003-12-13 21:06:47 +00:00
Paweł Kołodziejski
d5eddef057 changed some shift operators to *, /
svn-id: r11315
2003-11-16 20:52:57 +00:00
Paweł Kołodziejski
1f9e408e2f cleanup whitespaces
svn-id: r11217
2003-11-08 21:59:32 +00:00
Jamieson Christian
b901a24d49 Another fix for Bug [817871] re hanging notes on
pause with MT-32. Apparently the first fix doesn't work.

svn-id: r10876
2003-10-17 17:38:18 +00:00
Jamieson Christian
0279ace9ae Added trace output for IMuse doCommand codes that we're not sure
are even used by the game scripts. This is in preparation for a
restructuring of the volume model.

Also removed unused get_music_volume() member.

svn-id: r10872
2003-10-17 16:46:06 +00:00
Max Horn
d71160af74 removed the kDefault*Volume constants
svn-id: r10816
2003-10-15 23:16:52 +00:00
Jamieson Christian
83f7aa69b5 Fix for Bug [817871]: Added MT-32 master volume adjustment to pause().
svn-id: r10759
2003-10-12 16:46:23 +00:00
Jamieson Christian
577fe4c5fb Patch [818296] Modified MT-32 intialization sequence.
svn-id: r10666
2003-10-07 12:00:53 +00:00
Jamieson Christian
a722d0601e Preliminary preparation for new YM2612 FM emulator.
All the hooks are in, but actual implementation
needs to be checked for portability.

svn-id: r10615
2003-10-05 15:36:52 +00:00
Max Horn
d7660a2662 introduced namespace Scumm; made #include statements use scumm/ prefix explicitly
svn-id: r10571
2003-10-03 18:33:57 +00:00
Max Horn
2ed4677ede const as const can
svn-id: r10555
2003-10-03 00:59:27 +00:00