Commit Graph

1701 Commits

Author SHA1 Message Date
Max Horn
1f859e592f this is 100% equivalent to the old walkActorOld() code - I just made an equivalence transformation (anybody who doesn't believe that, I can show you step by step how to transform the code :-)
svn-id: r7749
2003-05-20 17:50:43 +00:00
Max Horn
fe57d155f8 remove this obsolete FIXME (code is fine as it is)
svn-id: r7741
2003-05-20 16:36:26 +00:00
Max Horn
3e3d6f1360 renamed o2_matrixOps -> o2_setBoxFlags; V2 'objY' fixes; cleanup
svn-id: r7739
2003-05-20 16:13:34 +00:00
Max Horn
93d29f2f9a cleanup
svn-id: r7738
2003-05-20 15:41:07 +00:00
Max Horn
684cd9c431 fixed warning output
svn-id: r7735
2003-05-20 15:13:18 +00:00
Max Horn
5fe08b9191 init charset data
svn-id: r7734
2003-05-20 15:12:33 +00:00
Max Horn
9517305332 warning -> debug message
svn-id: r7733
2003-05-20 15:03:47 +00:00
Max Horn
c8169afe2b proper fix for getPathToDestBox
svn-id: r7721
2003-05-20 12:54:04 +00:00
Max Horn
46abb7998f merged common code
svn-id: r7720
2003-05-20 12:25:47 +00:00
Max Horn
8d1110bfee init all Bundle members properly; make _voiceFile/_musicFile protected
svn-id: r7718
2003-05-20 11:56:36 +00:00
Max Horn
e420517d02 fixed charset id check
svn-id: r7717
2003-05-20 10:56:04 +00:00
Jamieson Christian
db8256df8a More thorough parameterFade and deferredCommand implementation.
Lot of guesswork. parameterFade STILL NEEDS A LOT OF WORK!
These additions at least partially correct the music behavior
in the Tunnel of Love when shorting the controls.

svn-id: r7704
2003-05-20 01:12:40 +00:00
Jamieson Christian
f1982ec9d6 Updated doCommand(14) with new information.
Fixed music bug introduced with fix [712042].
Improved iMuse debug output.

svn-id: r7703
2003-05-19 22:29:35 +00:00
Max Horn
bc73fcf386 cleanup
svn-id: r7701
2003-05-19 20:36:39 +00:00
Max Horn
d50b070168 fix for bug #739661
svn-id: r7699
2003-05-19 20:09:30 +00:00
Max Horn
1e7f246755 fix assert for mi_demo2
svn-id: r7698
2003-05-19 19:52:08 +00:00
Jamieson Christian
ad39f15e05 Auto loop for non-puttdemo games
svn-id: r7693
2003-05-19 18:49:16 +00:00
Jamieson Christian
5a89820f0d Fixed VC++ warnings
svn-id: r7690
2003-05-19 15:40:34 +00:00
Max Horn
ec4cc7d774 more special palette fixes by erik
svn-id: r7689
2003-05-19 11:34:13 +00:00
Max Horn
18a6b5dcc1 renamed ScriptSlot::unk1/unk2 to freezeResistant/recursive
svn-id: r7688
2003-05-19 11:31:35 +00:00
Jonathan Gray
12ff6c4f99 correct transparency colour for humongous games when using akos16
svn-id: r7676
2003-05-19 09:02:16 +00:00
Jonathan Gray
714cd3503d make gui work if the requested string vars don't exist
svn-id: r7674
2003-05-19 08:42:10 +00:00
Jonathan Gray
6cb61537f4 enable midi for non puttdemo humongous games. need to properly return the result of whether music is running though...
svn-id: r7673
2003-05-19 08:04:47 +00:00
Jamieson Christian
e088227e3b Removed annoying debug output
svn-id: r7671
2003-05-19 05:14:18 +00:00
Jamieson Christian
417dc08484 Proof of concept for XMIDI parser in Humongous games.
You must still uncomment the VAR_SOUNDPARAM setting for this to work...?

svn-id: r7670
2003-05-19 05:04:38 +00:00
Jonathan Gray
243bcc74d3 sync local changes, fix pickOneOf
svn-id: r7668
2003-05-19 04:29:41 +00:00
Max Horn
a2ce5b6383 don't touch untouchable objects in V2 games
svn-id: r7664
2003-05-19 01:27:30 +00:00
Max Horn
cf500b2450 enable box'ed walking in V2 games
svn-id: r7660
2003-05-19 00:25:26 +00:00
Max Horn
33d1f15f97 V2 walkbox matrix fixes
svn-id: r7657
2003-05-19 00:17:34 +00:00
Max Horn
b43bca21cb more cleanup
svn-id: r7653
2003-05-18 23:46:30 +00:00
Jamieson Christian
ac9a392a5b Fixed VC++ warnings
svn-id: r7652
2003-05-18 23:45:34 +00:00
Max Horn
1f616edfcd VAR_CHARCOUNT is a V2 only variable, so I moved its declaration to the other V2 only vars
svn-id: r7651
2003-05-18 23:37:44 +00:00
Max Horn
f6d1e71194 oops
svn-id: r7649
2003-05-18 23:19:43 +00:00
Max Horn
1f8d481acb fix for various regressions (not quite sure if the check for V2/v3 is right, but seems to work so far)
svn-id: r7648
2003-05-18 23:14:21 +00:00
Max Horn
5ac005860c warning() automatically outputs a newline after the warning message; adding a newline into the format string adds another newline (which contains the single char '!')
svn-id: r7647
2003-05-18 21:14:50 +00:00
Max Horn
7171c5bcd4 cleanup
svn-id: r7646
2003-05-18 21:03:57 +00:00
Max Horn
6b7484f320 consistently index script slots with index 0 (not 1); this fixes bug #739463; made stopScriptNr match stopObjectScript more closely (we could merge them into one function one day)
svn-id: r7645
2003-05-18 20:57:32 +00:00
Max Horn
988ec14c5f fixed debugger 'scripts' command
svn-id: r7644
2003-05-18 20:33:22 +00:00
Max Horn
7ec709e35f Part of patch #739119 (attempt to fix bug #651077 at least partially)
svn-id: r7643
2003-05-18 19:51:50 +00:00
Max Horn
8f7f22aeae implemented proper 'invalid walkbox' handling in older games (in newer games, box 0 is used as invalid box, while in older games this is a legal box and box 255 is the 'invalid' box); removed lots of FIXME's which were needed to cope with ScummVM not implementing the invalid walkbox stuff properly in the past; removed other actor FIXMEs.
svn-id: r7642
2003-05-18 19:44:22 +00:00
Max Horn
8b4c663e12 Patch #738859: Experimental costume.cpp cleanup
svn-id: r7639
2003-05-18 18:36:14 +00:00
Max Horn
657c8ca2e3 more V2 sentence cleanup
svn-id: r7631
2003-05-18 12:52:27 +00:00
Max Horn
a38c3599ce fixed opcode 0x47
svn-id: r7630
2003-05-18 12:02:17 +00:00
Max Horn
c3b5fce262 number of actors in maniac is even 25 (according to the MM script-1)
svn-id: r7626
2003-05-18 11:21:31 +00:00
Max Horn
1156abd532 wow, now this is a stupid bug... fixes various issues in Zak256 at the very least
svn-id: r7622
2003-05-18 02:22:26 +00:00
Oliver Kiehl
740d1150f5 make gcc 3.3 happy. a->scalex and a->scaley are of type char and cannot be greater 255
svn-id: r7619
2003-05-17 23:46:03 +00:00
Jonathan Gray
d85abe1737 I thought it would be clear from the comments that this was needed for the atari st zak demo, which seems to still be the case
svn-id: r7616
2003-05-17 19:11:59 +00:00
Jamieson Christian
93825ff948 Fixed program change msgs being sent under Adlib
svn-id: r7615
2003-05-17 19:07:45 +00:00
Jamieson Christian
fcc11d19fa Added imuse_multimidi to debugger
svn-id: r7614
2003-05-17 19:03:25 +00:00
Max Horn
3576b8e168 yet another V2 sentence fix (now clicking on objects in Zak causes Zak to talk to it - but he gets stuck after some time)
svn-id: r7613
2003-05-17 18:42:31 +00:00
Max Horn
30271732be some sentence fixes
svn-id: r7612
2003-05-17 18:30:47 +00:00
Max Horn
33abb1f04a V2 actor heads fixed (to their shoulders, ha-ha... errm ... I thought it was funny when I wrote it 8-)
svn-id: r7611
2003-05-17 18:07:07 +00:00
Jamieson Christian
c88e0b5301 Fixed Adlib sound problem on old (small header) games. Thanks for eriktorbjorn for the material that led to the solution.
svn-id: r7610
2003-05-17 17:20:27 +00:00
Max Horn
a6d1c3e151 no no, bad hack be gone :-)
svn-id: r7609
2003-05-17 15:51:11 +00:00
Max Horn
4cc3a466d0 init vars to 255 if they are not defined for all Scumm versions
svn-id: r7603
2003-05-17 10:04:30 +00:00
James Brown
0b3d9df5b2 Oops, remove debug crapola
svn-id: r7601
2003-05-17 06:34:24 +00:00
James Brown
e5d7459d98 Move some hacks around
svn-id: r7600
2003-05-17 06:33:34 +00:00
James Brown
6db28696e4 Fix invalid variable
svn-id: r7599
2003-05-17 06:18:34 +00:00
James Brown
2813d48e92 Cleanup
svn-id: r7598
2003-05-17 06:14:08 +00:00
James Brown
99b26a5684 Name some vars
svn-id: r7597
2003-05-17 06:04:22 +00:00
Jamieson Christian
5a1e994d02 Added command line options for
native MT-32 support and
combination Adilb/native MIDI drivers.

