libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-08 02:42:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
24,807 Commits 5 Branches 5 Tags 1.8 GiB
16066fa3e7
Commit Graph

1256 Commits

Author SHA1 Message Date
Paweł Kołodziejski
62d4b44502 revert code to fade out first region if jump hit 
svn-id: r30566
 2008-01-19 17:13:53 +00:00
Paweł Kołodziejski
72d59da6cb missed setting trackId while starSound, 
added more debug output,
verification of jump code, it might have regressions

svn-id: r30565
 2008-01-19 16:06:20 +00:00
Paweł Kołodziejski
00de511335 fixed support for compressed streams in dimuse 
svn-id: r30564
 2008-01-19 13:26:53 +00:00
Paweł Kołodziejski
2671e5083c malloc -> new, free -> delete, added few asserts 
svn-id: r30561
 2008-01-19 11:14:28 +00:00
Paweł Kołodziejski
f0e131c9c3 fixed, it might overflow int32 
svn-id: r30560
 2008-01-19 10:58:43 +00:00
Max Horn
eb03de63bc iMuse Digital: Moved track & table definition from dimuse.h into separate header files 
svn-id: r30550
 2008-01-18 17:08:53 +00:00
Max Horn
c2d1554c7d Don't hardcode value for which we have wonderful and nice constants defined ;) 
svn-id: r30549
 2008-01-18 16:38:11 +00:00
Paweł Kołodziejski
d85e148f4f restore TrackId meaning 
svn-id: r30541
 2008-01-17 22:55:22 +00:00
Paweł Kołodziejski
9a699c9705 reduction a bit of code 
svn-id: r30538
 2008-01-17 21:46:17 +00:00
Paweł Kołodziejski
51ad8e29be fixed regression in allocSlot in dimuse, that fix bug #1874045 
svn-id: r30536
 2008-01-17 21:06:29 +00:00
Paweł Kołodziejski
0db783608b forgot disable that too 
svn-id: r30522
 2008-01-16 22:24:23 +00:00
Paweł Kołodziejski
bd32e7a6b0 experimental seek in compressed streams in dimuse in time ms resolution 
svn-id: r30521
 2008-01-16 22:20:34 +00:00
Paweł Kołodziejski
6b33041172 ops 
svn-id: r30519
 2008-01-16 20:03:54 +00:00
Paweł Kołodziejski
bb2c102cbb clarify warning 
svn-id: r30518
 2008-01-16 20:01:35 +00:00
Torbjörn Andersson
fe12cf8096 Fixed bad memory access. (Wrong index variable when reading sound->marker[].) 
svn-id: r30506
 2008-01-15 21:56:53 +00:00
Torbjörn Andersson
08f1357451 Use scumm_stricmp() instead of plain stricmp(). 
svn-id: r30505
 2008-01-15 21:46:12 +00:00
Paweł Kołodziejski
552353663d ops 
svn-id: r30504
 2008-01-15 21:38:06 +00:00
Paweł Kołodziejski
6bb2f44472 implement dimuse transition 12, not tested yet 
svn-id: r30503
 2008-01-15 21:35:03 +00:00
Torbjörn Andersson
8935c574d5 Fixed warnings. 
svn-id: r30502
 2008-01-15 20:36:54 +00:00
Torbjörn Andersson
5dc2caa307 Since the mixer uses 'delete' to free memory, we should allocate it with 'new'. 
I don't know if I got all cases, but I no longer get any Valgrind warnings at
the beginning of CoMI when using the original sound/music files.

svn-id: r30501
 2008-01-15 20:30:48 +00:00
Paweł Kołodziejski
d0e5df5bfa ops 
svn-id: r30500
 2008-01-15 20:11:28 +00:00
Paweł Kołodziejski
c3d4abe4b7 fix last commit to release, and add version 2 fallback for compressed files 
svn-id: r30499
 2008-01-15 20:09:56 +00:00
Torbjörn Andersson
173988960b Initialise _lastTableWidth. (Fixes Valgrind warning.) 
svn-id: r30497
 2008-01-15 20:06:41 +00:00
Paweł Kołodziejski
75099c6c20 forgot release string in the 'marker' 
svn-id: r30495
 2008-01-15 19:34:35 +00:00
Paweł Kołodziejski
4b9d2e9370 implement loading markers "exit". dumped version 3 for compressed bun files, compress tools are not ready 
svn-id: r30494
 2008-01-15 12:51:26 +00:00
Paweł Kołodziejski
86714835f1 back to previous way of copying stream, so it continue old stream 
svn-id: r30491
 2008-01-15 01:35:05 +00:00
