Commit Graph

224 Commits

Author SHA1 Message Date
Torbjörn Andersson
994408a770 Fixed some cppcheck warnings.
svn-id: r45391
2009-10-26 06:20:13 +00:00
Filippos Karapetis
8f0e47e671 Fixed signed/unsigned issues with the property() function of the Adlib driver
svn-id: r45332
2009-10-22 08:55:54 +00:00
Filippos Karapetis
93517e7649 Applied a modified version of patch #2881486 - "Add volume changing to SCI"
svn-id: r45329
2009-10-22 07:18:37 +00:00
Max Horn
2bbf708dea Introduced new type Common::DisposeAfterUse::Flag
svn-id: r45233
2009-10-18 19:41:59 +00:00
Filippos Karapetis
32810a30b5 Mark an old change made for SQ4 in updateMultiSong() in rev. #39347 as a workaround
svn-id: r45231
2009-10-18 19:07:22 +00:00
Willem Jan Palenstijn
bc8cf7e98d SCI: Add FIXME
svn-id: r45204
2009-10-17 21:54:44 +00:00
Willem Jan Palenstijn
a74fd21847 SCI: Fix delete/free mismatches
svn-id: r45196
2009-10-17 17:59:09 +00:00
Filippos Karapetis
e4c23834dd Moved sci_ffs() inside iterator.cpp, the only place where it's actually used, and removed tools.*. Also, removed all the unused includes to tools.h from several places
svn-id: r45176
2009-10-16 23:29:00 +00:00
Max Horn
8126f81b6f SCI: Doxygenify comments in class SfxPlayer
svn-id: r45039
2009-10-13 18:52:36 +00:00
Max Horn
8191c04056 SCI: Merge some sfx related global funcs into SfxState.
This allows us to get rid of "static SfxPlayer *s_player".

svn-id: r45038
2009-10-13 18:51:59 +00:00
Martin Kiewitz
093554749f SCI: commenting out music warnings
svn-id: r44990
2009-10-12 16:00:30 +00:00
Walter van Niftrik
4b3c1645bc SCI: Adlib: Add support for loading patch data from adl.drv
svn-id: r44859
2009-10-10 01:38:45 +00:00
Max Horn
3399c3aeb6 Change doxygen inline comments from "//!" to "///" as proposed on -devel
svn-id: r44802
2009-10-08 21:28:57 +00:00
Willem Jan Palenstijn
7d6848dfa3 SCI: Add some fixmes noted by salty-horse.
svn-id: r44513
2009-10-01 11:06:38 +00:00
Max Horn
8ba75fc522 Fix code formatting (esp. 'if(' -> 'if (' etc., but also indention and other things)
svn-id: r44495
2009-09-30 16:16:53 +00:00
Filippos Karapetis
13ad217cdd - Moved the SCI version in a global variable
- Changed all the SCI version checks to use getSciVersion()
- Also made getSciVersionDesc a global function (removes some ugly accessing of the SCI engine)

The fallback detector should work correctly now

svn-id: r44269
2009-09-23 10:55:35 +00:00
Max Horn
c0ff500b0a SCI: Rename player -> s_player and made it static; allocate MemoryReadStream in two cases on the stack, for simplicity
svn-id: r43979
2009-09-06 12:56:50 +00:00
Filippos Karapetis
1bbab8f191 Some renaming:
getresourceManager -> getResourceManger
resourceManager -> resMan
segmentManager ->segMan

svn-id: r43908
2009-09-02 12:02:37 +00:00
Walter van Niftrik
2777e9f349 SCI: Fix relative cues in SCI1.
svn-id: r43871
2009-09-01 02:11:55 +00:00
Filippos Karapetis
ed66cad677 - Simplified the parameters of some functions
- Replaced some EngineState parameters
- The SCI version is now obtained from the resource manager or the segment manager, thereby simplifying several functions
- Plugged 2 leaks in the fallback detector
- Renamed the segment manager and resource manager to "segmentManager" and "resourceManager" in all places, for consistency

svn-id: r43722
2009-08-25 08:38:14 +00:00
Matthew Hoops
cba2897cc8 Truly fix endianness in the SOL decoder. Raw sounds are always in little endian order and now compressed are outputted to little endian too (and therefore the little endian mixer flag is always set).
svn-id: r43576
2009-08-21 03:31:34 +00:00
Matthew Hoops
b4c7cd0484 Fix 16-bit SOL audio on little endian systems. Fixes the white noise in the Gabriel Knight demo.
svn-id: r43569
2009-08-20 20:41:12 +00:00
Walter van Niftrik
00f4794c0a SCI: Stage 1 of the game detection overhaul. The end goal is to autodetect
as much as possible. All SCI_VERSION_* information was removed from
detection.cpp (much of it was incorrect anyway).

svn-id: r43449
2009-08-16 19:18:19 +00:00
Walter van Niftrik
f99932b72a SCI: Added enum for map and volume versions. Removed res_version setting from
detection.cpp (should be detectable). Cleanup.

