Commit Graph

1657 Commits

Author SHA1 Message Date
James Brown
336e661c36 Hacky zak sentence/inventory drawing (rewrite later on)
svn-id: r7766
2003-05-21 06:00:16 +00:00
Travis Howell
ec46d2f853 Add Zak v2 doSentence fix, patch #740878
svn-id: r7760
2003-05-21 04:09:20 +00:00
Max Horn
34eee8b33b cleanup
svn-id: r7756
2003-05-20 23:05:34 +00:00
Max Horn
49e7f7564a renamed various things for clarity
svn-id: r7754
2003-05-20 20:58:26 +00:00
Max Horn
1a394aa3c7 added enum's for the known actor/object claasses; extended putClass/getClass to translate the X/Y flip classes; made code use the new enum's; some other cleanup
svn-id: r7753
2003-05-20 20:42:28 +00:00
Max Horn
ffadd452a9 got rid of the evil locked-box hack in adjustXYToBeInBox; instead check for locked boxes in walkActorOld, which seems to work just as well (and hopefully better)
svn-id: r7750
2003-05-20 19:35:40 +00:00
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