Paweł Kołodziejski
9639666629 if track sound data is compressed reset data offset to beginning of region. we need implement seek in stream anyway or drop support 
svn-id: r30490
 2008-01-15 00:37:37 +00:00
Paweł Kołodziejski
f433c62112 implement force flush old fadeTrack. fixed trackId in new fadeTrack, it wasn't set properly, caused switching regions. 
svn-id: r30489
 2008-01-14 23:41:42 +00:00
Paweł Kołodziejski
8ada12d3d8 revert last experimental dimuse change, force flush 
svn-id: r30488
 2008-01-14 21:42:39 +00:00
Paweł Kołodziejski
6992238026 experimental force flush fade track if it's in use 
svn-id: r30487
 2008-01-14 20:35:58 +00:00
Paweł Kołodziejski
c36b44878a put 'break' here too, only one music in non fade tracks allowed 
svn-id: r30486
 2008-01-14 20:17:19 +00:00
Paweł Kołodziejski
f2f0d084e7 i forgot 'break' in the loop 
svn-id: r30485
 2008-01-14 20:12:35 +00:00
Paweł Kołodziejski
f15b41596b implement special case for playing music with beginning offset where other one stopped 
svn-id: r30483
 2008-01-14 17:26:49 +00:00
Paweł Kołodziejski
5870bebd6d fixed setting hookId for music, it doesn't worked before 
svn-id: r30481
 2008-01-14 14:48:35 +00:00
Paweł Kołodziejski
a6f8e5c89a correction fade out music times in comi demo 
svn-id: r30480
 2008-01-13 23:48:56 +00:00
Paweł Kołodziejski
758c4b1655 not need call refreshScripts in demo version of comi 
svn-id: r30479
 2008-01-13 23:44:52 +00:00
Torbjörn Andersson
9948b667ba Indentation. 
svn-id: r30477
 2008-01-13 22:16:46 +00:00
Torbjörn Andersson
7b15433572 Removed unnecessary semi-colons. 
svn-id: r30476
 2008-01-13 22:12:35 +00:00
Paweł Kołodziejski
16717ce5e1 revert updateFadeMusicTrack 
svn-id: r30475
 2008-01-13 22:02:27 +00:00
Paweł Kołodziejski
bf07f977e2 revert experimental hack 
svn-id: r30466
 2008-01-13 01:08:22 +00:00
Paweł Kołodziejski
9483400812 fixed fadeOutMusic in transitions 
svn-id: r30465
 2008-01-13 01:03:15 +00:00
Paweł Kołodziejski
d27c118acc additional missing stoppingSequence to music transitions. 
svn-id: r30464
 2008-01-13 00:15:43 +00:00
Paweł Kołodziejski
6b34fcc2b4 added missing stoppingSequence to music transitions. still i'm not sure if it trigger properly in our imuse implementation 
svn-id: r30463
 2008-01-13 00:10:30 +00:00
Paweł Kołodziejski
ae9e25b30f refreshScripts should check for music state not sequence. it will create regressions in comi :) that part need more investigation. 
svn-id: r30462
 2008-01-12 23:54:19 +00:00
Paweł Kołodziejski
68f41bd71b seqId 4 should pass fadeout music not silence ignore 
svn-id: r30461
 2008-01-12 23:30:07 +00:00
Torbjörn Andersson
b97c9ef136 Work around bug #1324106 again. Apparently, I was mistaken the other day when I 
said the timer changes fixed it. This time, I've made the workaround a bit
simpler to understand, though.

svn-id: r30429
 2008-01-11 22:59:13 +00:00
Max Horn
6bc4a9a35e The SCUMM timer fix makes the workaround for bug #1324106 obsolete 
svn-id: r30419
 2008-01-11 22:13:34 +00:00
Max Horn
3e980392d5 Fixed bug #1861582 (COMI: Banjo duel seems harder than in the original) by changing the way SCUMM updates the timer vars (matches disasm now). Beware of regressions\! 
svn-id: r30418
 2008-01-11 22:12:06 +00:00
Max Horn
84e5398b1c store the disk sounds/music were actually *loaded* from, instead of the 'current' disk 
svn-id: r30310
 2008-01-06 16:02:38 +00:00
Max Horn
690d38cfc4 Unify mixer pan/vol setting code 
svn-id: r30308
 2008-01-06 14:59:46 +00:00
Max Horn
79ba9686eb Fix bug #1864932: COMI: Game crashes on difficulty selection screen 
svn-id: r30298
 2008-01-06 13:54:19 +00:00
Travis Howell
743858b097 Fix regression in Let's Explore the Farm with Buzzy demo. 
svn-id: r30296
 2008-01-06 13:27:42 +00:00
