Commit graph

82 commits

Author SHA1 Message Date
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
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
Max Horn
5e756aa8b8 cleanup
svn-id: r7550
2003-05-15 22:48:06 +00:00
Max Horn
cc8da4538d added comment
svn-id: r7535
2003-05-15 20:47:31 +00:00
Max Horn
f495c14d84 opcodes are just one byte
svn-id: r7513
2003-05-14 20:37:53 +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
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
07bbeb31e9 fixed o2_resourceRoutines
svn-id: r7391
2003-05-08 14:14:37 +00:00
Max Horn
f0f955ab15 experimental fix for Zak256 (see bug #733964)
svn-id: r7387
2003-05-08 00:28:05 +00:00
Max Horn
e6c8c46291 fixed bug #734057
svn-id: r7386
2003-05-07 23:09:04 +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
ac0897515d unified o?_isEqual, too (but not as nice due to hack)
svn-id: r7340
2003-05-05 09:25:07 +00:00
Max Horn
fa0df19a1d cleanup / reduced code duplication
svn-id: r7339
2003-05-05 09:19:15 +00:00
Jonathan Gray
7a10ab0cc2 remove hack that should not have been there in the first place...
svn-id: r7321
2003-05-04 14:06:30 +00:00
Max Horn
5c3046ae98 erik's fix for the airplane bug in Indy3
svn-id: r7318
2003-05-04 13:50:28 +00:00
Max Horn
a8c180ddf8 cleanup
svn-id: r7314
2003-05-04 13:00:41 +00:00
Max Horn
3b77249ab0 cleanup; got rid of o2_printEgo
svn-id: r7300
2003-05-04 01:10:45 +00:00
Max Horn
0ce5658d66 o5_dummy -> o2_dummy (it's not used by the V5 code at all...)
svn-id: r7297
2003-05-04 00:29:52 +00:00
Max Horn
9466a5dcef Patch #730800: EGA LOOM: Hack to fix palette problem (also helps MonkeyEGA)
svn-id: r7290
2003-05-03 20:49:53 +00:00
Max Horn
7e58986519 only moved stuff (to group sound related stuff)
svn-id: r7288
2003-05-03 17:50:04 +00:00
James Brown
1038caae58 Remove some test stuff
svn-id: r7278
2003-05-03 07:29:44 +00:00
James Brown
ffdeb38b80 Fix assert with hack return. Need to fix these !a things properly one day.
svn-id: r7277
2003-05-03 07:23:53 +00:00
Jonathan Gray
fb36c0ad30 off by one error
svn-id: r7248
2003-05-01 13:45:45 +00:00
Max Horn
48293bd132 various music related changes and cleanup; also modified MonkeyVGA music sync, at least the intro is much better synced now; not sure about other parts of it / other games
svn-id: r7237
2003-05-01 00:04:05 +00:00
Max Horn
4ce574f579 cleanup
svn-id: r7215
2003-04-30 11:15:11 +00:00
Jonathan Gray
f97568e578 add patch #729633 from erik that lets you turn the straw to gold, wonder if loom ega is finishable now :)
svn-id: r7211
2003-04-30 05:55:06 +00:00
Jonathan Gray
3cce1991a0 change/comment to cursorCommond sub/op everyone is talking about
svn-id: r7198
2003-04-29 11:27:11 +00:00
Max Horn
941b198cb0 added some thoughts to Erik's (very nice!) patch
svn-id: r7196
2003-04-29 10:27:47 +00:00
Jonathan Gray
ea6dace0b2 patch #729365 indy3 intro fix by erik
svn-id: r7194
2003-04-29 09:14:05 +00:00
Max Horn
99e6ac9a3b fix loom mouse position quirks (even simplified the code :-)
svn-id: r7187
2003-04-28 18:35:28 +00:00
Max Horn
1062e67122 added two missing opcodes (well one is just a stub, but anyway :-)
svn-id: r7180
2003-04-28 14:46:55 +00:00
Jonathan Gray
7529493778 get rid of one of the obscure variable names
svn-id: r7171
2003-04-28 03:13:49 +00:00
Max Horn
30ac620bd3 drop shadow cleanup
svn-id: r7163
2003-04-27 18:49:27 +00:00
Max Horn
732d457aac Patch #728483: EGA LOOM: More text-drawing hackery
svn-id: r7162
2003-04-27 18:30:35 +00:00
Max Horn
b22f6c31f6 cleanup
svn-id: r7159
2003-04-27 16:12:30 +00:00
Max Horn
efae54c720 this indy3 hack is needed for the ega version, too; restricted zeppelin hack to the room where it is needed (this might fix the levitating guard bug)
svn-id: r7158
2003-04-27 15:58:36 +00:00
Jonathan Gray
07bd555101 this seems to be needed for indy3ega as well, note that the text is largely the wrong colour and you can't see the book or picture of the window in the diary still
svn-id: r7152
2003-04-27 11:01:42 +00:00
Paweł Kołodziejski
33c600dde5 and more share code
svn-id: r7150
2003-04-27 09:39:52 +00:00
Max Horn
7a5438a592 also fix o5_setObjectName for Indy/Loom
svn-id: r7141
2003-04-26 16:52:11 +00:00
Paweł Kołodziejski
6bd3454ae5 update for scumm v2
svn-id: r7137
2003-04-26 16:37:35 +00:00
Max Horn
1b5cac75f5 temporary work around for 16 color games
svn-id: r7136
2003-04-26 16:25:14 +00:00
Max Horn
afaac51b65 fixed issue in Loom (and other OLD_BUNDLE games?) in decodeParseString
svn-id: r7135
2003-04-26 16:17:51 +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
e3da420f36 update costume hack for indy3ega
svn-id: r7087
2003-04-23 08:43:35 +00:00
James Brown
fe0fc72e57 Pedantic stats-boosting typo fix :)
svn-id: r7039
2003-04-20 17:11:13 +00:00
Paweł Kołodziejski
d0e9fef9a2 some changes for indy ega
svn-id: r7019
2003-04-18 21:10:32 +00:00
Paweł Kołodziejski
ad7bc9b22f fixed stupid bug
svn-id: r7018
2003-04-18 20:47:19 +00:00
Paweł Kołodziejski
3efe16ffce loom ega: build custom cursor, op_wait() has more then one subopcodes(revert changes), disabled adlib_default
svn-id: r7017
2003-04-18 20:16:32 +00:00