Commit Graph

753 Commits

Author SHA1 Message Date
Torbjörn Andersson
812dd72207 Cleanup.
svn-id: r21681
2006-04-08 07:16:14 +00:00
Travis Howell
b596065122 Fixes for oracle in FF and cleanup
svn-id: r21680
2006-04-08 07:13:07 +00:00
Torbjörn Andersson
fce6bf5142 Added helper functions getNextByte(), getNextWord() and getNextString() to make
the opcode decoder a bit easier to read. The same change could be made to
decompileScript() as well, but I have a feeling that this function should be
made a standalone tool instead. Particularly considering how much memory it
currently uses.

svn-id: r21679
2006-04-08 06:47:58 +00:00
Travis Howell
0bf0772e9c Remove debug leftover
svn-id: r21678
2006-04-08 00:28:36 +00:00
Travis Howell
e951f908f2 Fix load game display of oracle in FF
svn-id: r21677
2006-04-08 00:24:46 +00:00
Travis Howell
daa60166fe Remove excess ; in scrollEvent()
svn-id: r21676
2006-04-08 00:19:04 +00:00
Travis Howell
9a7b16e4d3 Add initial support for vertical scrolling in FF
svn-id: r21675
2006-04-08 00:12:16 +00:00
Max Horn
9e5950e704 New Loom version reported by Peter Eckerlein
svn-id: r21673
2006-04-07 22:46:59 +00:00
Max Horn
1cda8e10f0 Finally got rid of multiple_versions_md5_settings in favor of extra_versions
svn-id: r21672
2006-04-07 22:40:45 +00:00
Travis Howell
65a3f88454 Minor cleanup
svn-id: r21671
2006-04-07 14:40:33 +00:00
Travis Howell
0c496f92a9 Cleanup and split scrolling code
svn-id: r21670
2006-04-07 14:27:28 +00:00
Travis Howell
3b1710c7f5 Add scrolling adjustments when drawing overlay in FF
svn-id: r21669
2006-04-07 13:39:59 +00:00
Travis Howell
f51575563e Add scrolling code for oracle in FF
svn-id: r21668
2006-04-07 12:57:40 +00:00
Torbjörn Andersson
94f2174522 Cleanup of yesterday's changes. The opcode functions no longer need to take any
parameters.

svn-id: r21662
2006-04-07 09:37:44 +00:00
Travis Howell
c0e984a80a Fix some horizontal scrolling issues in FF
svn-id: r21661
2006-04-07 09:04:36 +00:00
Travis Howell
e806e891e3 Sprite is always set to 1 in o_printStr() and o1_scnTxtLongText() for FF. Fixes wait timeouts in holomail.
svn-id: r21660
2006-04-07 03:30:52 +00:00
Travis Howell
50983a3721 Fix subtitle output in FF
svn-id: r21659
2006-04-07 03:03:20 +00:00
Torbjörn Andersson
26587faff7 This may look like a less good way of transforming three bits of colour into
eight bits. Perhaps it is. But it seems to match the output from DOSbox when
running Future Wars, and I tend to trust DOSbox in such matters.

svn-id: r21658
2006-04-07 02:02:06 +00:00
Travis Howell
c6c86ff172 Ooops, cut and paste error in printScreenText()
svn-id: r21657
2006-04-07 01:48:54 +00:00
Travis Howell
38bf0af540 Add some work on text output in FF
svn-id: r21656
2006-04-07 01:46:43 +00:00
Torbjörn Andersson
15cc2e628d Small cleanup.
svn-id: r21655
2006-04-07 01:04:09 +00:00
Torbjörn Andersson
997c023095 Added opcode comments and stubs based on information sev provided me with. All
stubs should print a warning, though I may have missed some.

svn-id: r21654
2006-04-06 22:33:23 +00:00
Torbjörn Andersson
0f3aeb09ed Fixed another "worked in cinE, broken in ScummVM" bug that made it impossible
to interact with the objects in the second room. We were passing the wrong
pointer to gfxConvertSpriteToRaw() in loadCt(), causing page3Raw (which I
believe is an "image" mapping screen coordinates to objects) to be wrong.

