Commit Graph

2325 Commits

Author SHA1 Message Date
Travis Howell
fdb79e01cc More fix from Hibernatus
svn-id: r9069
2003-07-19 03:54:33 +00:00
Jochen Hoenicke
077b643ea0 Fix recursive calls of object scripts. In V2 for each object two script
can be active at the same time:  One 253 script and one normal script.
We misuse the recursive flag to mark 253 scripts.  When starting a 253
script we stop a script that has recursive flag set and when starting
a normal script we stop the script that doesn't.

svn-id: r9068
2003-07-18 18:55:04 +00:00
Travis Howell
9c026748f3 Another fix from Hibernatus
svn-id: r9066
2003-07-18 14:48:18 +00:00
Travis Howell
8fbb8a6df8 Add 22KHz sounds effect support for fm towns games, patch #773434
svn-id: r9063
2003-07-18 05:59:32 +00:00
Travis Howell
f20c47bb21 Add Indy3 FM Towns support, patch #773434
svn-id: r9062
2003-07-18 05:49:21 +00:00
Travis Howell
af75c03981 Fix from Hibernatus
svn-id: r9060
2003-07-17 14:03:15 +00:00
Travis Howell
09984089fb Revert part of last changes.
Caused indy3ega/loom to try to use amiga sound sometimes, when Amiga option was enabled.

svn-id: r9059
2003-07-17 12:27:13 +00:00
Travis Howell
5a1dce2773 Ooops
svn-id: r9058
2003-07-17 11:56:47 +00:00
Travis Howell
05b40887d9 Make the Amiga option costumes/palette only again.
svn-id: r9057
2003-07-17 11:20:31 +00:00
Travis Howell
d9ec75b249 Fix Amiga palette
svn-id: r9055
2003-07-17 05:06:59 +00:00
Max Horn
0c21927428 some comments
svn-id: r9052
2003-07-16 20:50:26 +00:00
Max Horn
8fbc3ed31b proper fix for the small regression caused by my COMI fix last night; this also fixes bug #766382
svn-id: r9047
2003-07-15 22:21:30 +00:00
Max Horn
59346f5c9a oops, this was a serious bug: message referred to buf_output (and was used by buf_output[300],) even after buf_output was out of scope
svn-id: r9046
2003-07-15 21:33:57 +00:00
Max Horn
c74e2eb4d7 factored out some duplicate code into a new method translateTextAndPlaySpeech; removed some completely useless code (why compute 'pointer' when we then throw away the result?)
svn-id: r9045
2003-07-15 21:30:53 +00:00
Max Horn
83a3afab42 temporary fix for bug #771562, I am working on a proper one now
svn-id: r9044
2003-07-15 20:51:18 +00:00
Max Horn
f60e8ff53e fix for bug #771803
svn-id: r9043
2003-07-15 19:20:40 +00:00
Max Horn
253e50b3e1 Workaround for bug #770724
svn-id: r9042
2003-07-15 19:09:11 +00:00
Max Horn
2aa8cc496d fix for bug #771734
svn-id: r9041
2003-07-15 18:18:29 +00:00
Jamieson Christian
44bda652ee Fix for Bug [766851] ALL: MIDI fragment repeats after close ups
Adjusted default _saveSound value used by S&M (whose
value is assumed by pre-S&M games). Corrected save/load
music behavior for non-temporary saves. (Until this default
value change, the incorrect behavior would almost never
manifest itself, so existing savegames should be fine.)

svn-id: r9035
2003-07-15 10:16:45 +00:00
Jonathan Gray
c2dd5afb6a start of some segacd specific help
svn-id: r9034
2003-07-15 07:29:41 +00:00
Travis Howell
eddf075495 Remove warning in simon
Add INDY3EGA Amiga - experimental support for sound effects, patch #771355

