Commit Graph

565 Commits

Author SHA1 Message Date
Max Horn
ad293a5ab8 cleanup / doxygenification
svn-id: r10578
2003-10-03 23:34:06 +00:00
Max Horn
a4b72c9d6e Simon namespace
svn-id: r10574
2003-10-03 19:42:27 +00:00
Jamieson Christian
91dc619adf Fix for Bug [812995] MT-32: wrong channel mapping
Implemented channel mask for Simon 1/2
when using --native-mt32.

svn-id: r10525
2003-10-01 17:34:46 +00:00
Jamieson Christian
6a4c977a48 Added decruncher for Simon 1 disk version files.
Also thanks to Stuart Caie for the C conversion
of the decruncher algorithm.

svn-id: r10476
2003-09-29 04:15:24 +00:00
Jamieson Christian
a48c8ff4c1 First-revision Amiga icon decompressor.
Thanks for Stuart Caie for the C conversion
that was adapted for this addition. On the
Web at http://www.kyz.uklinux.net/

svn-id: r10475
2003-09-29 02:59:47 +00:00
Travis Howell
c03b99eab6 Small correction for simon1/2 Hebrew
svn-id: r10411
2003-09-26 05:34:52 +00:00
Travis Howell
ab66db7cd0 Small cleanup to reduce amount of game id checks.
svn-id: r10402
2003-09-25 04:32:28 +00:00
Travis Howell
07c3c2dac6 Small cleanup to reduce amount of game id checks.
svn-id: r10401
2003-09-25 04:23:07 +00:00
Torbjörn Andersson
570e60a487 Whitespace changes
svn-id: r10390
2003-09-24 06:33:59 +00:00
Travis Howell
3854ce8f3d Add Acorn version of Simon the Sorcerer 1 Talkie
svn-id: r10389
2003-09-24 06:19:30 +00:00
Oliver Kiehl
16048e9c14 fix bug pointed out by Merlin0fCha0s
svn-id: r10343
2003-09-20 22:26:10 +00:00
Max Horn
f539bd72e7 fixed AMD64 warning
svn-id: r10341
2003-09-20 20:01:32 +00:00
Max Horn
6a4663824e added initial support for building our 4 adventure engines as loadable modules; right now only work on OS X; once we add more build rules, other systems with dlopen() should work, too (e.g. Linux); Windows support may come later. This is still very much WIP
svn-id: r10304
2003-09-18 18:23:53 +00:00
Max Horn
a15fdcea21 plugin work: right now, only with build rules for OS X. Once I can get it to work here, I'll add more build rules. Work in progress, a lot ain't work, but the plugin stuff is disabled by default, so no harm should arise
svn-id: r10292
2003-09-18 13:03:56 +00:00
Max Horn
be9d4066e1 moved engine.* to base; this fixes some linking issues when building a barebone ScummVM (or maybe I just want to increase our CVS stats? <g>)
svn-id: r10287
2003-09-18 02:07:18 +00:00
Max Horn
c1a678afeb new module 'base'; moved gameDetector.*, main.cpp and base/plugins.* there (this removes the need for an ugly hack in the build system, and is also conceptionally cleaner)
svn-id: r10282
2003-09-17 22:41:01 +00:00
Max Horn
231cb16b5b some tweaks to the build system (work toward plugin support)
svn-id: r10279
2003-09-17 21:53:13 +00:00
Max Horn
07a9646997 moved declaration of error/warning/debug from engine.h to util.h
svn-id: r10152
2003-09-10 12:31:20 +00:00
Max Horn
f23a34c9e5 renamed VersionSettings -> TargetSettings and also renamed some of its members; added GameDetector::findTarget; made launcher use that new method; some initial preparations for Plugin code
svn-id: r10092
2003-09-08 15:38:34 +00:00
Max Horn
7342163c7e make use of voc.h; some cleanup
svn-id: r10073
2003-09-07 20:30:02 +00:00
Max Horn
0be0196013 removed pauseMixer method from mixer, and renamed stop to stopChannel
svn-id: r10042
2003-09-06 10:47:30 +00:00
Max Horn
06b6ff9a44 added default volume/pan values
svn-id: r10019
2003-09-05 21:06:32 +00:00
Paweł Kołodziejski
7bc63a0ce3 fixes for uninitialized pan and volume
svn-id: r9998
2003-09-05 06:22:10 +00:00
Paweł Kołodziejski
5a6bce590b changed sounds volume to original volume level, and fixed sounds in bass intro
svn-id: r9963
2003-09-02 07:49:40 +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
dfe5d067bb Reverted previous change since the mixer change was reverted.
svn-id: r9929
2003-08-30 20:35: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
Jamieson Christian
e1bc6493d8 Replaced ADLIB_ALWAYS and ADLIB_PREFERRED with a more flexible
list of music types supported. This was done because now
PC speaker support must be treated separately, along with
Adlib and native (GM/MT32) support.

