Commit Graph

140 Commits

Author SHA1 Message Date
Max Horn
f8e64d7134 renamed walk_script/talk_script -> walkScript/talkScript
svn-id: r8178
2003-05-31 14:27:47 +00:00
Max Horn
691e1f390a rewrote Actor::needBgReset related code (this could cause regressions...)
svn-id: r8126
2003-05-30 00:55:21 +00:00
Max Horn
01ac371c6a don't hardcode 50 here, use _numNewNames
svn-id: r8057
2003-05-28 19:55:05 +00:00
Max Horn
b7fe6df587 copy&paste mistake
svn-id: r8049
2003-05-28 14:09:55 +00:00
Max Horn
03609cc465 cleanup; added hackish fix for bug #744441
svn-id: r8048
2003-05-28 14:01:54 +00:00
Max Horn
2885a8a84e tightened hack condition a bit
svn-id: r8027
2003-05-26 22:37:36 +00:00
Max Horn
c70713ea4a workaround for bug #743363
svn-id: r7980
2003-05-26 01:01:47 +00:00
Max Horn
6bcf19b62d brutally remove all o6_kernelSetFunctions subop stubs - we need to find out the places where they are actually called, and with how many params, if we ever want to implement them
svn-id: r7937
2003-05-25 11:52:30 +00:00
Max Horn
35877f0d30 workaround bug #742979
svn-id: r7933
2003-05-25 11:18:57 +00:00
Max Horn
0d2ddf2381 work around for comi script calling o6_getActorRoom(255)
svn-id: r7912
2003-05-24 23:08:03 +00:00
Max Horn
2efa2e1c67 cleanup
svn-id: r7892
2003-05-24 17:04:54 +00:00
Max Horn
f75c148c8c corrected FIXME
svn-id: r7891
2003-05-24 16:45:49 +00:00
Max Horn
41df21ed6b temporary work around for bug #742676 (game won't exit anymore, but behaviour is incorrect)
svn-id: r7889
2003-05-24 16:09:29 +00:00
Max Horn
94f0b7f4a7 some more derefActorSafe -> derefActor changes; found out why in COMI o6_getActorRoom is called with param 0
svn-id: r7860
2003-05-23 13:42:12 +00:00
Max Horn
c333b6d6ec replaced many unsafe uses of derefActorSafe by derefActor; replaced derefActorSafe/assert pairs by derefActor (gives better error message); replaced various derefActorSafe/if(a!=0) pairs by derefActor (in cases where the deref should never fail, ever, except due to a bug in ScummVM)
svn-id: r7859
2003-05-23 13:24:41 +00:00
Jamieson Christian
c6568530bd Revamped iMuse and Player classes. Player now uses MidiParser to parse its data, which will allow it to parse other MIDI formats. To receive parsed data, Player now derives from MidiDriver to act as a "fake MIDI driver".
Miscellaneous upgrades and fixes to MidiParser, including the Smart Jump (which could not be tested before iMuse started making use of the MidiParser).

*** THIS IS A BIG UPGRADE! EXTENSIVE REGRESSION TESTING IS NEEDED! ***

This has been tested through the intros and a number of other scenes from MI2, FOA and S&M.

NOTE! This upgrade introduces savegame format version V19. Earlier version savegames will load, but the music will simply start over from the beginning. Only V19 and later games will properly restore the position of the music! Don't say you weren't warned....

