Commit Graph

423 Commits

Author SHA1 Message Date
Torbjörn Andersson
05e0542452 More cleanups and renamings: _sfxSecondByteOfSong -> _sfxPriority
Added some comments on the strange but probably harmless things going on in
playSoundEffect()

svn-id: r21340
2006-03-16 23:22:23 +00:00
Torbjörn Andersson
1d8e206333 Went through callbacks 51, 52 and 53, comparing them to LordHoto's annotated
disassembly. I think they're correct now, and a bit easier to read. My old
comments were wrong, too.

I think they are for manipulating the Adlib rhythm section volumes. I'm not
sure the Kyra music ever uses the Adlib rhythm section.

svn-id: r21339
2006-03-16 20:52:36 +00:00
Gregory Montoir
61a5fb7064 - added defines to handle the different mouse cursors
- revised the way NUM_MAX_PARTDATA and NUM_MAX_ANIMDATA are used
- renamed some variables
- constify'ed function arguments
- minor cleanup

svn-id: r21338
2006-03-16 20:29:07 +00:00
Torbjörn Andersson
99c34b0377 We have several functions where we need to find the pointer to a program or an
instrument. These are found using the lookup tables in _soundData on offsets 0
and 500 respectively. Added helper functions for that, which makes the code a
lot tidier. Particularly in update_setupRhythmSection(), where it's now much
clearer where it's getting all those "unk" values from.

Use the checkValue() function (which limits the "total level" to its valid
range) for the calculateOpLevel1() and 2() functions as well.

Renamed updateCallback16() to update_waitForEndOfProgram().

svn-id: r21337
2006-03-16 18:53:02 +00:00
Torbjörn Andersson
0182b46679 More renamings:
callbackOutput()   -> setupPrograms()
callbackProcess()  -> executePrograms()
updateCallback3()  -> update_setupProgram()

_unk4              -> _rhythmSection
updateCallback48() -> update_setupRhythmSection()
updateCallback49() -> update_playRhythmSection()
updateCallback50() -> update_removeRhythmSection()

svn-id: r21336
2006-03-16 18:01:14 +00:00
Torbjörn Andersson
8fcb38648d I don't know if it's our bug, or a bug in the original Kyra music driver, but
updateCallback3() would call unkOutput2(9) in at least one case. This is
obviously wrong because it a) reads outside _regOffsets[], and b) writes to
invalid Adlib registers.

Now unkOutput2() has the same safeguards as noteOff() already had, making
callbackOutput() and updateCallback3() even more similar.

svn-id: r21335
2006-03-16 17:39:23 +00:00
Johannes Schickel
fa38b770af Oops. removes some unneeded shifts and fixes now the feather bug.
svn-id: r21334
2006-03-16 17:37:34 +00:00
Torbjörn Andersson
f040ea1e82 Fixed some comments and made a couple of cleanups to make it a bit more clear
just how similar callbackOutput() and updateCallback3() are.

svn-id: r21333
2006-03-16 17:27:52 +00:00
Johannes Schickel
f1c9cd5726 - Fixes some gfx glitches (the falling feather and the falling leaf now have correct restored background)
- Fixes brandon width value after loading (removes gfx glitch while talking with the tree)

svn-id: r21332
2006-03-16 16:35:46 +00:00
Travis Howell
79b5c11ee2 Minor cleanup
svn-id: r21331
2006-03-16 12:12:05 +00:00
Travis Howell
60b66f31df Update comment, to make sense
svn-id: r21330
2006-03-16 12:08:25 +00:00
Travis Howell
1880843744 Add comment about future saveLoad changes C64 maniac
svn-id: r21329
2006-03-16 12:04:52 +00:00
Travis Howell
479a1b24c3 Cleanup
svn-id: r21328
2006-03-16 10:30:59 +00:00
Travis Howell
008b681dac Cleanup
svn-id: r21327
2006-03-16 07:08:05 +00:00
Travis Howell
ec05842572 Remove duplicate fcs field
svn-id: r21326
2006-03-16 05:41:39 +00:00
Travis Howell
5b3b3b21e3 Rename get draw buffer functions
svn-id: r21325
2006-03-16 04:10:34 +00:00
Travis Howell
0843260c29 Rename flags used for drawing images
svn-id: r21324
2006-03-16 03:48:42 +00:00
Travis Howell
c821b20400 Remove unused unlock draw surface functions
svn-id: r21323
2006-03-16 03:19:55 +00:00
Travis Howell
0ce2110306 Add scaling code stub for FF
svn-id: r21322
2006-03-16 03:15:05 +00:00
Gregory Montoir
8f38cb6ff3 added mouse cursors
svn-id: r21321
2006-03-15 22:34:46 +00:00
Johannes Schickel
b46236ed71 - removes a wrong space in debugC calls in screen.cpp
- implements cmd_brandonToStoneSequence and cmd_pauseMusicSeconds

svn-id: r21320
2006-03-15 21:59:07 +00:00
Torbjörn Andersson
056fbe4855 Fixed typo in debug message.
svn-id: r21317
2006-03-15 15:46:25 +00:00
Torbjörn Andersson
dc2143e6cf This is a bit of a hack: Before showing the mouse cursor, take care of any
pending events so that the it won't have to do a little dance, catching up,
every time you enter a room.

