Commit Graph

116 Commits

Author SHA1 Message Date
Max Horn
d7660a2662 introduced namespace Scumm; made #include statements use scumm/ prefix explicitly
svn-id: r10571
2003-10-03 18:33:57 +00:00
Max Horn
3f55f2669d renamed class Scumm to ScummEngine (consisten with other engine names; also makes room for a potential 'Scumm' namespace)
svn-id: r10549
2003-10-02 22:42:03 +00:00
Travis Howell
b91c182571 Revert v1 zak face costume color nack to 8, since palette is fixed.
svn-id: r9870
2003-08-26 16:09:09 +00:00
Max Horn
6d4475cf04 cleanup
svn-id: r9865
2003-08-25 21:00:12 +00:00
Max Horn
95b8558191 check for costume format, not engine version
svn-id: r9860
2003-08-25 14:54:32 +00:00
Max Horn
e40e6bb207 fixed and cleaned up V1 actor masking
svn-id: r9856
2003-08-25 13:13:43 +00:00
Travis Howell
4b6800fcf9 Minor cleanup
svn-id: r9839
2003-08-24 02:15:12 +00:00
Travis Howell
fc005be4d9 Remove my junk
svn-id: r9797
2003-08-20 12:08:44 +00:00
Travis Howell
327d37ae78 v1 zak costume colors should be perfect now
svn-id: r9796
2003-08-20 12:04:25 +00:00
Travis Howell
1757d5a448 v1 zak costume color almost all right.
svn-id: r9794
2003-08-20 11:45:40 +00:00
Paweł Kołodziejski
61c320d587 small changes to v1 mask
svn-id: r9779
2003-08-19 07:29:15 +00:00
Travis Howell
161ef54777 Correction for v1 zak faces
svn-id: r9773
2003-08-19 03:20:09 +00:00
Paweł Kołodziejski
8141126e6e fixed y position of mask in v1 costume rendering
svn-id: r9767
2003-08-18 17:59:06 +00:00
Chris Apers
a47e80cb55 Updated globals access for PalmOS
svn-id: r9759
2003-08-18 10:59:21 +00:00
Travis Howell
9b5eb1137f Add support for flashlight in v1 maniac by converting older values.
Prevent warning about dummy function (Which has no purpose) in zak

svn-id: r9756
2003-08-18 10:46:42 +00:00
Travis Howell
311eb2678f Use correct costume color for darkness in v1 zak
svn-id: r9752
2003-08-18 06:59:18 +00:00
Travis Howell
4c6bd7167d Fix v1 zak costume colors
svn-id: r9748
2003-08-18 02:16:48 +00:00
Torbjörn Andersson
1bb575da9d Enabled the v1 costume palette tables Kirben and Hoenicke added earlier.
svn-id: r9745
2003-08-17 16:53:00 +00:00
Travis Howell
d343ef10b3 Remove c64_ignorePakCols calls for v1 games, since they cause crashes and don't seem to be required.
Makes v1 maniac completable, maybe v1 zak too.

svn-id: r9736
2003-08-17 12:13:17 +00:00
Travis Howell
811f29fe79 Add palette tables for v1 costumes, thanks to Hoenicke
Code isn't enabled yet though.

svn-id: r9733
2003-08-17 05:46:48 +00:00
Travis Howell
3ddb50711e Set v1 actor color to static for now, so actors can at least be seen easier.
Change default colors so at least Dave's color look right.

svn-id: r9699
2003-08-15 05:55:33 +00:00
Bertrand Augereau
03524d071e Explicitly stated a bit masking to please VC.NET2003 runtime small types conversion checks.
svn-id: r9674
2003-08-13 23:07:05 +00:00
Jonathan Gray
b1f2e66e30 this makes more sense in hex
svn-id: r9645
2003-08-12 05:28:11 +00:00
Jonathan Gray
aefdffbd2d mention what format a costume is using (ie why it is invalid)
svn-id: r9644
2003-08-12 04:53:35 +00:00
Travis Howell
82328fa050 Ooops that should only be for Amiga scumm 5 games.
svn-id: r9637
2003-08-11 06:24:19 +00:00
Jamieson Christian
50ce07c391 Fix for Bug [770364] MI2: Amiga - Segfault when entering bar
Possible fix for Bug [770085] MI2: Amiga version always crashes after a few minutes

Corrected OOB graphics writes in proc3_ami() by fixing the
mask to properly detect negative Y values. Don't know if
this is the right way to fix this -- there are enough GFX
bugs in the Amiga code as to make assessment difficult --
but at least it averts crashes.

svn-id: r9634
2003-08-11 03:52:34 +00:00
Travis Howell
0e831751bc Fix a regression, this code is required for Amiga versions!
Fixes some brief costume distortions