Travis Howell
f31b835fda Resort a few cases and opcodes in HE code. 
svn-id: r30289
 2008-01-06 06:21:04 +00:00
Filippos Karapetis
71980d0fbd Fixed compilation 
svn-id: r30285
 2008-01-06 00:28:36 +00:00
Max Horn
1194495ad3 cleanup 
svn-id: r30284
 2008-01-06 00:09:05 +00:00
Max Horn
e52591ac0e clarify comment 
svn-id: r30283
 2008-01-06 00:00:53 +00:00
Max Horn
d340e77f24 Made IMuseDigital::stopSound use flushTrack instead of setting track->toBeRemoved = true; cleanup in flushTrack() 
svn-id: r30282
 2008-01-05 23:58:27 +00:00
Torbjörn Andersson
273c5b5cf1 Removed unnecessary newline in debug message. 
svn-id: r30279
 2008-01-05 23:57:12 +00:00
Max Horn
1d34ce3baa Let the audio mixer take care of (i.e. dispose) the Track::stream object, too 
svn-id: r30277
 2008-01-05 23:53:28 +00:00
Max Horn
ef9dac103f stop low priority sounds which we want to override immediatly 
svn-id: r30275
 2008-01-05 23:44:05 +00:00
Max Horn
dce7a57cad VAR_TMR_4 has a special role from VAR_TMR_1 till 3 (in particular, it exists across far more SCUMM versions), so rename it to VAR_TIMER_TOTAL 
svn-id: r30271
 2008-01-05 23:05:16 +00:00
Max Horn
56ad5f493e Play SOU data instantly, not slightly delayed -> allows us to get rid of Track::streamSou & Track::mixerStreamRunning (have not yet removed the latter to avoid introducing a new savegame version) 
svn-id: r30268
 2008-01-05 22:57:36 +00:00
Max Horn
7ebdffb0cd Seems IMuseDigital::cloneToFadeOutTrack was using the wrong pan value all the time 
svn-id: r30267
 2008-01-05 22:45:35 +00:00
Max Horn
f68d84b54f Moved some code which was being duplicated to methods of class Track 
svn-id: r30266
 2008-01-05 22:44:39 +00:00
Max Horn
923ad313dc Let the audio mixer delete the streamSou object 
svn-id: r30265
 2008-01-05 22:35:30 +00:00
Max Horn
3f6b2c97b7 When loading and before starting an iMuse Digitial track, reset it completely to zero 
svn-id: r30262
 2008-01-05 20:59:33 +00:00
Max Horn
1f364f54e7 Clarified some iMuse Digital code as I understand it 
svn-id: r30260
 2008-01-05 20:52:42 +00:00
Max Horn
077026e088 As far as I can tell / understand, IMuseDigital::getSoundStatus can safely just use isSoundHandleActive for both stream and streamSou (warning: might cause regressions) 
svn-id: r30258
 2008-01-05 20:50:10 +00:00
Max Horn
8b12998c72 Use souStreamUsed to distinguish between 'stream' and 'streamSou' usage 
svn-id: r30257
 2008-01-05 20:49:18 +00:00
Max Horn
c9a8d02f6e Do not busy wait in IMuseDigital::allocSlot on *any* platform 
svn-id: r30255
 2008-01-05 20:43:07 +00:00
Torbjörn Andersson
aa38a8eb96 Fixed regression that would cause ScummEngine_v80he to leak polygon slots at an 
alarming rate.

svn-id: r30249
 2008-01-05 17:43:33 +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
Torbjörn Andersson
11efbda297 Made the Loom Roland music fix a bit more specific. Only one song in EGA Loom 
is affected and, according to Kirben, none in Monkey Island 1 VGA. I don't know
about Monkey Island 1 EGA, but I've assumed it uses the same music as the VGA
versions.

svn-id: r30202
 2008-01-03 19:43:43 +00:00
Travis Howell
6c6a2a57b5 Fix endian issue in checkArrayLimits(). 
svn-id: r30178
 2008-01-03 03:34:25 +00:00
Travis Howell
639929a09e Fix endian issue in redimArray. 
svn-id: r30176
 2008-01-03 03:20:32 +00:00
Eugene Sandulenko
0f6246bab8 Fix for bug #896489: "DIG: Missing subtitles when talking to Brink" 
svn-id: r30167
 2008-01-02 21:15:23 +00:00
Eugene Sandulenko
040a7b54fa Oops. Moved too much code in the last commit. 
svn-id: r30162
 2008-01-02 18:59:15 +00:00
Eugene Sandulenko
2d94049bea Workaround for bug #1804278: "MONKEY: Mouse is invisible after loading" 
svn-id: r30160
 2008-01-02 18:44:20 +00:00