This fixes a problem with games that don't support PC speaker
(including V5 games that don't parse SPK resources yet)
being run with -epcspk or -epcjr. Those games now properly
switch to -enull so that music resources still get parsed
and music/script synchronization mechanisms don't break.

svn-id: r9703
2003-08-15 10:19:24 +00:00
Jamieson Christian
5a1b0ac24a More music volume management fixes
svn-id: r9636
2003-08-11 05:25:33 +00:00
Jamieson Christian
45f3db95fd Fix for Bug [777589] SIMON1: Sound volume strangeness
Fixed redundant, cumulative adjustments of _masterVolume
on the individual channel volumes. This fixes problems
with individual instruments changing volume by too much,
or dropping out altogether, when changing the master
music volume.

svn-id: r9635
2003-08-11 04:33:17 +00:00
Marcus Comstedt
8f88764ef0 stdafx.h needs to be included before scummsys.h because of the #define of free.
svn-id: r9628
2003-08-10 20:57:41 +00:00
Marcus Comstedt
2ed0eee711 Replaced use of File with use of SaveFileManager where appropriate.
svn-id: r9627
2003-08-10 20:50:50 +00:00
Travis Howell
9d09512765 Add missing code for f10 key, thanks to Jamieson
Stops multiple flashing star occuring on one character/object

svn-id: r9625
2003-08-10 15:58:38 +00:00
Travis Howell
5d972a657b Fix for f10 key in simon1
svn-id: r9624
2003-08-10 15:49:06 +00:00
Jamieson Christian
154e872d5a Added generic send() option to MidiChannel.
This circumvents problems doing generic send()
calls to MidiDrivers that support more than
16 MIDI channels (i.e. Adlib). Because of the
way it interacts with MidiDriver, Simon could
have run into a problem if it tried to
allocate more than 15 Adlib music channels
(though this would only happen in very, VERY
rare circumstances).

Also fixed a problem with the channel
numbering scheme used by MidiDriver_Adlib,
in particular the percussion channel number.

svn-id: r9604
2003-08-08 11:54:24 +00:00
Jamieson Christian
0ca58111c6 More Simon shutdown cleanup
svn-id: r9602
2003-08-08 09:48:42 +00:00
Travis Howell
47d98f94db Use shutdown() when quiting via ctrl z
svn-id: r9601
2003-08-08 09:42:38 +00:00
Jamieson Christian
456124d109 Fixed hang from double-lock of mutex
svn-id: r9600
2003-08-08 09:36:37 +00:00
Jamieson Christian
9b297a39b1 Close music engine on shutdown
svn-id: r9599
2003-08-08 09:27:52 +00:00
Travis Howell
e4e9538038 Add GF_INDY3 feature flag for indy3 games to reduce checks
Remove GF_ADLIB_DEFAULT since it is no longer used

svn-id: r9546
2003-08-06 09:10:19 +00:00
Travis Howell
43a1d35064 Reverted too much
Add note about missing code in simon

svn-id: r9531
2003-08-06 05:47:49 +00:00
Max Horn
77d3e9333b must create adlib driver *after* calling _mixer->bindToSystem
svn-id: r9528
2003-08-06 00:19:20 +00:00
Max Horn
75db41750e getting rid of g_mixer; removing lots of whitespace
svn-id: r9527
2003-08-05 23:58:24 +00:00
Travis Howell
2e6865b8a3 oops
svn-id: r9508
2003-08-05 17:42:23 +00:00
Travis Howell
0d2a3e5e7e F10 key works in simon1, although it highlights exits
svn-id: r9506
2003-08-05 17:39:06 +00:00
Travis Howell
486c1c77e1 Remove line
svn-id: r9452
2003-08-04 06:01:08 +00:00
Travis Howell
b630882683 Add Hebrew support for spoken text
Thanks to Jamieson

svn-id: r9444
2003-08-03 19:28:39 +00:00
Travis Howell
8762b47a11 Make code match
svn-id: r9405
2003-08-02 11:04:29 +00:00
Travis Howell
03f6ec8a8a Always check for null string
svn-id: r9404
2003-08-02 10:48:30 +00:00
Travis Howell
ec676d1581 My last commit caused regression
svn-id: r9402
2003-08-02 10:42:54 +00:00