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 |
|
Max Horn
|
a8603e5bfc
|
some more ScummVM::Rect
svn-id: r7548
|
2003-05-15 22:36:43 +00:00 |
|
Jamieson Christian
|
69c118a43e
|
Some more streamlining
svn-id: r7547
|
2003-05-15 22:31:56 +00:00 |
|
Max Horn
|
f4c7f37743
|
Make use of ScummVM::Rect
svn-id: r7546
|
2003-05-15 22:30:32 +00:00 |
|
Max Horn
|
8b419944ee
|
ScummPoint -> ScummVM::Point
svn-id: r7543
|
2003-05-15 21:57:38 +00:00 |
|
Jamieson Christian
|
73e086fe62
|
_saveSound implementation
svn-id: r7542
|
2003-05-15 21:55:13 +00:00 |
|
Max Horn
|
82e2d852f1
|
cleanup
svn-id: r7538
|
2003-05-15 21:31:03 +00:00 |
|
Max Horn
|
095aff34d5
|
cleanup / added FIXME
svn-id: r7536
|
2003-05-15 21:09:55 +00:00 |
|
Max Horn
|
cc8da4538d
|
added comment
svn-id: r7535
|
2003-05-15 20:47:31 +00:00 |
|
Jamieson Christian
|
2c3ee5aed0
|
Fixed main timing loop
svn-id: r7534
|
2003-05-15 20:34:42 +00:00 |
|
Jamieson Christian
|
420095e1f3
|
Whoops, disable debug
svn-id: r7533
|
2003-05-15 19:40:10 +00:00 |
|
Jamieson Christian
|
c13591816a
|
More streamlining
svn-id: r7532
|
2003-05-15 19:39:10 +00:00 |
|
Jamieson Christian
|
00857367f3
|
Fixed S&M regression in World of Fish music.
Stripped out a bunch of deprecated stuff.
svn-id: r7529
|
2003-05-15 18:24:59 +00:00 |
|
Max Horn
|
c1c9510ae8
|
fixed the evil, evil COMI crash on Mac OS X (and memory corrupter elsewhere, maybe?). The last part of this change is the crucial one, computing the correct value for right_strip
svn-id: r7527
|
2003-05-15 17:57:52 +00:00 |
|
Max Horn
|
6fa0114eee
|
adding some asserts (e.g. against that evil COMI crasher)
svn-id: r7526
|
2003-05-15 17:53:23 +00:00 |
|
Jamieson Christian
|
33c8c2fae8
|
Fixed panning issue
svn-id: r7524
|
2003-05-15 13:56:41 +00:00 |
|
Jamieson Christian
|
94f07fd342
|
Changed custom MT-32 instrument warning to debug output
svn-id: r7521
|
2003-05-15 00:27:19 +00:00 |
|
Max Horn
|
f3a5fc79c1
|
bounds check; made data static
svn-id: r7519
|
2003-05-15 00:03:49 +00:00 |
|
Max Horn
|
885f28b6ae
|
cleanup
svn-id: r7518
|
2003-05-14 23:28:56 +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
|
d4841c9197
|
new V2 font (taken from german zak.exe)
svn-id: r7509
|
2003-05-14 16:38:55 +00:00 |
|
Max Horn
|
d7352e8e19
|
fixed V2 decodeParseString
svn-id: r7508
|
2003-05-14 14:22:15 +00:00 |
|
Max Horn
|
23fd68d2b6
|
fixed light blue EGA palette entry
svn-id: r7507
|
2003-05-14 14:07:11 +00:00 |
|
Max Horn
|
a4915a3304
|
default text color light blue instead of pink
svn-id: r7506
|
2003-05-14 14:00:29 +00:00 |
|
Max Horn
|
d80f9e34e0
|
v2 text output tweak
svn-id: r7505
|
2003-05-14 13:50:28 +00:00 |
|
Max Horn
|
1da2ef8de3
|
always draw walkboxes into virtScreen 0
svn-id: r7504
|
2003-05-14 13:38:58 +00:00 |
|
Max Horn
|
45b2698b24
|
cleanup
svn-id: r7503
|
2003-05-14 13:32:43 +00:00 |
|
Max Horn
|
bc99915aa5
|
V2 text drawing
svn-id: r7502
|
2003-05-14 13:30:52 +00:00 |
|
Jonathan Gray
|
50a857a406
|
make gcc with extra extra warnings happy
svn-id: r7501
|
2003-05-14 12:32:40 +00:00 |
|
Max Horn
|
d8048837f3
|
fixed v2 verb handling
svn-id: r7500
|
2003-05-14 12:26:23 +00:00 |
|
Max Horn
|
45ae0f0d61
|
force fixed width font in V2 games (our font data is proportional, hence this looks odd for now; proper fix will be to get proper font data)
svn-id: r7499
|
2003-05-14 12:12:55 +00:00 |
|
James Brown
|
0106191abd
|
Some Zak input stuff
svn-id: r7498
|
2003-05-14 11:08:57 +00:00 |
|
Max Horn
|
feee742268
|
added opcode 0xf7 (getActorZPlane)
svn-id: r7497
|
2003-05-14 10:16:57 +00:00 |
|
Max Horn
|
86b916b762
|
V8 fix
svn-id: r7496
|
2003-05-14 10:14:05 +00:00 |
|
Max Horn
|
afe038d6dd
|
Patch #737497 / Bug #737387
svn-id: r7495
|
2003-05-14 09:49:44 +00:00 |
|
Max Horn
|
05c44e606e
|
various V8 tweaks
svn-id: r7494
|
2003-05-14 09:47:53 +00:00 |
|
Max Horn
|
4ab566af90
|
handle EOF (Ctrl-D) a little bit better
svn-id: r7492
|
2003-05-14 00:44:44 +00:00 |
|
Max Horn
|
395b11b26c
|
added box drawing code from the old debugger to the new debugger (and cleaned it up + fixed it for rooms wider than one screen)
svn-id: r7491
|
2003-05-14 00:35:08 +00:00 |
|
Max Horn
|
f618744799
|
make it possible to use stdio for the debugger, instead of the console dialog (useful because the console is very narrow, which is annoying when using e.g. the 'box' command
svn-id: r7490
|
2003-05-13 23:56:30 +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
|
796fa74806
|
cleanup
svn-id: r7487
|
2003-05-13 23:03:18 +00:00 |
|
Max Horn
|
fea9aed00a
|
fixed more illegal var access in COMI
svn-id: r7486
|
2003-05-13 17:55:24 +00:00 |
|
Max Horn
|
2838aae2f4
|
renamed VAR_UNK_SCRIPT to VAR_SAVELOAD_SCRIPT; fixed V8 save/load (no (known) VAR_SAVELOAD_SCRIPT value for V8)
svn-id: r7485
|
2003-05-13 17:51:56 +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
|
47227fdf77
|
cleanup (fixes another VC warning, too ;-)
svn-id: r7480
|
2003-05-12 21:53:36 +00:00 |
|
Max Horn
|
0e226588f1
|
fixed another VC warning
svn-id: r7479
|
2003-05-12 21:50:28 +00:00 |
|
Max Horn
|
b2d7f502f6
|
made hasCharsetMask return a bool (fixes VC compilation warnings)
svn-id: r7478
|
2003-05-12 21:35:56 +00:00 |
|
Max Horn
|
3f798a92b6
|
added a hack to draw z masks onto the screen (useful to debug potential z masking bugs, like bug #724685)
svn-id: r7476
|
2003-05-12 20:33:47 +00:00 |
|
Max Horn
|
b43ea06a80
|
fixed illegal var access in V7/V8 games
svn-id: r7475
|
2003-05-12 19:53:18 +00:00 |
|
Max Horn
|
f4be51cd68
|
modified akos / 'old' costume (charset) masking code to a) match each other; also, the costume.cpp code looks again checks _zbuf != 0 even for non-SMALL_HEADER games, as it used to 1 year ago ;-) (note: this change is kinda experimental; might fix some bugs, might introduce some regressions)
svn-id: r7473
|
2003-05-12 17:50:09 +00:00 |
|
Max Horn
|
12f7d71bf2
|
fix regression in MI1 (and possibly others)
svn-id: r7472
|
2003-05-12 16:57:04 +00:00 |
|
Max Horn
|
b2f22cabf7
|
correction: V2 mask decompression works 100% correct. We just ignore it.
svn-id: r7430
|
2003-05-11 11:27:19 +00:00 |
|
Max Horn
|
e5f8056d88
|
cleanup / tweaks (V2 masking, at least in Zakdemo, seems not to work properly, though)
svn-id: r7429
|
2003-05-11 11:13:24 +00:00 |
|
Max Horn
|
134c32bc98
|
cleanup
svn-id: r7428
|
2003-05-11 00:28:43 +00:00 |
|
Max Horn
|
79d3863db4
|
more V2 'char coord' fixes
svn-id: r7427
|
2003-05-11 00:03:03 +00:00 |
|
Max Horn
|
bf270d9243
|
walkbox & putActor coords in V2 are in 'character coordinates' - x has to multiplied by 8 and y by 2
svn-id: r7426
|
2003-05-10 23:47: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
|
f412952667
|
fixed object drawing state handling for V2 games (this shouldn't cause any regressions in newer games)
svn-id: r7424
|
2003-05-10 22:12:23 +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
|
e5fe73726a
|
cleaned up / fixed some V2 state stuff
svn-id: r7422
|
2003-05-10 21:35:06 +00:00 |
|
Max Horn
|
08a9a07c40
|
fixed the way redrawBGStrip invokes drawBitmap -> this makes the office scene in the Zak intro show up correctly (again thanks to MadMoose for the clue that lead to the right solution :-)
svn-id: r7421
|
2003-05-10 21:33:28 +00:00 |
|
Max Horn
|
9401435b6f
|
fixed operator precedence (thanks MadMoose)
svn-id: r7420
|
2003-05-10 21:23:17 +00:00 |
|
Max Horn
|
6bf0b6cb0d
|
fixed script dumping for flobject script in V6/V7 games
svn-id: r7419
|
2003-05-10 18:38:59 +00:00 |
|
Max Horn
|
4c6cb1d7c9
|
removed obsolete check
svn-id: r7418
|
2003-05-10 18:33:04 +00:00 |
|
Max Horn
|
c490ba5253
|
oops
svn-id: r7417
|
2003-05-10 18:31:00 +00:00 |
|
Max Horn
|
f740959216
|
removed obsolete code; cleanup for my V2 drawBitmap 'hack', which got rid of most of the duplicate code
svn-id: r7416
|
2003-05-10 17:09:21 +00:00 |
|
Max Horn
|
76b7537149
|
implemented v2 masking (at least I get no negative effects, but anybody feel free to valgrind this :-)
svn-id: r7415
|
2003-05-10 16:57:04 +00:00 |
|
Jonathan Gray
|
7f0b853ca7
|
fix variable acces
svn-id: r7414
|
2003-05-10 14:40:09 +00:00 |
|
Max Horn
|
c4741d89a3
|
new V2 drawBitmap implementation which handles object drawing, too; no masking implemented yet. Once it fully works, will remove all the _egaStrip* stuff
svn-id: r7413
|
2003-05-10 14:30:58 +00:00 |
|
Max Horn
|
114af3159e
|
added a 'width' parameter to drawBitmap (contrary to 'numstrips', it specifies the full width of the image passed in, not how much we shoul draw of it) - this will be used for the new V2 drawBitmap code; renamed drawBitmap parameter 'h' to 'height'
svn-id: r7412
|
2003-05-10 12:59:32 +00:00 |
|
Max Horn
|
97197f95ea
|
cleanup
svn-id: r7411
|
2003-05-10 12:23:02 +00:00 |
|
Max Horn
|
54a9ad3204
|
super hackish mouse click support for Zak (doesn't do anything useful in MM yet; and in Zak, all clicks are for the scene, i.e. no verb clicks etc.)
svn-id: r7408
|
2003-05-09 22:26:00 +00:00 |
|
Max Horn
|
3a9d8cd8f4
|
implemented v2 walkboxes (at least the debugger output looks right now, though I might have overlooked something)
svn-id: r7406
|
2003-05-09 21:46:34 +00:00 |
|
James Brown
|
ff3429ddab
|
V2 Vars Fix
svn-id: r7404
|
2003-05-09 06:03:48 +00:00 |
|
James Brown
|
c126cf2df8
|
Fix intro room transition. Seems correct, so the fixme is really just explanitory.
svn-id: r7403
|
2003-05-09 05:55:11 +00:00 |
|
Jonathan Gray
|
8c8406cf50
|
zakstdemo now finishes properly and loops etc, this check seems to be wrong for v2 games at least
svn-id: r7402
|
2003-05-09 03:02:49 +00:00 |
|
Max Horn
|
15bddf437b
|
updated my FIXME comment
svn-id: r7401
|
2003-05-09 01:17:31 +00:00 |
|
Max Horn
|
88c1f3ac18
|
fixed V2 drawObject
svn-id: r7400
|
2003-05-09 01:01:53 +00:00 |
|
Max Horn
|
bb4f806954
|
cleanup
svn-id: r7399
|
2003-05-09 00:57:10 +00:00 |
|
Max Horn
|
c63ec9d008
|
added a v2 charset rendered (with a hardcoded font take from german zak); enabled verbs in zak (well, they are drawn at least :-)
svn-id: r7398
|
2003-05-08 22:44:46 +00:00 |
|
Max Horn
|
4d7f7a8c80
|
yet more v2 var fixes
svn-id: r7397
|
2003-05-08 21:14:21 +00:00 |
|
Max Horn
|
af14dabc75
|
more v2 var fixes
svn-id: r7396
|
2003-05-08 21:02:46 +00:00 |
|
Max Horn
|
6d2c0de5f2
|
more v2 var access fixes
svn-id: r7395
|
2003-05-08 20:37:06 +00:00 |
|
Max Horn
|
0461222181
|
fixed various cases of bad var access
svn-id: r7394
|
2003-05-08 15:58:30 +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
|
6ab104cc3c
|
some V2 fixes (we really really need to revise the _vars handling!)
svn-id: r7392
|
2003-05-08 14:32:25 +00:00 |
|
Max Horn
|
07bbeb31e9
|
fixed o2_resourceRoutines
svn-id: r7391
|
2003-05-08 14:14:37 +00:00 |
|
Max Horn
|
86e28c807e
|
oops that was an accidental change
svn-id: r7390
|
2003-05-08 10:48:29 +00:00 |
|
James Brown
|
68f821c67d
|
Hack: Turn on ignore walkboxes in V2 to stop intro freezing. Remove when we have V2 walkbox support (ugh...)
svn-id: r7388
|
2003-05-08 06:17:30 +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
|
8188d946b3
|
fixed warning
svn-id: r7383
|
2003-05-07 22:50:15 +00:00 |
|