svn-id: r21646
2006-04-06 20:57:58 +00:00
Torbjörn Andersson
c07f186502 We don't need to convert mono data to stereo: Simply tell the mixer that we're
generating mono data, and let it worry about how to handle it.

svn-id: r21645
2006-04-06 18:55:39 +00:00
Torbjörn Andersson
1fa1f9520d Split the opcodes into separate functions, and use an array of function
pointers for decoding them, like we do in most other engines. And I just want
to say that this is the second biggest opcode table I've ever seen!

svn-id: r21644
2006-04-06 17:56:41 +00:00
Travis Howell
52d1d9ab8e Revert structure size changes, size expanded in readItemChildren()
svn-id: r21642
2006-04-06 14:30:41 +00:00
Travis Howell
dc73f361e1 Rename structures and correct array sizes
svn-id: r21641
2006-04-06 14:01:52 +00:00
Travis Howell
87de34a8d5 Cleanup
svn-id: r21640
2006-04-06 10:47:37 +00:00
Travis Howell
dd9f4d9f99 Remove duplicate code in last commit and minor fixes for FF
svn-id: r21639
2006-04-06 08:43:20 +00:00
Travis Howell
3023f6f76e Minor cleanup and fixes for FF
svn-id: r21638
2006-04-06 08:21:44 +00:00
Travis Howell
7e1618e329 Add some work on scrolling in FF
svn-id: r21637
2006-04-06 06:14:47 +00:00
Travis Howell
346486ce46 Fix inventory hitareas in FF
svn-id: r21636
2006-04-06 01:37:29 +00:00
Travis Howell
d967db266c Add more icon differences in FF and cleanup
svn-id: r21635
2006-04-06 00:54:26 +00:00
Torbjörn Andersson
95eb460417 Use English strings for the system and confirm menus, to be consistent with the
command menu. There are still some other hard-coded French messages in the code,
though.

svn-id: r21634
2006-04-05 21:20:04 +00:00
Torbjörn Andersson
738aecd57e Fixed bug in loadObject() where the data pointer was only advanced for the
objects that were actually loaded from the file, not the ones that were
skipped. This bug was introduced when porting cinE to the ScummVM framework,
and would cause Future Wars to crash after the copy protection screen. Quite
possibly other bugs, as well.

svn-id: r21632
2006-04-05 20:11:00 +00:00
Torbjörn Andersson
48c46eed6b I don't think assert(0) is a particularly helpful error message...
svn-id: r21630
2006-04-05 13:06:03 +00:00
Eugene Sandulenko
58c7f8d6b1 Fix character spacing in text blurbs.
svn-id: r21629
2006-04-05 11:44:46 +00:00
Travis Howell
935ea28e7a Renames structures and other cleanup
svn-id: r21626
2006-04-05 02:45:28 +00:00
Torbjörn Andersson
0bdc3b0738 Added SVN keywords, and removed inclusion of <sys/stat.h>.
svn-id: r21623
2006-04-05 00:46:27 +00:00
Torbjörn Andersson
7bcd0ba4dc Use the setBitFlag() and getBitFlag() functions, instead of manipulating
_bitArray[] directly. This kind of change is, of course, rather error-prone. I
hope I haven't introduced any regressions.

svn-id: r21622
2006-04-05 00:37:42 +00:00
Travis Howell
ab49a04331 Add back lost bitFlag check in listSaveGames()
svn-id: r21621
2006-04-05 00:24:53 +00:00
Travis Howell
fba527651f Fix regression in Simon2, a byte was lost when clearing or setting marks
svn-id: r21619
2006-04-05 00:11:17 +00:00
Travis Howell
15f4249978 Add inventory array differences in FF and minor cleanup
svn-id: r21613
2006-04-04 23:29:24 +00:00
Eugene Sandulenko
8b995a8c52 Fix freddicove detection.
svn-id: r21610
2006-04-04 23:05:06 +00:00
Eugene Sandulenko
8fa9bd6728 Removed extra exclamation marks in warning() calls as well.
svn-id: r21608
2006-04-04 22:21:10 +00:00
Eugene Sandulenko
d292c0ec55 Since our debug() adds an exclamation mark at the message end, remove
it in several calls to avoid duplication!!11!

