libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-06 18:00:44 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
7,643 Commits 5 Branches 5 Tags 1.8 GiB
428ebd6568
Commit Graph

605 Commits

Author SHA1 Message Date
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
Travis Howell
40c3f25cd7 Add combined speech/subtitles support for simon2 hebrew 
svn-id: r9401
 2003-08-02 10:15:07 +00:00
Travis Howell
29247636f6 Add combined speech/subtitles support for simon2 hebrew 
svn-id: r9400
 2003-08-02 10:09:05 +00:00
Travis Howell
0b2bd31010 Hebrew support for load/save dialog 
svn-id: r9398
 2003-08-02 07:10:30 +00:00
Travis Howell
471bc5ceb5 Improved hebrew support, thanks to Jamieson 
svn-id: r9397
 2003-08-02 07:00:58 +00:00
Max Horn
103112dd3d removed OSystem::set_mouse_pos (I hope I didn't break any backends, but if I did it should be trivial to get them working again) 
svn-id: r9391
 2003-08-02 00:36:38 +00:00
Max Horn
0df319e952 #include cleanup (explicityl specify the location for headers from common/, so that we at some point can get rid of -Icommon; exception is made for stdafx.h, since a) we might want to rename it and b) might want to move it to the top level) 
svn-id: r9359
 2003-08-01 12:21:04 +00:00
Travis Howell
fc5d38ec50 Small cleanup 
svn-id: r9316
 2003-07-31 01:59:31 +00:00
Travis Howell
e739a9644c Fix Golum Ring causes graphic glitches, bug #777966 
svn-id: r9294
 2003-07-30 16:25:05 +00:00
Travis Howell
2ddd3a9895 typo 
svn-id: r9293
 2003-07-30 11:17:51 +00:00
Travis Howell
00bcd731f5 Add/remove/update simon comments 
svn-id: r9292
 2003-07-30 11:16:09 +00:00
Travis Howell
f503013b5a Small cleanup 
svn-id: r9290
 2003-07-30 10:05:09 +00:00
Jamieson Christian
269757dabc vc_10_no_depack_swap implementation 
svn-id: r9289
 2003-07-30 09:36:48 +00:00
Travis Howell
7fbd161cad Fix unit'd array and variable in simon 
svn-id: r9285
 2003-07-30 01:43:28 +00:00
Torbjörn Andersson
f4f63d71db Partial fix for bug #779013. It no longer crashes, but the config file 
setting still overrides the command-line option.

svn-id: r9283
 2003-07-29 21:03:25 +00:00
Max Horn
6b470390f7 cleanup 
svn-id: r9281
 2003-07-29 12:39:41 +00:00
Travis Howell
bbbebd9d14 Some basic suport for reversed text for hebrew version. 
svn-id: r9278
 2003-07-29 06:12:52 +00:00
Marcus Comstedt
4dfd76fb9d <memory.h> is not a standard header file. (Merge from branch-0-5-0.) 
svn-id: r9255
 2003-07-28 17:14:41 +00:00
Max Horn
a57263fa0a unification 
svn-id: r9242
 2003-07-28 11:48:07 +00:00
Travis Howell
b8ce60ea18 Count amount of save files available so load/save dialog works correctly. 
svn-id: r9196
 2003-07-27 12:05:08 +00:00
Travis Howell
9937e18ba5 Surprised this has not caused major problems 
svn-id: r9188
 2003-07-25 08:49:54 +00:00
Travis Howell
9bb773c67d Use correct frame rate value from disasm, fixes minor timing issue in simon 2 in 
troduction.
Correct default _lock_counter value

svn-id: r9186
 2003-07-25 06:55:05 +00:00
Travis Howell
8146de7693 ambient sfx works fine again 
svn-id: r9178
 2003-07-24 17:49:03 +00:00
Travis Howell
be7597a8c9 Should be right now 
svn-id: r9174
 2003-07-24 16:54:40 +00:00
Travis Howell
316162fe19 Ooops 
svn-id: r9171
 2003-07-24 15:15:35 +00:00
Travis Howell
635fea9b17 Simon games shold only play one voice at a time. 
Fixes many voice overlaps
Fixes subtitles been ot of sync with voice, with simon 1 versions that had combi
ned speech/subtitles.

svn-id: r9167
 2003-07-24 14:21:56 +00:00
Travis Howell
55c71f65c0 Another leak 
svn-id: r9165
 2003-07-24 12:32:56 +00:00
Travis Howell
f930abe568 Check before releasing memory 
svn-id: r9163
 2003-07-24 12:05:06 +00:00
Travis Howell
da0db02f6e Fix for simon2mac voices problem, bug #776803 
svn-id: r9160
 2003-07-24 10:20:56 +00:00
Jamieson Christian
17a888b65a Fix for Bug [775534] 0.5.0 RC SIMON1DOS Random sfx notes during music 
Corrected a problem with resource size computation for GMF sound
effect resources. Since GMF resources have no size info, we were
computing sizes with the assumption that each GMF appears in its
own file, so the file size becomes the resource size. This is true
for simon1dos music files but not for SFX files. This fix uses the
resource offset pointers at the beginning of SFX files to properly
compute the size of SFX resources.

svn-id: r9155
 2003-07-24 04:19:42 +00:00
Travis Howell
0e499b9a80 That last change wasn't quite right 
svn-id: r9119
 2003-07-22 12:16:56 +00:00
Travis Howell
7d52141329 Fix simon1talkie regression 
svn-id: r9118
 2003-07-22 12:09:56 +00:00
Travis Howell
760bfb2245 Rename function, update comments 
svn-id: r9108
 2003-07-21 16:25:16 +00:00
Travis Howell
93cb369da7 Rename variable 
svn-id: r9106
 2003-07-21 09:11:21 +00:00
Travis Howell
2b5cc772d7 Add sfx/voice support for simon1cd32, thanks to olki. 
Adjust a few debugs
Add hack to allow load/save in simon1cd32 via keyboard

svn-id: r9105
 2003-07-21 04:00:04 +00:00
Travis Howell
a4b5891dd1 Use automatic dirty rect code for simon games for now to reduce CPU usage 
svn-id: r9093
 2003-07-20 15:31:47 +00:00
Travis Howell
82f90bb6cf Fix regression 
Switch erros to warnings

svn-id: r9092
 2003-07-20 15:17:11 +00:00
Travis Howell
2583f4e629 Remove comment 
svn-id: r9090
 2003-07-20 07:27:28 +00:00
Travis Howell
dc25058c3e Add game specific scaler override to sky 
Add game specific scaler and full screen override to simon

svn-id: r9067
 2003-07-18 15:37:06 +00:00
Travis Howell
f91fb2980a This is actually needed 
svn-id: r9049
 2003-07-16 12:21:09 +00:00
Travis Howell
60e5e16ae6 Check if voice file exists in simon2 
svn-id: r9040
 2003-07-15 16:51:06 +00:00
Travis Howell
2b7227679a Use debug output instead of warnings for simon 
Fix debug output in sky

svn-id: r9039
 2003-07-15 16:40:24 +00:00
Travis Howell
d0915c690c Remove unneeded warning 
svn-id: r9038
 2003-07-15 15:26:17 +00:00
Travis Howell
eddf075495 Remove warning in simon 
Add INDY3EGA Amiga - experimental support for sound effects, patch #771355

svn-id: r9033
 2003-07-15 07:29:23 +00:00
Jamieson Christian
eedeffac6a Fixed behavior of "m" key under simon1dos. 
The "m" key was turning off both music
AND MIDI sound effects. It now turns off
only the music.

svn-id: r9014
 2003-07-14 12:15:17 +00:00
Jamieson Christian
dc3e4ce46b Fixed error that resulted in bad script tracking 
when creating sprites during a savegame load
after having been at certain locations.

(If that sounds convoluted, it's because I don't
know why I fixed what I did, only that the code
we had was not quite constructed properly from
assembler references.)

svn-id: r9013
 2003-07-14 12:00:20 +00:00
Jamieson Christian
4ae380102a Fix for Bug [770838] SIMON1DOS: Fatal crashes with French version 
Fix variable underflow for large subtitle strings with no
discernable whitespace. This fixes crashes for French subtitles
that do, in fact, have whitespace but perhaps not using the
same ASCII character that we scan for. Anyway, the text will
display, albeit with an extra blank line, and ScummVM no longer
blows up.

svn-id: r9009
 2003-07-14 10:02:37 +00:00
Jamieson Christian
40eac8b182 Fixed typo. While I agree that this error should have 
been caught before committing (compiler didn't detect
need to do incremental build, sorry), I think if something
this trivial is going to get such a reaction, I have to
agree with Fingolfin that a release or RC branch is
advisable regardless of how slow one predicts the CVS
traffic will be.

svn-id: r9005
 2003-07-14 09:02:12 +00:00
James Brown
2980a78dff We ARE in a cvs freeze, PLEASE at least test if your code compiles before commiting... 
Jamieson, this isn't even a valid line of C! @toad Jamieson630

svn-id: r9004
 2003-07-14 08:48:38 +00:00
Jamieson Christian
74d3d914a9 Feature [770161] SIMON: Remap instruments to GM 
Apparently Simon 1 (all versions) uses MT32 instruments,
so now we map them to GM *unless* the --native-mt32
option was specified.

svn-id: r9001
 2003-07-14 08:29:17 +00:00
Max Horn
963ecad362 debug/warning/error all automatically output a newline 
svn-id: r8991
 2003-07-13 16:22:17 +00:00
Jamieson Christian
39a088229a Fix for Bug [768940] SIMON: Music in Swamp shouldn't loop 
Fixed problem with how loop control was being handled
in the Simon 2 music queueing logic.

svn-id: r8968
 2003-07-13 06:29:49 +00:00
Max Horn
d098334fe6 updated code to use type MutexRef; added class StackLock (from sdl backend, now in util.*) 
svn-id: r8777
 2003-07-05 15:19:11 +00:00
Max Horn
6ca8d634fd only declare class MP3Sound if USE_MAD is #defined 
svn-id: r8644
 2003-06-24 21:52:52 +00:00
Max Horn
7281ac6907 undo this change again - proper fix would be to correct the MP3 playback code 
svn-id: r8593
 2003-06-21 22:04:20 +00:00
Max Horn
2b580871c2 delete _sound when SimonState is destroyed; fix leak & enian bug in playSting (but somebody please test that, I don't have simon1dos) 
svn-id: r8582
 2003-06-21 15:53:27 +00:00
Max Horn
ceb1005f6c some more memory inits; cleanup 
svn-id: r8581
 2003-06-21 15:42:20 +00:00
Max Horn
3de24123e7 fix some memory leaks 
svn-id: r8580
 2003-06-21 15:36:19 +00:00
Max Horn
0cb2053d9d init some member vars previously not inited 
svn-id: r8579
 2003-06-21 15:32:35 +00:00
Max Horn
ece6f28fd7 fix (?) for an invalid read report in valgrin 
svn-id: r8578
 2003-06-21 15:32:25 +00:00
Max Horn
0832c1f662 reuse file, remove file2 usage 
svn-id: r8573
 2003-06-20 12:25:37 +00:00