Commit Graph

60 Commits

Author SHA1 Message Date
Filippos Karapetis
9d7111006d - Reworked the different file types a bit
- Some initial work on Dinotopia's intro sequence

svn-id: r39234
2009-03-08 15:39:19 +00:00
Filippos Karapetis
80832ffb8f Got rid of explicit game sound info
svn-id: r35727
2009-01-04 15:44:33 +00:00
Filippos Karapetis
203358bcb7 Improved handling of sound resources
svn-id: r35724
2009-01-04 14:38:03 +00:00
Eugene Sandulenko
696897b058 Whoa! Removing trailing spaces.
svn-id: r35648
2009-01-01 15:06:43 +00:00
Max Horn
6837416556 Made Engine::_timer protected
svn-id: r35543
2008-12-25 20:53:59 +00:00
Filippos Karapetis
437384a838 - Split the SAGA resource manager in 3 different ones, depending on the resource type (RSC for ITE, RES for IHNM and HRS for DINO/FTA2). The SAGA 2 HRS resource manager is still a stub
- Added detection for the voice file of FTA2

svn-id: r35484
2008-12-22 14:13:15 +00:00
Filippos Karapetis
d0f4f97ea9 Cleaned up the mess with game IDs and game types: removed game types, reduced the game IDs and added game features where necessary
svn-id: r35467
2008-12-21 15:59:05 +00:00
Robin Watts
8f3b2e9b4d Remove warnings from NDS build.
svn-id: r35172
2008-11-29 18:01:16 +00:00
Filippos Karapetis
113a83c0da Implemented pauseEngineIntern() for the SAGA engine
svn-id: r35007
2008-11-11 17:34:52 +00:00
Max Horn
6aa12974bd SAGA: Some code cleanup
svn-id: r34703
2008-09-30 12:58:27 +00:00
Max Horn
7c0b2cfd27 Added multiple new open() methods to Common::File, which make it possible to use this class as a generic convenience wrapper around all kinds of SeekableReadStream; also renamed the name() method to the less confusing getName()
svn-id: r34696
2008-09-30 09:12:02 +00:00
Filippos Karapetis
6d4900ad06 Hopefully fixed the chaos with the SAGA volume values. This also fixes the broken volume introduced with the introduction of the RTL code in the engine
svn-id: r34349
2008-09-05 13:02:03 +00:00
Max Horn
2a06141644 Merging more of the GSoC 2008 RTL branch: SAGA
svn-id: r34252
2008-09-01 20:19:28 +00:00
Torbjörn Andersson
eb35835f5e I believe the setVolume() function has to be guarded by a mutex. (I added this to
the Tinsel engine a while back to fix mysterious problems, but forgot to add it
elsewhere.) Maybe this will fix the mysterious IHNM crashes, as well?

svn-id: r34048
2008-08-20 09:12:11 +00:00
Christopher Page
9c60fd183c Sound settings for Saga can be configured from the GMM
svn-id: r32863
2008-07-01 03:01:11 +00:00
Filippos Karapetis
966239fc52 Code cleanup:
- Removed sagaresnames.h
- Moved all special scenes to scene.h, and named them consistently (e.g. RID_ITE_OVERMAP_SCENE -> ITE_SCENE_OVERMAP)
- Moved all resources which were used by the ITE intro into ite_introproc.cpp
- Removed several defines which were only used once (e.g. the SFX names)
- Reordered the GameResourceDescription resources so that ITE and IHNM specific resources are placed in the end
- Updated the comment about the IHNM Mac music
- Changed the callocs in loadPalAnim to mallocs, like in the rest of the code
- Removed the MEM error

