Commit Graph

201 Commits

Author SHA1 Message Date
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
Max Horn
813853ccc2 SCI: Converted several fprintf(stderr) calls to warning/error (the remaining fprintf calls should probably be replaced by suitable debug/debugC/debugN invocations)
svn-id: r40993
2009-05-29 13:07:14 +00:00
Max Horn
b72c2a29fb SCI: Removing useless adlib-via-OSS code
svn-id: r40992
2009-05-29 13:04:32 +00:00
Max Horn
d3bd7b622c SCI: Turned SfxState into a proper class (i.e., convert the sfx_ funcs to member methods)
svn-id: r40973
2009-05-28 22:48:15 +00:00
Max Horn
804242ae9f SCI: Merged NewPlayer and SfxPlayer
svn-id: r40968
2009-05-28 22:16:42 +00:00
Max Horn
a8748bc45c oops
svn-id: r40966
2009-05-28 22:07:52 +00:00
Max Horn
99b520dd09 SCI: Merged SfxPlayer/NewPlayer code into sfx/core.cpp
svn-id: r40965
2009-05-28 22:02:45 +00:00
Max Horn
d70504c910 SCI: Renamed sfx_state_t -> SfxState, preparing it to become a class eventually
svn-id: r40958
2009-05-28 10:54:30 +00:00
Max Horn
01252c4aaf SCI: Some SFX player cleanup
svn-id: r40956
2009-05-28 10:29:11 +00:00
Filippos Karapetis
3e29b47ec3 Fixed a crash when exiting, a regression from the latest music driver changes
svn-id: r40922
2009-05-26 19:05:20 +00:00
Max Horn
50157fbca9 SCI: Undo commit #40917 (SongIteratorChannel::resetSynthChannels now again does something)
svn-id: r40921
2009-05-26 15:46:54 +00:00
Filippos Karapetis
d8c1725fbd Fixed compilation under MSVC
svn-id: r40917
2009-05-26 14:59:41 +00:00
Max Horn
1e2c539e42 SCI: Removing obsolete soft sequencer files
svn-id: r40914
2009-05-26 14:43:47 +00:00
Max Horn
7050c5065f SCI: removed realtime and polled player, as well as the sfx/device dir, after discussion with Walter
svn-id: r40913
2009-05-26 14:09:07 +00:00
Max Horn
1d00cc5df0 SCI: Turned sfx_player_t into a class SfxPlayer, and converted the existing players to subclasses of that
svn-id: r40912
2009-05-26 11:49:10 +00:00
Max Horn
c5539b4e4e SCI: Preparing to transform sfx_player_t into a class
svn-id: r40911
2009-05-26 11:35:35 +00:00
Max Horn
7d5f3e1714 Turned some static tables into static const tables; added some FIXME comments to global static vars that should be removed (many more exist in SCI, Tinsel, and some other engines)
svn-id: r40908
2009-05-26 11:30:21 +00:00
Walter van Niftrik
fcc45186a5 SCI: Adlib: fix crash in SQ4.
svn-id: r40886
2009-05-25 12:38:20 +00:00
Filippos Karapetis
d59796fb54 Objectified the AudioResource code (used for speech and digitized music in CD talkie games)
svn-id: r40880
2009-05-25 10:30:19 +00:00
Walter van Niftrik
8adc948001 SCI: Adlib: added support for rhythm channel
svn-id: r40874
2009-05-24 22:32:21 +00:00
Johannes Schickel
b3c6751b9b Strip trailing whitespaces in the whole code base.
svn-id: r40867
2009-05-24 15:17:42 +00:00
Walter van Niftrik
248f415fac SCI: Added partial support for SCI1.1 adlib music
svn-id: r40800
2009-05-23 01:41:09 +00:00
Max Horn
bba91075bf removed trailing whitespaces
svn-id: r40742
2009-05-20 17:53:31 +00:00
Willem Jan Palenstijn
a897ee239d Fix compilation
svn-id: r40611
2009-05-15 14:23:00 +00:00