svn-id: r21607
2006-04-04 22:04:51 +00:00
Eugene Sandulenko
f5c4634ecd Fix md5 for German IHNM
svn-id: r21606
2006-04-04 22:00:16 +00:00
Lars Persson
595a48a87e Small updates to intiate variable and member visibility.
svn-id: r21604
2006-04-04 21:32:19 +00:00
Max Horn
7ba17e0574 Paranoia change: catch invalid 'method' value in generateDetectName
svn-id: r21602
2006-04-04 21:18:15 +00:00
Paul Gilbert
4ee3298550 Completed disassembly of the Lure pathfinding code
svn-id: r21593
2006-04-04 11:53:45 +00:00
Travis Howell
a4a3239715 o_printStr() always uses box1 for FF
svn-id: r21592
2006-04-04 11:53:13 +00:00
Travis Howell
778a528df3 _noRightClick got reversed in setVerb for FF
svn-id: r21591
2006-04-04 11:28:37 +00:00
Travis Howell
cc75c68090 Add skipSpeech difference in FF
svn-id: r21590
2006-04-04 11:06:48 +00:00
Travis Howell
49dc2622dd Add verb codes differences in FF
svn-id: r21589
2006-04-04 10:12:22 +00:00
Torbjörn Andersson
cb513de999 Added stub for FF right-clicking.
svn-id: r21588
2006-04-04 08:50:35 +00:00
Travis Howell
f5943d7e7f Adjust clear/restore window for FF
svn-id: r21587
2006-04-04 07:50:04 +00:00
Travis Howell
c21b81f5e5 More work on oracle in FF
svn-id: r21586
2006-04-04 07:34:48 +00:00
Torbjörn Andersson
ad5cac9eb4 Work around glitchy drawing of the Oracle icon, after discussing with Kirben.
But it's still unclear *why* the first 16 bytes should be skipped; hence the
Big Scary Comment (tm).

svn-id: r21585
2006-04-04 06:25:50 +00:00
Travis Howell
69d3fb7ef8 Remove debug left over
svn-id: r21584
2006-04-04 02:41:45 +00:00
Travis Howell
0ac5739ae2 More work on oracle in FF
svn-id: r21583
2006-04-04 01:38:53 +00:00
Travis Howell
3627056116 Add initial support for oracle icons in FF
svn-id: r21579
2006-04-03 14:40:07 +00:00
Max Horn
41f71238f2 Removing outdated and obsolete comment
svn-id: r21578
2006-04-03 12:11:04 +00:00
Max Horn
b9acc7a285 Since GF_HE_CURSORLESS is gone now, we can remove this special case for 'lost'
svn-id: r21577
2006-04-03 12:09:54 +00:00
Travis Howell
0e9b4ab17c GF_HE_CURSORLESS feature flag not required, since HE games always set a default cursor too.
svn-id: r21576
2006-04-03 11:35:02 +00:00
Max Horn
9f06a3bde6 Added variant string for some HE games
svn-id: r21574
2006-04-03 11:12:26 +00:00
Torbjörn Andersson
a55ebd5fb2 Merged d_draw.cpp and rdwin.cpp (what little remained of them) into screen.cpp.
svn-id: r21573
2006-04-03 09:54:05 +00:00
Torbjörn Andersson
80b3f9217d Don't try to copy str to _talkBuffer if str is pointing to _talkBuffer. Apart
from being unnecessary, the result of strcpy() on overlapping memory areas is
unpredictable.