svn-id: r7594
2003-05-17 03:06:16 +00:00
Jonathan Gray
1f7ebc70d8 add stub for a hev7 op
svn-id: r7593
2003-05-17 01:57:54 +00:00
Max Horn
3a145f50e7 disable assert in o2_putActor for now (is triggered in Zak intro); cleanup
svn-id: r7592
2003-05-17 01:01:05 +00:00
Max Horn
56d6443b19 fixed object walk_x/walk_y for V2 games
svn-id: r7591
2003-05-17 00:59:47 +00:00
Max Horn
6ed1d415b5 for v2 games, make space the pause key
svn-id: r7590
2003-05-17 00:37:53 +00:00
Max Horn
58ab6d5039 proper walk animation in Zak (at the expense of Zak's head, for now ;-)
svn-id: r7589
2003-05-17 00:33:29 +00:00
Max Horn
3244a79d46 V2 camera fix (again thanks MadMoose)
svn-id: r7587
2003-05-16 23:54:58 +00:00
Max Horn
92a71eed10 fixed o2_drawObject (thx MadMoose)
svn-id: r7586
2003-05-16 23:50:56 +00:00
Jamieson Christian
124a34f72a Fixed volume fader problem under multiple MIDI drivers
svn-id: r7585
2003-05-16 23:13:47 +00:00
Jamieson Christian
48f73469e0 Redesigned -t option
svn-id: r7584
2003-05-16 22:28:33 +00:00
Max Horn
64d9c75c2d cleanup
svn-id: r7583
2003-05-16 22:11:49 +00:00
Jamieson Christian
5a15ce808a Feature [557411] Adlib sound effects with GM drivers.
Support for simultaneous drivers is based on a
#define in imuse.cpp, and is disabled by default.

svn-id: r7582
2003-05-16 22:00:33 +00:00
Max Horn
a455082996 added roomobj dumping for bundle games (was trivial it turns out :-)
svn-id: r7581
2003-05-16 21:31:15 +00:00
Jamieson Christian
3533843ac8 And yet more cleanup
svn-id: r7580
2003-05-16 21:06:54 +00:00
Jamieson Christian
053e7cb71e More IMuse cleanup
svn-id: r7578
2003-05-16 20:38:04 +00:00
Jamieson Christian
0ece527a69 FINALLY got MI2 Woodtick music working!
svn-id: r7577
2003-05-16 19:16:43 +00:00
Jonathan Gray
52832cc954 some updates that get us up to the bootscripts of he v7 games before erroring out on unimplemented opcodes
svn-id: r7576
2003-05-16 16:09:16 +00:00
Jamieson Christian
e503df12a6 Corrected overly aggressive MIDI channel reallocation
svn-id: r7575
2003-05-16 15:48:01 +00:00
James Brown
914d886769 test stuff
svn-id: r7573
2003-05-16 12:58:49 +00:00
Jonathan Gray
ce6e5993c3 add hev7 target to test with
svn-id: r7572
2003-05-16 11:45:05 +00:00
Max Horn
9e5f46e635 fixed V2 verb scripts
svn-id: r7570
2003-05-16 10:35:15 +00:00
Max Horn
30d31f6d03 print some useful info, too
svn-id: r7569
2003-05-16 10:00:03 +00:00
Travis Howell
61fdee0b42 Typo
svn-id: r7568
2003-05-16 09:51:59 +00:00
Travis Howell
f69df41c71 Add comment to fixme
svn-id: r7567
2003-05-16 09:47:52 +00:00
Jamieson Christian
2c77fc14aa Fixed SysEx parse error, misc. cleanup
svn-id: r7565
2003-05-16 04:02:33 +00:00
Max Horn
9f272a2acf fixed o2_getActorX / o2_getActorY (thanks MadMoose)
svn-id: r7564
2003-05-16 02:33:08 +00:00
Jamieson Christian
08e0fcbda4 Disable NATIVE_MT32 by default
svn-id: r7563
2003-05-16 02:20:34 +00:00
Max Horn
7d08aea4cc SentenceTab unk4/unk3 are the sentence objects (think of: 'Use objectA with objectB' or 'Give objectA to objectB' etc.); added a little more V2 sentence hackery; added a FIXME regarding some strange sentence code (accessing objectB before it is set) in script.cpp
svn-id: r7562
2003-05-16 02:16:59 +00:00
Jamieson Christian
bfb68f513a Fixed game load crash
svn-id: r7561
2003-05-16 02:13:21 +00:00
Max Horn
e1652fedea hackish partial doSentence support
svn-id: r7560
2003-05-16 01:56:06 +00:00
Jamieson Christian
26d840e4fc IMuseDriver functionality absorbed into IMuseInternal.
Initial structural support for multiple MidiDriver's.

svn-id: r7559
2003-05-16 01:52:45 +00:00
Jamieson Christian
319cbc1c8c Reset sounds on room load
svn-id: r7558
2003-05-16 00:19:30 +00:00
Max Horn
1482ab1c42 obsolete
svn-id: r7557
2003-05-16 00:17:23 +00:00
Jamieson Christian
9d7cd48dcc Fixed VC++ warnings
svn-id: r7555
2003-05-16 00:07:47 +00:00
Max Horn
9018be6cb3 moved drawBox to gfx.cpp (seems to be the more logical location)
svn-id: r7554
2003-05-15 23:50:16 +00:00
Max Horn
27c093a3a6 fixed / cleaned up drawBox
svn-id: r7553
2003-05-15 23:44:46 +00:00
Jamieson Christian
9f6b1bf3a1 Removed deprecated _program.
Miscellaneous cleanup.

svn-id: r7552
2003-05-15 23:08:03 +00:00
Max Horn
4b82ea54cb output a warning if ignoreTurns is set (so that we can find out where it is used)
svn-id: r7551
2003-05-15 22:57:53 +00:00
Max Horn
5e756aa8b8 cleanup
svn-id: r7550
2003-05-15 22:48:06 +00:00
Max Horn
7baef4ad4e make some more use of ScummVM::Point; cleanup
svn-id: r7549
2003-05-15 22:41:35 +00:00