svn-id: r9033
2003-07-15 07:29:23 +00:00
Max Horn
b05e7de7bb replaced SCUMMVM_VERSION/SCUMMVM_CVS by gScummVMVersion/gScummVMBuildDate/gScummVMFullVersion; made engine.o depend on all other .o files, so that the build date in it is always up-to-date
svn-id: r9032
2003-07-15 02:16:33 +00:00
Jonathan Gray
cc8334638b put GID_MONKEY_SEGA in the correct place (has a micd/mi2 style interface)
svn-id: r9031
2003-07-15 00:54:33 +00:00
Max Horn
d0282843b5 Patch #771154 (ZAK: yet another doSentence fix); this should fix bug #752293
svn-id: r9030
2003-07-15 00:23:18 +00:00
Max Horn
6772b78f5f Patch #768260: Help Dialog Update (with some tweaks by me to make the dialog a little smaller -> looks much better, IMO)
svn-id: r9029
2003-07-15 00:20:04 +00:00
Max Horn
9e27fe9c95 temporarily changed this to an error to help track down what is causing the sound queue overflows(in particular, to figure out the room/script/offset where the bug occurs). Please report your findings to Fingolfin
svn-id: r9028
2003-07-14 22:24:18 +00:00
Max Horn
b88b7f3389 reduced duplicate code
svn-id: r9027
2003-07-14 22:21:11 +00:00
Max Horn
bb87787314 fix for bug #769744 (COMI: Trying to append to a nonexistant stream)
svn-id: r9025
2003-07-14 21:37:45 +00:00
Jochen Hoenicke
177d5d6b11 Compares in V2 are unsigned (at least in Zak).
This fixes a problem with the parachute scene in Zak.

svn-id: r9020
2003-07-14 19:57:44 +00:00
Max Horn
3ce7459814 fixed up c64_ignorePakCols (it's still a hack and not working properly, but at least it doesn't crash anymore; we probably should just remove it, and then handle the skiping inside proc64); determin which costume codec to use based on the costume format, not the scumm version
svn-id: r9019
2003-07-14 19:24:34 +00:00
Max Horn
5031b62871 proper fix for V1/Zak (and maybe V1/MM, too?) ActorSet-Color
svn-id: r9018
2003-07-14 18:20:20 +00:00
Max Horn
1c9a856918 this hack isn't necessary anymore (at least I found no cases where it would be needed)
svn-id: r9017
2003-07-14 17:36:27 +00:00
Jonathan Gray
21ea778e5a fix argument check
svn-id: r9016
2003-07-14 12:48:46 +00:00
James Brown
e7913ad49a Fix fixme
svn-id: r9012
2003-07-14 11:35:09 +00:00
Travis Howell
1f12612b9e Allow debugger in full screen mode
svn-id: r9011
2003-07-14 10:55:06 +00:00
Travis Howell
dc9a153e1b Inventory position is the same in both v1 and v2 games
svn-id: r9008
2003-07-14 09:30:29 +00:00
Travis Howell
21266bfc79 zak v1 uses same sound resources as zak v2
svn-id: r9002
2003-07-14 08:42:02 +00:00
Travis Howell
085d14a8c8 Redraw screen when loading v1 saved game
svn-id: r9000
2003-07-14 07:26:57 +00:00
Travis Howell
73365aa2c7 Split the v1 palette, since there is a minor difference.
svn-id: r8999
2003-07-14 06:44:47 +00:00
Travis Howell
89cc9ede19 Ooops, was in reverse.
svn-id: r8998
2003-07-14 06:19:06 +00:00
Travis Howell
e6f3eb9aa5 A few color fixes for v1/v2
svn-id: r8997
2003-07-14 06:14:49 +00:00
James Brown
9b55abbf49 V1 Zak fixes and hacks. (Woo, it rhymes! :)
svn-id: r8996
2003-07-14 06:00:17 +00:00
Max Horn
59ac07dcd6 workaround for bug #770093 (Zak256 Crash inside of Sphinx)
svn-id: r8995
2003-07-13 20:27:28 +00:00
Max Horn
27a1d8ab7b fix for bug #770344 (INDY3EGA: Amiga - Biff's name not shown in fight); this fix is not only needed for IndyEGA, but also for Loom (according to disassembly; I am guessing that it might be needed for all 'V3' (in our internal notation) games, but that remains to be verified
svn-id: r8994
2003-07-13 20:03:18 +00:00
Max Horn
a52a80d4f5 workaround for bug #770351
svn-id: r8993
2003-07-13 19:50:35 +00:00
Travis Howell
726718a60e For some reason, changing the kSentenceLine color stops highlighting working.
svn-id: r8992
2003-07-13 17:16:05 +00:00
Max Horn
963ecad362 debug/warning/error all automatically output a newline
svn-id: r8991
2003-07-13 16:22:17 +00:00
Travis Howell
0642d2df98 Correct v1 games inventory positions
svn-id: r8990
2003-07-13 15:58:48 +00:00
Travis Howell
ffddfd76d9 Add correct palette for pc versions of v1 games
Add some correct colors for v1 games