svn-id: r21562
2006-04-02 18:58:07 +00:00
Max Horn
9217472f0e With this change, backends are now responsible for instantiating their OSystem class before calling scummvm_main (Note: PalmOS and Symbian are not yet converted, and won't work currently)
svn-id: r21557
2006-04-02 14:16:31 +00:00
Max Horn
3de55677b9 Typo
svn-id: r21540
2006-04-01 22:31:57 +00:00
Torbjörn Andersson
c4955466fd Simplified loading of startup.inf
svn-id: r21538
2006-04-01 21:56:10 +00:00
Torbjörn Andersson
d6f348638d Guard against too many entries in resource.inf, since there has been a TODO
comment about that (removed in the previous commit) since roughly forever.

svn-id: r21536
2006-04-01 21:55:41 +00:00
Torbjörn Andersson
f59d472155 Simplified the loading of resource.inf
svn-id: r21533
2006-04-01 21:42:11 +00:00
Max Horn
8f691e51fa Removed superfluous addDefaultDirectory call, as well as two unused bad member vars
svn-id: r21532
2006-04-01 21:31:27 +00:00
Max Horn
49d63590ab Removing superfluous addDefaultDirectory call
svn-id: r21531
2006-04-01 21:30:06 +00:00
Max Horn
e390639dd8 Use extra_versions to compute ScummGameSettings (currently only compared to the value determined via multiple_versions_md5_settings but not actively used; requires more testing, in particular with HE games)
svn-id: r21530
2006-04-01 18:20:35 +00:00
Max Horn
ee62cd3c51 Generate an error when kGenAsIs is used with an unsupported platform, instead of silently continuing with a bogus _fileHandle (leading to odd crashes)
svn-id: r21528
2006-04-01 18:13:06 +00:00
Max Horn
0bb6d64064 A lot of code in sword1/router.cpp and sword2/router.cpp is virtually identical -- unified the two files in many places (but a lot more could be done, feel free to pick up and continue this work)
svn-id: r21526
2006-04-01 12:47:09 +00:00
Travis Howell
d10929b394 Always check array bounds are valid in HE games, matching original
svn-id: r21524
2006-04-01 12:26:50 +00:00
Max Horn
361572af2c Patch #1432378: BASS: Memory leak, patch included
svn-id: r21523
2006-04-01 11:25:08 +00:00
Travis Howell
7a81cc76e1 Fix painting and fridge magnet palette glitches in thinker1
svn-id: r21522
2006-04-01 06:38:47 +00:00
Travis Howell
c4349e88f7 Rename two WizParameters fields
svn-id: r21514
2006-03-31 13:06:23 +00:00
Eugene Sandulenko
0335bab074 Make corners of SCUMM load/save dialog round.
svn-id: r21513
2006-03-31 13:00:06 +00:00
Torbjörn Andersson
c26b762f48 Made readFileToMem() print a more useful error message than "File is not open"
if the file could not be opened.

svn-id: r21508
2006-03-31 06:42:56 +00:00
Travis Howell
f991b88da8 Fix skipping insane sequence in bundled Macintosh demo of FT
svn-id: r21507
2006-03-31 01:28:35 +00:00
Travis Howell
469b1420da Fix sound glitch in PC demo of FT
svn-id: r21506
2006-03-31 00:39:53 +00:00
Travis Howell
e504e814b1 Improve mine road in PC demo of FT
svn-id: r21505
2006-03-30 23:58:37 +00:00
Travis Howell
3e974d3604 Limit INSANE to existing enemies in PC demo of FT
svn-id: r21504
2006-03-30 13:47:18 +00:00
Travis Howell
1ec46bae37 Allow interactive mine road in PC version of FT demo
svn-id: r21503
2006-03-30 11:52:49 +00:00
Travis Howell
014dde3de3 Add missing check for invalid object number in getObjectData opcode
svn-id: r21501
2006-03-30 00:32:29 +00:00
Max Horn
8cdee5a931 Do not #include endian.h in scummsys.h (cuts down deps on endian.h from ~400 to ~250). Many greetings to eriktorbjorn, and have fun recompiling.
svn-id: r21500
2006-03-29 15:59:37 +00:00
Max Horn
0da5fb4c1c Alphabetical build order
svn-id: r21499
2006-03-29 15:51:13 +00:00
Travis Howell
506f33a025 Add opcode difference in FF
svn-id: r21497
2006-03-29 12:15:08 +00:00
Torbjörn Andersson
f6e6017d96 Added stubs for a couple of FF opcodes.
svn-id: r21495
2006-03-29 12:03:02 +00:00
Travis Howell
9c94670e22 Add another English version of Monkey Island for Macintosh
svn-id: r21483
2006-03-29 06:24:13 +00:00
Johannes Schickel
c09d1ea520 - Commits heaviliy modifed patch #1459951 ("KYRA: Combining MIDI music with Adlib sfx") (created a wrapper class for two different sound drivers instead of adding a new variable to the KyraEngine class and chaning stuff there)
- Prevents to play track 0 for non mt-32 midi devices (got ugly sound output with windows midi)

svn-id: r21479
2006-03-28 15:15:36 +00:00
Travis Howell
46270a5dd7 Update game detection code, with recent changes from SAGA engine
svn-id: r21478
2006-03-28 13:33:18 +00:00
Max Horn
9f93e5bb81 Renamed various container isEmpty() methods to empty() to match STL conventions
svn-id: r21472
2006-03-28 09:42:54 +00:00
Max Horn
950c3451a2 Removing bogus leftovers
svn-id: r21471
2006-03-28 09:37:50 +00:00
Paul Gilbert
b54d73d220 Further progress on disassembling pathfinding and support methods
svn-id: r21470
2006-03-27 21:32:43 +00:00
Johannes Schickel
518c7b871f Comments out unneeded code in enterNewScene (only used for cd audio version).
Fixes bug with stopping pegasus music before the animation finished.

svn-id: r21469
2006-03-27 18:20:19 +00:00
Andrew Kurushin
7191d474a4 improve game detection:
- start process speedup (remove already scanned files)
- merge md5 & game files list

svn-id: r21468
2006-03-27 16:56:08 +00:00
Travis Howell
017bcdb445 Adjust width in dump_bitmap() for FF
svn-id: r21467
2006-03-27 13:32:44 +00:00
Travis Howell
c12839ec18 Always init state.depack_cont
svn-id: r21466
2006-03-27 13:30:28 +00:00
Travis Howell
e265f1ab57 Commited too much
svn-id: r21465
2006-03-27 12:54:53 +00:00
Travis Howell
3bb25707b2 Add FF support to dump_bitmap()
svn-id: r21464
2006-03-27 12:49:17 +00:00
Torbjörn Andersson
23c692f09f Cleaned up update_playRhythmSection(). It's almost possible to understand what
it's intended to do now.

Renamed _unkOutputByte2 to _vibratoAndAMDepthBits. It's a pretty terrible name,
but that's what it is: the two most significant bits of the Adlib BD register.

Renamed _rhythmSection to _rhythmSectionBits for consistency: It's the five
least significant bits of the Adlib BD register.

(The remaining bit is the rhythm on/off bit. I don't think we store that one in
any variable.)

svn-id: r21463
2006-03-26 22:11:40 +00:00
Travis Howell
26c0d2b4fa Always use the correct string slot for HE games specific cases in decodeParseString()
svn-id: r21462
2006-03-26 09:21:07 +00:00
Travis Howell
59dd971a02 Ooops, correct cut and past error in last commit
svn-id: r21461
2006-03-26 09:09:35 +00:00
Travis Howell
c1bd25617b Increase size of _charsetData to 16 * 23 for HE games, fixes subtitle color glitches in Buzzy games
svn-id: r21460
2006-03-26 09:06:44 +00:00
Torbjörn Andersson
d8004bff51 Added support for mouse wheel scrolling in save/restore dialog.
svn-id: r21459
2006-03-26 06:22:41 +00:00
Eugene Sandulenko
09b8869ef6 Implement feature request #1450364: "Suggestion on how to cope with
fan-translations"

svn-id: r21458
2006-03-26 04:50:09 +00:00
Travis Howell
67b8589c18 Reduce size of saved games for HE games, music/speech resources don't need to be saved
svn-id: r21456
2006-03-26 00:24:00 +00:00
Eugene Sandulenko
dd505ff6ae Fixing bug #1458388: "SIMON1: Game Detection fails".
Sometimes instead of "GAMEPC" we get "GAMEPC." (note trailing dot)

svn-id: r21455
2006-03-25 21:17:38 +00:00
Gregory Montoir
575c831684 fixed wrong computation of decflag in AkosRenderer::drawLimb (HE specific, bug #1416186).
svn-id: r21454
2006-03-25 20:15:41 +00:00
Eugene Sandulenko
47b3a748f4 - Print more meaningful game names on detection stage
- Move detection debug messages from level 0 to level 2

svn-id: r21453
2006-03-25 19:46:58 +00:00
Eugene Sandulenko
f25d49f826 - Move AddDefaultDirectory() calls in somon engine to constructor
- Move AddDefaultDirectory() from NewTheme.cpp to main.cpp

svn-id: r21451
2006-03-25 19:18:09 +00:00
Travis Howell
ef6baca2ac Move convertFilePath() to ScummEngine_v60he, to allow use by earlier HE games
svn-id: r21450
2006-03-25 11:01:00 +00:00
Torbjörn Andersson
737c52590b I believe that the purpose of updateCallback45() is to add a signed value to a
channel's unsigned tempo. Rewrote the function to make this clearer, and
renamed it update_changeChannelTempo().

svn-id: r21448
2006-03-25 10:11:38 +00:00
Torbjörn Andersson
2c279848d8 More renamings:
unk11 -> durationRandomness

updateCallback12() -> update_setupNoteAndDuration()
updateCallback26() -> update_setupDuration()
updateCallback44() -> update_setDurationRandomness()

svn-id: r21447
2006-03-25 09:55:28 +00:00
Travis Howell
03202876cf Minor cleanup
svn-id: r21446
2006-03-25 04:33:33 +00:00
Eugene Sandulenko
4577ac2f65 Add Blue's ABC Time and upgrade demo target to full game
svn-id: r21444
2006-03-25 04:28:39 +00:00
Eugene Sandulenko
22042bc637 - Implemented case insensitive file reading. Left old system as a fallback
in case some engine writer decide to do something unwise
- Removed used of ConfMan.getKey("path") in file-related cases, because
  now File class handles that
- Fixed bug in ScummEngine_v80he::o80_getFileSize() where path delimiters
  weren't translated

svn-id: r21443
2006-03-25 04:17:17 +00:00
Andrew Kurushin
3331de7105 Fix MSVC warnings #3
svn-id: r21442
2006-03-24 18:33:47 +00:00
Andrew Kurushin
62d2bcf735 Fix MSVC warnings #2
svn-id: r21441
2006-03-24 18:32:10 +00:00
Andrew Kurushin
212b150b6f Fix MSVC warnings
svn-id: r21440
2006-03-24 18:30:34 +00:00
Andrew Kurushin
9586f11bdf fix ITE SUNSPOT music loop
svn-id: r21439
2006-03-24 18:15:57 +00:00
Max Horn
08ad918af6 Reduce (indirect) dependencies on gui/eval.h (and thus common/assocarray.h) to a minimum
svn-id: r21426
2006-03-24 14:15:45 +00:00
Eugene Sandulenko
819033b649 o Move built-in evaluator constants to AssocArray to speed it up
o Introduced .align text widget property
o Moved all text widgets to use it and populated theme config file

svn-id: r21420
2006-03-24 01:24:26 +00:00
Paul Gilbert
f596612344 Partially disassembly of the pathfinding code and miscellaneous support methods
svn-id: r21418
2006-03-23 21:26:13 +00:00
Travis Howell
140c0d9a3c Minor changes for FF and cleanup
svn-id: r21417
2006-03-23 04:49:03 +00:00
Travis Howell
ddc1a7a52f Add opcode 161 difference in FF, fixes some glitches in 2nd room
svn-id: r21416
2006-03-23 04:41:06 +00:00
Eugene Sandulenko
bc8f634834 Match game speed with original
svn-id: r21415
2006-03-23 03:55:00 +00:00
Eugene Sandulenko
0b35672f78 uint8 -> byte
svn-id: r21414
2006-03-23 03:45:52 +00:00
Eugene Sandulenko
6faa76d287 Made mouse more responsive
svn-id: r21413
2006-03-23 03:40:23 +00:00
Eugene Sandulenko
fced8df162 Got rid of ASSERT and ASSERT_PTR defines
svn-id: r21412
2006-03-23 03:17:47 +00:00
Eugene Sandulenko
36302c0921 Make copy protection in OS and FW turnable. Still buggy
svn-id: r21411
2006-03-23 03:15:39 +00:00
Won Star
aad9a340be Fix compile without ZLIB support (GP32).
svn-id: r21408
2006-03-23 02:48:53 +00:00
Travis Howell
a8c0079924 Code for inverted rect when scaling images of FF no longer required. Minor cleanup
svn-id: r21407
2006-03-22 23:38:16 +00:00
Travis Howell
3110c11ea1 Rename draw buffers correctly
svn-id: r21406
2006-03-22 13:54:26 +00:00
Travis Howell
6227f38cba Small correction to scaling code in FF
svn-id: r21405
2006-03-22 11:57:46 +00:00
Torbjörn Andersson
e4664606f7 Preliminary (weasel-word for "probably buggy") implementation of the remaining
parts of scaleClip(). I do see a scaled image of Feeble, but it's very glitchy.
On the other hand, I get the same kindof glitches when drawing him unscaled, so
maybe there is garbage left in the scale buffer from previous frames.

svn-id: r21404
2006-03-22 10:32:32 +00:00
Travis Howell
60732d70f5 Whitespace changes
svn-id: r21403
2006-03-22 10:04:01 +00:00
Travis Howell
857cf7189a Fix regression in 2nd room of FF
svn-id: r21402
2006-03-22 09:14:28 +00:00
Travis Howell
00d44af2c1 Skip columns isn't used for overlayed or scaled images in FF
svn-id: r21401
2006-03-22 08:56:10 +00:00
Travis Howell
c0198b4464 Fix sound regression in FF, caused by last commit
svn-id: r21400
2006-03-22 08:27:41 +00:00
Travis Howell
5a8a32e350 Add initial support for Amiga and Macintosh versions of The Feeble Files
svn-id: r21399
2006-03-22 06:21:17 +00:00
Eugene Sandulenko
e0cf2743c9 Support for Russian FOTAQ
svn-id: r21398
2006-03-22 00:24:10 +00:00
Torbjörn Andersson
0c0c41d495 Implemented "sound triggers" so that the music does not stop shortly after
entering the castle. I hope this is a fair approximation of how the original
worked. Of course, this led to a couple of more renamings:

_unk5              -> _soundTrigger
updateCallback54() -> update_setSoundTrigger()
snd_setUnk5()      -> snd_getSoundTrigger()      (yes, "get")

At the moment, the only known sound triggers are the ones in the castle. If an
unknown trigger is set, the debugging messages will be really, really noisy. I
don't know if I should consider this a bug or an extremely annoying feature.

svn-id: r21396
2006-03-21 17:17:24 +00:00
Johannes Schickel
9031b27349 Implements cmd_shakeScreen.
svn-id: r21394
2006-03-20 19:01:39 +00:00
Torbjörn Andersson
c506e452f1 Initialise _haveScrollButtons, since Valgrind complained about it.
svn-id: r21392
2006-03-20 17:33:08 +00:00
Travis Howell
6b56af989f The Hercules specific screen size check is no longer required
svn-id: r21390
2006-03-20 02:04:14 +00:00
Max Horn
5f800bb9da Fixed my fix regarding the encoding of some filenames: Provide both Windows and UTF-8 encoded versions of the German puttzoo
svn-id: r21388
2006-03-19 18:18:07 +00:00
Max Horn
bc5ac5eaf4 Fix encoding issue (see scummvm-devel)
svn-id: r21387
2006-03-19 17:26:11 +00:00
Max Horn
03734aa876 Moved filename substitution code from scumm.cpp to plugin.cpp
svn-id: r21386
2006-03-19 17:25:13 +00:00
Travis Howell
3f172bb3c2 Remove unused cases of getKeyState(), checked against scripts of FT, Dig and COMI.
svn-id: r21381
2006-03-19 11:10:24 +00:00
Travis Howell
f26dee7599 Closer match difficulty of insane in PC version of FT demo
svn-id: r21380
2006-03-19 10:34:02 +00:00
Oystein Eftevaag
3e9246331e Makes sure Brandon actually dies when he turns to stone in the kyragem room
svn-id: r21379
2006-03-19 08:35:43 +00:00
Oystein Eftevaag
d34d6b17df Fixes a potential problem in the pathfinder where an array could be accessed with a negative value in certain rooms
svn-id: r21378
2006-03-19 07:54:30 +00:00
Oystein Eftevaag
e636a25a33 Adds button press animations to the menu, and resets the cursor when the Dialog of Death pops up. Also, mouse clicks are now registered on button up instead of button down, as in the original
svn-id: r21377
2006-03-19 05:55:26 +00:00
Travis Howell
6632a4df53 Revert FLAG_AUTOFREE changes to loadWAVFromStreammakeWAVStream
svn-id: r21376
2006-03-19 05:15:49 +00:00
Travis Howell
8ae4dd6caa Revert FLAG_AUTOFREE changes to loadWAVFromStreammakeWAVStream
svn-id: r21375
2006-03-19 05:15:06 +00:00
Travis Howell
a441dafae5 Move the sound loop detection, so it is used by all HE70+ games
svn-id: r21374
2006-03-19 04:55:34 +00:00
Travis Howell
1b20b06822 Skip HSHD block by set size, since there are sound resources (ie Caiman in jungle) which have incorrect size in HSHD header
svn-id: r21373
2006-03-19 04:41:43 +00:00
Travis Howell
79bd731041 Add workaround for script bug in Loom (CD)
svn-id: r21371
2006-03-19 02:50:51 +00:00
Oystein Eftevaag
544abe3d12 Oops, forgot to change a variable declaration in the last commit
svn-id: r21367
2006-03-18 15:01:08 +00:00
Oystein Eftevaag
74aa771143 Changed 'amiga' keywords to 'isAmiga' in the resource handling code to avoid #define conflicts
svn-id: r21366
2006-03-18 14:55:29 +00:00
Johannes Schickel
f9f2cd2dbe - started to rework static resource loading
- made some function parameters const (to work with new static res code)

svn-id: r21365
2006-03-18 14:43:18 +00:00
Willem Jan Palenstijn
879b5e4064 workaround: manually add delay when showing image between levels in gob1 ega
svn-id: r21364
2006-03-18 13:44:57 +00:00
Oystein Eftevaag
0f21db8c8e Fixes the color of the quitting dialog text after drinking a potion
svn-id: r21358
2006-03-18 11:22:18 +00:00
Travis Howell
a379fe424c The camera position is always set by loadRoomWithEgo opcode in HE games, through cameraFollows. Fixes glitches when changing rooms in fbear and other early games.
svn-id: r21355
2006-03-18 10:30:47 +00:00
Oystein Eftevaag
05ee5cf2bd Extends seq_drinkPotionAnim() so that the color of the flask Brandon
drinks will be correct. Also fixes a bug where an animation
(Brandon ringing the bells) would play too quickly.

svn-id: r21354
2006-03-18 04:41:34 +00:00
Paul Gilbert
dcf029e947 Further work on disassembling player tick/movement handler
svn-id: r21349
2006-03-17 21:59:29 +00:00
Johannes Schickel
0ebebb1176 Fixes animations when brandon turns inivisible/visible.
svn-id: r21348
2006-03-17 20:49:12 +00:00
Johannes Schickel
41b4a6aa7c Fixes bug #1401337 ("KYRA: Platform with pegasi graphics glitch")
svn-id: r21347
2006-03-17 19:39:46 +00:00
Johannes Schickel
bbd1725598 - Fixes bug #1401432 ("KYRA: Brandon graphics glitch when exiting castle catacombs")
- Fixes some sprite redraw bugs introduced with my last commits
- Fixes wsa drawing bug in the cave too

svn-id: r21346
2006-03-17 14:19:18 +00:00
Torbjörn Andersson
4df16b71b8 Oops, I never meant to remove *that* line! Put it back again. (This fixes the
flute sound, and probably other regressions as well.)

svn-id: r21345
2006-03-17 13:13:31 +00:00
Torbjörn Andersson
e36edb1b35 The opcode functions are not allowed to modify their own channel.dataptr
directly. If they want a new data pointer, they have to use the dataptr
parameter. This fixes a subtle bug that would cause the wrong music to play
when getting the quill in Kyra 1.

svn-id: r21344
2006-03-17 12:03:24 +00:00
Travis Howell
9ecd855c2b Fix endian issue in akos costume code
svn-id: r21343
2006-03-17 01:55:43 +00:00
Travis Howell
a908cbed32 Fix endian issues in akos costume code
svn-id: r21342
2006-03-17 01:46:36 +00:00
Travis Howell
87d74563dd Add another German version of puttzoo demo
svn-id: r21341
2006-03-17 00:30:58 +00:00
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