svn-id: r32282
2008-05-26 11:10:46 +00:00
Eugene Sandulenko
c8061850ed Simplify code
svn-id: r31409
2008-04-05 14:18:32 +00:00
Filippos Karapetis
a52c6e0ba2 Added code to load (but NOT play) the external music files in the Macintosh version of IHNM. I believe that the music in the Mac version is in TFMX format, which is not supported yet
svn-id: r31408
2008-04-05 14:06:50 +00:00
Eugene Sandulenko
7a0c61c440 Added detection for IHNM Mac. Gampe plays, but sound and music is a big TODO
svn-id: r31403
2008-04-05 07:43:54 +00:00
Filippos Karapetis
d9e3daae8f Removed 2 unnecessary calls to File::exists()
svn-id: r30952
2008-02-24 14:30:56 +00:00
Jordi Vilalta Prat
66e9d4f5e8 Removed trailing spaces.
svn-id: r30664
2008-01-27 19:47:41 +00:00
Paul Gilbert
6eb64102a4 Fix to remove a tab character from the GPL header
svn-id: r30238
2008-01-05 12:45:14 +00:00
Filippos Karapetis
063f7df4d3 Slight cleanup
svn-id: r30217
2008-01-04 13:34:38 +00:00
Filippos Karapetis
1e483cc857 Use CLIP template for clipping in the SAGA engine
svn-id: r29855
2007-12-13 20:10:13 +00:00
Filippos Karapetis
5add473048 Fix for bug #1800147 - "ITE: Scummvm exits with Audio warnings"
svn-id: r29345
2007-10-31 20:26:57 +00:00
Eugene Sandulenko
9a9e9d21a8 Moved MemoryStreamEndian from Saga to Common.
svn-id: r29038
2007-09-23 09:59:10 +00:00
Filippos Karapetis
7538fcbaef Removed a variable initialization out of a while loop
svn-id: r28959
2007-09-19 01:43:49 +00:00
Torbjörn Andersson
243a48138d I believe this fixes part of the music fading glitch in IHNM, but there's still
a slight problem when the intro fades the music down. Just before starting the
new music, the old music is briefly set back to normal volume again. This could
be a script bug, but I haven't investigated it any further.

svn-id: r28833
2007-09-02 21:40:09 +00:00
Torbjörn Andersson
c51430f1d1 Remove the timer callback when the Music object is deleted.
svn-id: r28783
2007-09-01 11:13:57 +00:00
Filippos Karapetis
30148e505d Compressed digital music in the ITE demo versions is played correctly now
svn-id: r28752
2007-08-26 19:14:18 +00:00
Filippos Karapetis
d4d255cd6d Implemented music pause and resume
svn-id: r28698
2007-08-22 16:00:45 +00:00
Filippos Karapetis
cd3f8577c1 Mutexes are now used in the MIDI music playing code
svn-id: r28697
2007-08-22 15:28:31 +00:00
Filippos Karapetis
02e0d144e8 Implemented Music::stop
svn-id: r28695
2007-08-22 11:28:11 +00:00
Filippos Karapetis
cd20f09a9d Cleanup: removed dead code, fixed some comments and did some layout changes
svn-id: r28362
2007-07-31 18:08:40 +00:00
Filippos Karapetis
2707e3a7e8 Music should not be played after changing scene if it's disabled from the options
svn-id: r28347
2007-07-31 00:52:00 +00:00
Filippos Karapetis
2b2af8ab5e Music works now in the IHNM demo
svn-id: r28332
2007-07-30 18:26:56 +00:00
Filippos Karapetis
332f74486e Possible fix for bug 1754613, part 2: changed the way compressed digital music is detected
svn-id: r28127
2007-07-17 18:18:50 +00:00
Filippos Karapetis
4594202aaf To loop a music track forever, the number of loops is set to 0
svn-id: r28105
2007-07-15 15:27:42 +00:00
Filippos Karapetis
5fc39e7a30 ITE: looping of compressed digital music is now done by the respective compressed streams themselves
svn-id: r28104
2007-07-15 15:12:24 +00:00
Filippos Karapetis
198b6ac8e6 ITE: Music looping works now with compressed digital music. However, there's still a small pause when a track restarts
svn-id: r28082
2007-07-15 03:13:15 +00:00
Torbjörn Andersson
af21e132a2 Fixed compilation.
svn-id: r28078
2007-07-14 18:26:43 +00:00
Filippos Karapetis
c8a8d806e2 Renamed a variable, so that it makes more sense
svn-id: r28072
2007-07-14 15:09:30 +00:00
Filippos Karapetis
ba3c55cd13 Some more updates for looping of compressed digital music. It's still not working, though
svn-id: r28071
2007-07-14 15:06:06 +00:00
Filippos Karapetis
009b100094 Cleanup of the digital music code. Now all kinds of music (uncompressed and compressed) are handled by the same class, DigitalMusicInputStream
svn-id: r28069
2007-07-14 13:41:03 +00:00
Filippos Karapetis
52f4d0b7d9 Add TODO: music looping does not work with compressed digital music
svn-id: r28056
2007-07-13 16:20:32 +00:00
Filippos Karapetis
17a4539a65 Renamed a variable, so that it makes more sense
svn-id: r28042
2007-07-12 08:52:07 +00:00
Travis Howell
b939c15f9d Fix compiler warning.
svn-id: r27739
2007-06-27 02:24:19 +00:00
Filippos Karapetis
137862b00b Add support for compressed digital music in ITE
svn-id: r27734
2007-06-26 23:40:22 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots
svn-id: r27024
2007-05-30 21:56:52 +00:00
Max Horn
624b57db3a oops, openStreamFile of course uses milliseconds, not frames, for the playback offsets/durations
svn-id: r26475
2007-04-14 18:44:15 +00:00