svn-id: r9633
2003-08-11 03:45:12 +00:00
Max Horn
becd70d243 cleanup: encapsulate some more members of class Actor, and rename newDirection -> targetFacing (since it corresponds to the future value of 'facing'; the distinction between 'facing' and 'direction' is extremly fuzzy)
svn-id: r9175
2003-07-24 17:44:00 +00:00
Paweł Kołodziejski
2056a62f98 moved up code for v1 setActorPalette func
svn-id: r9084
2003-07-19 20:10:40 +00:00
Max Horn
3ce7459814 fixed up c64_ignorePakCols (it's still a hack and not working properly, but at least it doesn't crash anymore; we probably should just remove it, and then handle the skiping inside proc64); determin which costume codec to use based on the costume format, not the scumm version
svn-id: r9019
2003-07-14 19:24:34 +00:00
Max Horn
f73cd745f1 reduce code duplication; theoretical masking implementation for C64 costumes, can't test since masking is disabled in gfx.cpp for C64/V1 games
svn-id: r8972
2003-07-13 11:13:50 +00:00
Max Horn
eb49053e08 C64 costumes work now enough to be recognizable
svn-id: r8970
2003-07-13 10:35:05 +00:00
Travis Howell
6949d49e69 Simpler check
svn-id: r8969
2003-07-13 09:01:30 +00:00
Max Horn
00615e4df7 fix x/y limb offsets and transparancy with C64 costume renderer
svn-id: r8962
2003-07-13 02:45:31 +00:00
Max Horn
fe944219eb not sure which of the two variants is correct (but I am pretty sure the old one, with _height>>3, was wrong)
svn-id: r8867
2003-07-08 18:18:26 +00:00
Max Horn
d5b1b68634 each row has to be drawn 8 times (8x8 chars, after all), see also Gdi::drawStripC64Object etc.)
svn-id: r8866
2003-07-08 18:09:57 +00:00
Max Horn
66ec3f9c75 rewrote c64_ignorePakCols to what I *think* it should look like, base on my understanding of the code. so far completely untested :-)
svn-id: r8864
2003-07-08 17:44:06 +00:00
Max Horn
ebd5310473 width has to be multiplied by 8; not sure about xmove, the values still look completely wrong compared to V2
svn-id: r8862
2003-07-08 17:22:53 +00:00
Max Horn
d9a604a925 turns out the +4 on _baseptr is needed everywhere - now _animCmds matches between V1 and V2 MM, too, as well as the frameptr
svn-id: r8861
2003-07-08 17:08:44 +00:00
Max Horn
c1635b94bf the 'mask' value is now also right; data at 'r' seems to match, too, and finally the same limbs are used in V1 MM as in V2 MM
svn-id: r8860
2003-07-08 16:53:18 +00:00
Max Horn
5428987a04 _dataOffsets has the correct value now (based on comparisions of repeated offsets in the offsets tables, and matching them up between V1 and V2)
svn-id: r8859
2003-07-08 16:47:15 +00:00
Max Horn
501e728d02 again some code transformation (no functionality change; the V1 specific modifications now mostly have to be done in one spot, and it's now pretty obvious how things evolved towards AKOS
svn-id: r8858
2003-07-08 16:31:01 +00:00
Max Horn
8dd90916e0 ok, thanks erik for pointing out to me where this occurs :-)
svn-id: r8857
2003-07-08 16:17:41 +00:00
Max Horn
588279dd4f some more cleanup / C64 tweaks
svn-id: r8856
2003-07-08 13:11:42 +00:00
Max Horn
319233d75f make more explicit :-)
svn-id: r8855
2003-07-08 12:29:57 +00:00
Max Horn
848cfb9378 costume code cleanup & some more C64 tweaks
svn-id: r8854
2003-07-08 12:28:57 +00:00
Max Horn
1d69c33819 clarified comment
svn-id: r8853
2003-07-08 10:51:55 +00:00
Max Horn
07bd98b27f move V1_ignorePakCols to CostumeRenderer (it makes absolutely no sense to keep it in BaseCostumeRenderer), and renamed it to c64_ignorePakCols to avoid confusion (V1 in the context of costumes means the original costume format, as opposed to AKOS; and *not* the scumm version); added FIXME to cost_decodeData (have my doubts about it being correct)
svn-id: r8852
2003-07-08 10:49:13 +00:00
James Brown
5857979d67 Add missing bit of code, still hopelessly broken.
svn-id: r8841
2003-07-07 15:12:21 +00:00
James Brown
04abb69a84 Attempt some more V1 costume work. Not that it helps yet.
svn-id: r8773
2003-07-05 11:45:18 +00:00