svn-id: r7849
2003-05-23 04:19:47 +00:00
Max Horn
c78664cbc9 renamed talkFrame1/talkFrame2 to talkStartFrame/talkStopFrame
svn-id: r7819
2003-05-22 09:58:33 +00:00
Max Horn
86d57f3c7a many pedantic warning fixes (and some actual potential buglets fixed, too)
svn-id: r7795
2003-05-21 18:09:49 +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
Jamieson Christian
5a89820f0d Fixed VC++ warnings
svn-id: r7690
2003-05-19 15:40:34 +00:00
Jonathan Gray
243bcc74d3 sync local changes, fix pickOneOf
svn-id: r7668
2003-05-19 04:29:41 +00:00
Max Horn
7171c5bcd4 cleanup
svn-id: r7646
2003-05-18 21:03:57 +00:00
Jonathan Gray
1f7ebc70d8 add stub for a hev7 op
svn-id: r7593
2003-05-17 01:57:54 +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
f495c14d84 opcodes are just one byte
svn-id: r7513
2003-05-14 20:37:53 +00:00
Max Horn
eb22ea3b96 additional readArray protection (might cause regression in FT, but then we should fix FT!)
svn-id: r7512
2003-05-14 20:14:03 +00:00
Max Horn
86b916b762 V8 fix
svn-id: r7496
2003-05-14 10:14:05 +00:00
Max Horn
08f7ec192e NUM_ACTORS -> _numActors (for consistency)
svn-id: r7489
2003-05-13 23:42:41 +00:00
Max Horn
0ee0e7f634 cleanup
svn-id: r7488
2003-05-13 23:33:01 +00:00
Max Horn
81bfe8cd51 swapped talkPosX and talkPosY (they were misnamed); factored out some duplicate code in string.cpp; VC warning fix in smush_player.cpp
svn-id: r7481
2003-05-12 22:08:39 +00:00
Max Horn
5be0ce7adc work around some illegal var access' in COMI/V8 - there are more, but I am not always sure if avoiding the access is the proper fix; maybe in some cases we should just define that var for V8 to the proper value?
svn-id: r7425
2003-05-10 22:35:12 +00:00
Max Horn
acb35fc915 renamed _scrWidth/_scrHeight -> _roomWidht/_roomHeight, and _realWidth/_realHeight -> _screenWidth/_screenHeight (inspired by MadMoose, but I'll take the blame - still this seems much more logical & intuitive)
svn-id: r7423
2003-05-10 21:49:59 +00:00
Max Horn
98881c3a6a init all VAR_* variables to 0xFF; replaced access to _vars in the form _vars[VAR_*] by VARS(VAR_*) which performs a validity checK; renamed _vars to _scummVars to make sure I updated all places; fixed two places where V6 and newer games would access V5 vars (but there are still some left, it seems); checked VAR access for now only generates a warning
svn-id: r7393
2003-05-08 15:48:50 +00:00
Max Horn
b1145090f6 Patch #733099: DIG: Experimental camera fix (should fix bugs #716350 and #659158)
svn-id: r7384
2003-05-07 22:56:06 +00:00
Max Horn
93264aea78 oops, forget to remove hack I used to test this ;-)
svn-id: r7325
2003-05-04 18:28:32 +00:00
Max Horn
7d78ba39fb simplified code
svn-id: r7324
2003-05-04 18:27:55 +00:00
Marcus Comstedt
83db626520 GCC believes that if we cast a pointer to <type *>, then we are guaranteeing
that the pointer has proper alignment for <type>, and that it can replace the
memcpy() with a direct assignment.  This totally defies the purpose of the
memcpy(), which is there precisely because the memory is unaligned.  Avoid
problems by not making the cast.

svn-id: r7322
2003-05-04 17:21:31 +00:00
Max Horn
2b74abd2c9 PalmOS changes
svn-id: r7224
2003-04-30 13:23:31 +00:00
Max Horn
2d8fa42f44 renamed setCursorHotspot2 to setCursorHotspot; fixed (with a hack) cursor in Loom
svn-id: r7132
2003-04-26 13:28:34 +00:00
Jonathan Gray
90610fef1a opcode E0 DE is sound volume change
svn-id: r7073
2003-04-22 14:49:29 +00:00
Jonathan Gray
b3ac1bf20e fix setState for humongous games
svn-id: r7070
2003-04-22 00:09:07 +00:00
Jonathan Gray
5cc5af052f add readFile stub
svn-id: r7048
2003-04-21 00:44:46 +00:00
Jonathan Gray
7037ed3102 opcode bd is stopObjectCode in the humongous games
svn-id: r7047
2003-04-21 00:22:52 +00:00
James Brown
fe0fc72e57 Pedantic stats-boosting typo fix :)
svn-id: r7039
2003-04-20 17:11:13 +00:00
Jonathan Gray
4c6676d390 add opcode e4 stub that I meant to add some time ago
svn-id: r7028
2003-04-20 15:02:58 +00:00
Jonathan Gray
303a48dbbc case 131 of verbOps pops in the humongous games
svn-id: r7026
2003-04-20 11:17:22 +00:00
Nicolas Bacca
233ef12080 It's correct this time. Really. Trust me.
svn-id: r6950
2003-04-09 21:59:23 +00:00
Nicolas Bacca
d3d85bf003 Oops on previous fix
svn-id: r6921
2003-04-06 16:48:52 +00:00