Eugene Sandulenko
a4cbfa354b Fix bug #1846886: "PUTTZOO: Windows version cursor/pointer drawn wrong" 
svn-id: r30154
 2008-01-02 17:33:57 +00:00
Eugene Sandulenko
082bed8898 Narrow fix for bug #1206994 only to FOA. 
svn-id: r30149
 2008-01-02 13:11:26 +00:00
Eugene Sandulenko
312346bdb4 Fix for bug #1206994: "FOA AMIGA: Black cursor and text in Dig Site" 
svn-id: r30147
 2008-01-02 12:58:18 +00:00
Travis Howell
01c611385e Fix regression when skipping cutscenes in Maniac Mansion (C64). 
svn-id: r30144
 2008-01-02 11:25:17 +00:00
Travis Howell
273ce5d924 Correct verbs names in German version of Maniac Mansion (C64). 
svn-id: r30141
 2008-01-02 11:11:09 +00:00
Torbjörn Andersson
f72b094c69 When fixing the EGA Loom Roland music, I accidentally broke music looping. 
Should be fixed again now.

svn-id: r30135
 2008-01-02 00:08:27 +00:00
Torbjörn Andersson
46368eac5f Added what I hope is the proper fix for bug #1498785 ("LOOM: Unknown Roland 
MIDI music events"). It would probably be safe to commit to the 0.11 branch,
but I don't know for sure which games would be affected other than EGA Loom.

svn-id: r30132
 2008-01-01 23:30:29 +00:00
Max Horn
f4f963800d Fix a long standing bug in playComiMusic (no idea whether this caused any bugs, though) 
svn-id: r30128
 2008-01-01 18:08:12 +00:00
Eugene Sandulenko
308b02f4ca Fix for bug #1766072: MANIACNES: Music Doesn't Start On Load Game 
svn-id: r30122
 2008-01-01 16:26:04 +00:00
Eugene Sandulenko
e5e53a0017 Split out charset font data for easier maintenance 
svn-id: r30121
 2008-01-01 15:36:50 +00:00
Eugene Sandulenko
43a18a4cdd Fix bug #1811732: "MANIAC C64: German version not supported" 
svn-id: r30119
 2008-01-01 15:25:12 +00:00
Paweł Kołodziejski
604bf6fff3 experimental change to fade out to 120 ms instead from table for state music with opcode 3 when few songs have the same attribute value 
svn-id: r30118
 2008-01-01 15:08:20 +00:00
Paweł Kołodziejski
cd84daf7f8 experimental change to prevent play first region with fade out if jump opcode is attached 
svn-id: r30117
 2008-01-01 15:05:27 +00:00
Max Horn
0ad70c7d84 SCUMM: Moved tick duration into a constant 
svn-id: r30112
 2008-01-01 11:41:47 +00:00
Max Horn
305f60e0db Patch #1839861 (Possible workaround for bugs related to cloneToFadeOutTrack): Fixes bug #1848399 and apparently also #1527274 & #1763227 
svn-id: r30111
 2008-01-01 11:27:29 +00:00
Max Horn
be11104d70 Removed obsolete _insaneRunning flag 
svn-id: r30107
 2007-12-31 16:34:30 +00:00
Paweł Kołodziejski
08020444f6 verified differences in play music code of the dig and comi 
svn-id: r30103
 2007-12-31 13:26:29 +00:00
Max Horn
a826cd36dd cleanup 
svn-id: r30102
 2007-12-31 13:05:32 +00:00
Oystein Eftevaag
1c88ab2c47 Enabling the SMUSH/sound ARM optimizations for the iPhone. Converting any numerical expressions in the asm to absolute values (moving the expression to comments) since the iPhone assembler can't handle them, and prepending an underscore to the exported symbols (with some preprocessor magic similar to the hq3x asm for handle ports where it's not needed) 
svn-id: r30093
 2007-12-31 01:50:18 +00:00
Torbjörn Andersson
a38fa007bb I thought only Full Throttle used the VAR_BLAST_ABOVE_TEXT variable, but I see 
now that it's defined for v8 games as well, so call processUpperActors() from
that case too, just to be safe.

svn-id: r30091
 2007-12-31 01:20:24 +00:00
Torbjörn Andersson
41f29f0504 Draw subtitles over the verb coin in CoMI, not under. This is noticeable early 
in the game, when Murray is talking to himself. I've verified this against the
behaviour of the original interpreter. (Should this go into 0.11 as well?)

svn-id: r30088
 2007-12-30 22:22:38 +00:00
Max Horn
1489235f8e Ooops, this was not supposed to be commited 
svn-id: r30087
 2007-12-30 22:10:24 +00:00