svn-id: r43390
2009-08-15 00:28:59 +00:00
Willem Jan Palenstijn
8dd3492194 SCI: don't let TimerSongIterator loop forever, and don't immediately
signal completion when starting it. This fixes a sync issue with
the departing spaceship at the start of SQ4CD (after the intro).

svn-id: r42385
2009-07-11 15:00:40 +00:00
Filippos Karapetis
2b5fac58d5 Applied patch 2818733 - "SCI: Timer iterator for audio resources played via doSound"
svn-id: r42375
2009-07-11 06:53:39 +00:00
Filippos Karapetis
a62b26ea80 Silenced the very chatty song iterator console messages by converting them to appropriate debug messages
svn-id: r42240
2009-07-07 20:43:27 +00:00
Filippos Karapetis
1f3f4ccdd2 Fixed compilation
svn-id: r42168
2009-07-06 11:10:35 +00:00
Filippos Karapetis
522b161bec Replaced sciprintf() calls with printf, DebugPrintf, warning and error calls
svn-id: r42167
2009-07-06 10:39:22 +00:00
Willem Jan Palenstijn
eba5780fc0 When creating a CleanupSongIterator, transfer death listeners to it
svn-id: r42113
2009-07-05 01:16:53 +00:00
Willem Jan Palenstijn
f907dc7fc7 When morphing a TeeSongIterator, transfer death listeners to remaining child
svn-id: r42112
2009-07-04 23:52:24 +00:00
Max Horn
c4f6295330 Fixed some more warnings observed on buildbot
svn-id: r42010
2009-07-01 20:51:34 +00:00
Max Horn
a6b57dc3a9 - Added GCC_PRINTF attribute to several funcs where it makes sense
- change some constants from double to float, to avoid "loss of precision due to implicit conversion" warnings
- removed duplicate prototypes for some funcs
- fixed some "increases required alignment of target type" warnings

svn-id: r42009
2009-07-01 20:51:04 +00:00
Walter van Niftrik
1fb78d577f SCI: Moved audio code from AudioResource to the sfx core.
svn-id: r41486
2009-06-12 23:46:23 +00:00
Max Horn
22507d70bb SCI: C++ified the song iterator code a little bit more
svn-id: r41360
2009-06-07 23:05:11 +00:00
Walter van Niftrik
a6ed05740f SCI: Moved resource36 handling into resource manager.
svn-id: r41349
2009-06-07 19:15:55 +00:00
Max Horn
21d948ec05 SCI: Simplified SongLibrary code a bit
svn-id: r41345
2009-06-07 17:07:25 +00:00
Max Horn
62f596821e SCI: Objectified Song struct 'a bit'
svn-id: r41344
2009-06-07 17:07:07 +00:00
Max Horn
d07e9dfb13 SCI: Objectified SongLibrary
svn-id: r41343
2009-06-07 17:06:51 +00:00
Max Horn
f2ca788004 SCI: Renamed various song/songlib related structs and members
svn-id: r41342
2009-06-07 17:06:32 +00:00
Filippos Karapetis
36cdd09223 Init _opl to 0. This prevents a crash on exit when the Adlib driver is closed, if the game music driver doesn't support music for the currently playing game (e.g. Christmas 1998)
svn-id: r41339
2009-06-07 16:44:57 +00:00
Filippos Karapetis
da36901b07 Cleanup
svn-id: r41202
2009-06-05 23:08:35 +00:00
Filippos Karapetis
e55388c787 Removed script_error_flag and script_debug_flag, which were used to error out if something went wrong and open the debugger console. Changed all the places where they were used to error() out instead, as ScummVM's debugger console can open on error()
svn-id: r41073
2009-05-31 15:34:23 +00:00
Torbjörn Andersson
0999534749 The error() and warning() functions add ! and newline automatically. (I didn't
look at debug() and debugC(), since I'm really bored with this now. :-)

svn-id: r41061
2009-05-31 10:02:16 +00:00
Johannes Schickel
abe8cf0625 Typo.
svn-id: r41054
2009-05-31 01:11:06 +00:00
Filippos Karapetis
dcecdc7b94 Moved the "songlib" command to console.cpp and removed the non-working "set_vismap" command - we can view the different maps with "show_map", but it doesn't make much sense to redirect the game's graphics output to another screen map on demand
svn-id: r41048
2009-05-30 20:45:57 +00:00
Max Horn
9423c75dae SCI: Added constructor&destructor to SfxState
svn-id: r41047
2009-05-30 20:41:10 +00:00
Max Horn
70a04c8b51 SCI: Made vocab_version static again (a global static var is bad, but a really global var is worse); also clarified some FIXME comments that we want to avoid *any* non-const global var, no matter whether it is static or not
svn-id: r41045
2009-05-30 20:37:33 +00:00
Filippos Karapetis
15d5b8436e Removed the "sfx_debuglog" command. Sound debug messages are now shown if kDebugLevelSound is specified
svn-id: r41039
2009-05-30 17:53:12 +00:00
Filippos Karapetis
c7c9f05cac Removed/replaced BREAKPOINT
svn-id: r41025
2009-05-30 10:42:08 +00:00