svn-id: r8988
2003-07-13 15:13:43 +00:00
Max Horn
beef7347e6 added some FIXMEs
svn-id: r8974
2003-07-13 11:54:31 +00:00
Max Horn
c149af5b07 fixed gdi._C64MaskChar decoding
svn-id: r8973
2003-07-13 11:40:19 +00:00
Max Horn
f73cd745f1 reduce code duplication; theoretical masking implementation for C64 costumes, can't test since masking is disabled in gfx.cpp for C64/V1 games
svn-id: r8972
2003-07-13 11:13:50 +00:00
Max Horn
eb49053e08 C64 costumes work now enough to be recognizable
svn-id: r8970
2003-07-13 10:35:05 +00:00
Travis Howell
6949d49e69 Simpler check
svn-id: r8969
2003-07-13 09:01:30 +00:00
Travis Howell
22edb8c39b Revert my last change, made some in text text unreadable (black).
Could more palette change be required for 32 color Amiga versions ?

svn-id: r8965
2003-07-13 05:07:27 +00:00
Travis Howell
53ac8f62cf Commit fixme to prevent some issues on Amiga verison of MI2
svn-id: r8963
2003-07-13 03:05:41 +00:00
Max Horn
00615e4df7 fix x/y limb offsets and transparancy with C64 costume renderer
svn-id: r8962
2003-07-13 02:45:31 +00:00
Jonathan Gray
8e94094c9d consistent case statement options, and make warnings more useful
svn-id: r8961
2003-07-13 02:25:36 +00:00
Max Horn
7189b0a11a fix for bug #770311 (at least for V2 games)
svn-id: r8959
2003-07-12 22:46:23 +00:00
Max Horn
66000eccbf fix for bug #770308
svn-id: r8958
2003-07-12 22:41:58 +00:00
Max Horn
adf9331624 properly show/hide verbs&inventory&sentence during cutscenes
svn-id: r8957
2003-07-12 22:33:03 +00:00
Max Horn
d35c57a53f fixes for cutscenes in V2 games
svn-id: r8956
2003-07-12 22:00:59 +00:00
Max Horn
187b715306 run script 5 in startScene (room transition script, it seems); don't invoke runInputScript(4) - it is not needed (runInputScript will be called by checkExecVerbs), and causes the buggy 'What is' command behavior); fixed V2 sentence line
svn-id: r8955
2003-07-12 21:28:04 +00:00
Max Horn
bc5dbf8e66 undoing my last box change - with the last change in actor.cpp, this should make MM boxes work properly and fix one or multiple of the open MM bugs
svn-id: r8953
2003-07-12 18:46:33 +00:00
Max Horn
fd82895ff5 adjusted V2 actor position to match original (MM) interpreter; tweaked adjustXYToBeInBox mod for V2 (so it's clear why it is needed)
svn-id: r8952
2003-07-12 17:53:22 +00:00
Jonathan Gray
fcc52b238b remove unused variable which is also incorrectly cast...
svn-id: r8948
2003-07-12 15:38:27 +00:00
James Brown
d50009b7c7 Preemptive code cleanup to prevent ear damage during certain Euphony tunes
svn-id: r8947
2003-07-12 15:27:41 +00:00
Max Horn
b2f737888d fix box coordinates for v1/v2 games (boxes are now contiguous)
svn-id: r8943
2003-07-12 12:40:20 +00:00
Jonathan Gray
ee62678369 revert change made in rev 1.140 fixes bug 766109
svn-id: r8942
2003-07-12 12:23:43 +00:00
Max Horn
f383dc24c4 fix existing ego actor change detection code
svn-id: r8941
2003-07-12 12:16:17 +00:00
Nicolas Bacca
524991b073 Add KEY_ALL_SKIP for WinCE
svn-id: r8939
2003-07-12 10:35:38 +00:00
James Brown
cc23b25cde Fix fix for 769896
svn-id: r8938
2003-07-12 10:19:18 +00:00
James Brown
dabe8799a1 Fix for bug 769896, update README a little
svn-id: r8935
2003-07-12 09:45:10 +00:00
Torbjörn Andersson
e74eddf6fa Update the 16-colour palette if the user changes the Amiga setting from
the options dialog.

svn-id: r8910
2003-07-11 14:54:16 +00:00
Travis Howell
fca9309305 Missed one section
svn-id: r8909
2003-07-11 14:27:55 +00:00
Travis Howell
88550e5d21 Restore correct value
svn-id: r8908
2003-07-11 12:10:58 +00:00
Travis Howell
88c2ef94d2 Using Amiga palette with 16 color Amiga versions only
svn-id: r8905
2003-07-11 10:13:42 +00:00
Travis Howell
4c6e10bfd6 Add amiga pallete for Amiga versions
svn-id: r8904
2003-07-11 09:38:46 +00:00
James Brown
90bac4a5ce Fix compilation, V1 verb positions
svn-id: r8880
2003-07-09 14:57:15 +00:00
James Brown
53b244f77f Patch #768217: Apply Mankeli's 'object state' debugger command
svn-id: r8879
2003-07-09 13:23:16 +00:00
Max Horn
fe944219eb not sure which of the two variants is correct (but I am pretty sure the old one, with _height>>3, was wrong)
svn-id: r8867
2003-07-08 18:18:26 +00:00
Max Horn
d5b1b68634 each row has to be drawn 8 times (8x8 chars, after all), see also Gdi::drawStripC64Object etc.)
svn-id: r8866
2003-07-08 18:09:57 +00:00
Max Horn
48b16bd819 fix warning
svn-id: r8865
2003-07-08 18:09:22 +00:00
Max Horn
66ec3f9c75 rewrote c64_ignorePakCols to what I *think* it should look like, base on my understanding of the code. so far completely untested :-)
svn-id: r8864
2003-07-08 17:44:06 +00:00
Max Horn
00a87fda03 made ignorePakCols exactly match CostumeRenderer::proc3 to make comparisions easier
svn-id: r8863
2003-07-08 17:42:11 +00:00
Max Horn
ebd5310473 width has to be multiplied by 8; not sure about xmove, the values still look completely wrong compared to V2
svn-id: r8862
2003-07-08 17:22:53 +00:00
Max Horn
d9a604a925 turns out the +4 on _baseptr is needed everywhere - now _animCmds matches between V1 and V2 MM, too, as well as the frameptr
svn-id: r8861
2003-07-08 17:08:44 +00:00
Max Horn
c1635b94bf the 'mask' value is now also right; data at 'r' seems to match, too, and finally the same limbs are used in V1 MM as in V2 MM
svn-id: r8860
2003-07-08 16:53:18 +00:00
Max Horn
5428987a04 _dataOffsets has the correct value now (based on comparisions of repeated offsets in the offsets tables, and matching them up between V1 and V2)
svn-id: r8859
2003-07-08 16:47:15 +00:00
Max Horn
501e728d02 again some code transformation (no functionality change; the V1 specific modifications now mostly have to be done in one spot, and it's now pretty obvious how things evolved towards AKOS
svn-id: r8858
2003-07-08 16:31:01 +00:00
Max Horn
8dd90916e0 ok, thanks erik for pointing out to me where this occurs :-)
svn-id: r8857
2003-07-08 16:17:41 +00:00
Max Horn
588279dd4f some more cleanup / C64 tweaks
svn-id: r8856
2003-07-08 13:11:42 +00:00
Max Horn
319233d75f make more explicit :-)
svn-id: r8855
2003-07-08 12:29:57 +00:00
Max Horn
848cfb9378 costume code cleanup & some more C64 tweaks
svn-id: r8854
2003-07-08 12:28:57 +00:00
Max Horn
1d69c33819 clarified comment
svn-id: r8853
2003-07-08 10:51:55 +00:00
Max Horn
07bd98b27f move V1_ignorePakCols to CostumeRenderer (it makes absolutely no sense to keep it in BaseCostumeRenderer), and renamed it to c64_ignorePakCols to avoid confusion (V1 in the context of costumes means the original costume format, as opposed to AKOS; and *not* the scumm version); added FIXME to cost_decodeData (have my doubts about it being correct)
svn-id: r8852
2003-07-08 10:49:13 +00:00
Torbjörn Andersson
7b017fcf7c Use the correct size (I hope) for decoding _C64MaskChar (whatever that is).
This should improve ScummVM's chances of surviving long enough to crash in
the V1 costume renderer instead.

svn-id: r8851
2003-07-08 06:28:25 +00:00
Max Horn
58486149a9 fix for bug #766119: help screen: '.' is listed incorrectly
svn-id: r8848
2003-07-07 22:33:07 +00:00
Max Horn
b5a42396e7 only move charset mask upon scrolling if tex is displayed in the game graphics, but not for games which have a seperate text display area (partial fix for bug #766109)
svn-id: r8847
2003-07-07 22:17:20 +00:00
Max Horn
74554d6e91 fix for bug #766532: MI2: look at coffin to Mojo
svn-id: r8846
2003-07-07 22:11:03 +00:00