svn-id: r21316
2006-03-15 15:37:42 +00:00
Torbjörn Andersson
5d0ac7d57c On second thought, that comment is probably not necessary.
svn-id: r21315
2006-03-15 15:35:52 +00:00
Torbjörn Andersson
286434c88d Added mouse wheel scrolling to save/restore dialogs.
svn-id: r21314
2006-03-15 13:32:35 +00:00
Torbjörn Andersson
c473ded022 Revert previous change. I'm told some backends don't draw the mouse cursor
automatically, for some reason.

svn-id: r21312
2006-03-15 12:44:41 +00:00
Torbjörn Andersson
52b3c957fe The backend handled cursor drawing -- no need to update the screen manually.
svn-id: r21311
2006-03-15 12:32:07 +00:00
Paul Gilbert
15d4593412 In progress work on disassembling player tick/actions handler method
svn-id: r21310
2006-03-15 11:37:12 +00:00
Travis Howell
34b89a3258 Correct VAR_OVERRIDE settings in override opcodes
svn-id: r21307
2006-03-15 06:29:28 +00:00
Travis Howell
cc8796248d Minor cleanup
svn-id: r21306
2006-03-15 05:59:30 +00:00
Torbjörn Andersson
1f603fdd98 Cleanup.
svn-id: r21304
2006-03-14 23:39:42 +00:00
Torbjörn Andersson
408b9a41ee Gave the loadBitmap debug message its old debug level back. (I.e. made it less
noisy.)

svn-id: r21303
2006-03-14 23:29:29 +00:00
Torbjörn Andersson
839b5d3e86 Added workaround in FMOPL for the pathological case where a note was turned off
while still at the very beginning of the "attack" phase. This is the very
lowest point on the attack curve, yet it would continue from the beginning of
the release curve, i.e. its very highest point. This is what caused Kyra to
often play low-frequency notes at the very beginning of a new song. (That, and
a truly bizarre function for initialising the channels.)

The proper fix would be to locate the correct point on the release curve and
continue from there. For now, though, only handle the trivial case.

svn-id: r21302
2006-03-14 23:01:44 +00:00
Johannes Schickel
c12a5a35be - Deletes wrong spaces in debugC calls in resource.cpp
- Adds support for amiga .pak files (and a filelist)

svn-id: r21299
2006-03-14 19:48:08 +00:00
Torbjörn Andersson
ee6f7626bf Fix typo in comment.
svn-id: r21298
2006-03-14 19:08:09 +00:00
Max Horn
e6f329e3fc To the best of my knowledge, it's really 'C64' and not 'C-64'
svn-id: r21296
2006-03-14 15:36:04 +00:00
Max Horn
f319865837 Merged two consecutive 'if's with identical condition
svn-id: r21295
2006-03-14 15:25:29 +00:00
Johannes Schickel
fa4471fae4 - Fixes a bug in update_primaryEffect (wrong sound from the birds outside brandons home is fixed with this)
- Changes _tempo, tempo, position, unk41, unk32, unk18, unk19, _unkValue3 to unsigned (should be correct this time)

svn-id: r21293
2006-03-14 15:15:04 +00:00
Johannes Schickel
a68e8c2db9 Fixes wrong sound then showing the death screen.
svn-id: r21290
2006-03-14 14:25:13 +00:00
Travis Howell
68bc8ea52e Update comment about use of procC64 by C-64 version
svn-id: r21289
2006-03-14 14:10:33 +00:00
Max Horn
0cc41c7cbb Renamed & documented the LIGHTMODE flags
svn-id: r21288
2006-03-14 14:06:44 +00:00
Johannes Schickel
9673573bec Fixes _unkTables, I made a mistake while extracting those last time it seems.
svn-id: r21287
2006-03-14 13:37:15 +00:00
Max Horn
ee087df293 Enhance the new getCurrentLights to work for V6+ games, too, making it possible to remove several special cases throughout the code
svn-id: r21286
2006-03-14 13:36:13 +00:00
Max Horn
ab1694aef9 Compute the full game title when detecting games & creating engine instances, and also use that for savegames (all for debugging)
svn-id: r21285
2006-03-14 13:28:28 +00:00
Max Horn
d68b64184e Add a virtual destructor to class SoundDriver of the CINE engine (fixes a warning)
svn-id: r21284
2006-03-14 13:26:06 +00:00
Travis Howell
4f10a71b98 An actor is completely reset by showActor() in SCUMM1-2 games. Fixes bug #902391
svn-id: r21283
2006-03-14 13:16:11 +00:00
Travis Howell
4b1e03f37a Remove unused var, to prevent compiler warning
svn-id: r21281
2006-03-14 12:19:17 +00:00
Travis Howell
c822f49676 Remove unused vars, to prevent compiler warnings
svn-id: r21279
2006-03-14 12:13:27 +00:00
Travis Howell
3d0e69a495 Adjust one last spot, for previous VAR_CURRENT_LIGHTS changes
svn-id: r21278
2006-03-14 12:11:16 +00:00
Travis Howell
be7a28f65e Avoid all scumm var conflicts in C64 maniac
svn-id: r21277
2006-03-14 12:06:37 +00:00