Commit Graph

361 Commits

Author SHA1 Message Date
Max Horn
87d97ead35 fix by hibernatus
svn-id: r10725
2003-10-10 14:14:36 +00:00
Chris Apers
3f06651bab Moved PalmOS initializations out of namespaces.
svn-id: r10703
2003-10-09 14:17:06 +00:00
Travis Howell
94be874b70 I had this wrong way around.
svn-id: r10691
2003-10-09 05:44:46 +00:00
Travis Howell
f57a6d74a1 Fix text when room scrolls in game versions < 3.
Manual redraw of verbs areas isn't require after reload of game in loom/loomcd, causes glitches in some locations.

svn-id: r10648
2003-10-06 23:12:01 +00:00
Travis Howell
9e0b1ca890 Use _roomPalette for 256 color 'SMALL_HEADER' games too, since it seems to help some.
svn-id: r10599
2003-10-05 02:58:11 +00:00
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
Max Horn
0e645f88ae renamed namespace ScummVM to Common
svn-id: r10544
2003-10-02 17:43:02 +00:00
Max Horn
6f978e9e30 some minor cleanup
svn-id: r10437
2003-09-27 20:31:19 +00:00
Max Horn
6512592d0f moved Actor x/y to _pos.x/_pos.y -> this makes it much easier to grep for access of the actor position
svn-id: r10253
2003-09-14 18:16:45 +00:00
Travis Howell
f633ac2368 Remove color table for C64 maniac/zak since it isn't needed.
svn-id: r10045
2003-09-06 15:15:29 +00:00
Max Horn
0cff89b779 some paranoid cleanup
svn-id: r10025
2003-09-05 22:53:25 +00:00
Max Horn
4941df93f9 removed duplicate check
svn-id: r10016
2003-09-05 20:35:00 +00:00
Travis Howell
db6cd68196 Add work around for color cycling been used in monkeyvga when it shouldn't.
svn-id: r9948
2003-09-01 05:07:43 +00:00
Jonathan Gray
ea1cd18354 fix dottdemo by checking that room exists before trying to set a custom cursor from it, fixes bug #796971
svn-id: r9909
2003-08-29 07:57:20 +00:00
Travis Howell
33f9cb35a3 Change zak room color remapping, so it work correctly after load/save in room with remapped colors.
svn-id: r9905
2003-08-29 06:46:12 +00:00
Jamieson Christian
cec02390ed Fix for bug [770687] MI1: palette effect missing
Added support for CC resources in small-header
games. Right now this is enabled for monkeyvga
only. loomcd has CC resources but they don't
make any sense, and the game doesn't use palette
effects anyway.

svn-id: r9899
2003-08-29 03:35:15 +00:00
Max Horn
898bbc85d0 double cursor animation speed (see bug #757191)
svn-id: r9895
2003-08-28 19:20:30 +00:00
Travis Howell
cf4ae4097f Update warnings in mingw makefile.
Add hack to allow nosubtitles in loomcd (Only once game has started)
Revert _roomPalette changes for 256 colors games, caused problems in loomcd, I'm not sure the older 256 color needs these changes.

svn-id: r9890
2003-08-28 12:21:35 +00:00
Travis Howell
e37c930533 Add change ot fix pallete issue in 256 color small_header games
svn-id: r9874
2003-08-27 03:54:50 +00:00
Travis Howell
06d07054c3 Fix room palette issues in small_header games.
Fix is only for EGA games so far.

svn-id: r9873
2003-08-27 01:12:18 +00:00
Travis Howell
63e89e5882 Fix room colors in v1 zak
svn-id: r9869
2003-08-26 15:56:37 +00:00
Max Horn
8977d6ce07 v1 masking fixes
svn-id: r9863
2003-08-25 20:18:44 +00:00
Max Horn
953e4216b8 implemented V1/C64 object masking, and simplified drawStripC64Mask a bit
svn-id: r9859
2003-08-25 14:27:29 +00:00
Max Horn
2257f8c0cd enable V1/C64 masking
svn-id: r9857
2003-08-25 13:15:59 +00:00
Max Horn
fcf04ecbfd commented my hack
svn-id: r9851
2003-08-24 17:38:20 +00:00
Max Horn
09368e09f2 fix for bug #786994 (DOTT: no custom cursor)
svn-id: r9850
2003-08-24 17:37:28 +00:00
Jonathan Gray
ce42f4d3dd patch #791738 g++ 3.4 compile fix, from Falk Hueffner and a few minor local bits in my tree
svn-id: r9807
2003-08-21 13:39:21 +00:00
Travis Howell
e135f8a9b9 Leave masking disable for now, until it works well.
svn-id: r9789
2003-08-20 08:52:36 +00:00
Paweł Kołodziejski
61c320d587 small changes to v1 mask
svn-id: r9779
2003-08-19 07:29:15 +00:00
Travis Howell
a34f8895cb Revert color change for v1 maniac, which actually used in pool room.
svn-id: r9778
2003-08-19 04:47:38 +00:00
Travis Howell
2dd4c40868 Fix cursor cycle color for v1 games
svn-id: r9775
2003-08-19 04:28:52 +00:00
Travis Howell
d6105a3064 Cleanup v1/v2 color settings for sentance/inventory/verb area.
Add highlight color for v1 maniac

svn-id: r9774
2003-08-19 04:15:14 +00:00
Paweł Kołodziejski
91ab462ce5 ops
svn-id: r9769
2003-08-18 20:32:51 +00:00
Paweł Kołodziejski
fe94648dd6 fixed debug mode for mask maps
svn-id: r9768
2003-08-18 20:28:57 +00:00
Paweł Kołodziejski
487084e5ad fixed mask conversion for v1 games, still need properly handled
svn-id: r9765
2003-08-18 15:10:22 +00:00
Chris Apers
a47e80cb55 Updated globals access for PalmOS
svn-id: r9759
2003-08-18 10:59:21 +00:00
Bertrand Augereau
93ca5cb3af Explicitly stated a bit masking to please VC.NET2003 runtime small types conversion checks.
svn-id: r9671
2003-08-13 22:40:57 +00:00
Travis Howell
603f8b8e3a Give pass its own id
svn-id: r9654
2003-08-13 02:21:36 +00:00
Jonathan Gray
f1a3253fa2 remove GF_LOOM
svn-id: r9603
2003-08-08 11:32:40 +00:00
Travis Howell
5dd4d3e8e4 Add GF_LOOM feature flag for loom games to reduce checks.
Will make it easier to add loom fm towns target in future.

svn-id: r9547
2003-08-06 09:30:48 +00:00
Paweł Kołodziejski
e5e117006a back disable warnings into stdafx.h, vc6 is lack of warnings support
svn-id: r9337
2003-07-31 18:35:01 +00:00
Jamieson Christian
c5de745580 Disabled unknown pragma warning in MSVC-6.
svn-id: r9320
2003-07-31 06:47:05 +00:00
Max Horn
26d05c0190 the VC warning for unknown pragmas is now gloabally disabled, no need to work around it locally
svn-id: r9300
2003-07-30 18:40:28 +00:00
Max Horn
7e92048a6b typo
svn-id: r9086
2003-07-20 01:00:16 +00:00
Max Horn
2fbf782c05 moved some functions out of scummvm.cpp into more appropriate files; rearranged stuff inside scummvm.cpp to be grouped a bit more logical
svn-id: r9083
2003-07-19 18:18:01 +00:00
Travis Howell
d9ec75b249 Fix Amiga palette
svn-id: r9055
2003-07-17 05:06:59 +00:00
Travis Howell
73365aa2c7 Split the v1 palette, since there is a minor difference.
svn-id: r8999
2003-07-14 06:44:47 +00:00
Travis Howell
e6f3eb9aa5 A few color fixes for v1/v2
svn-id: r8997
2003-07-14 06:14:49 +00:00
Travis Howell
ffddfd76d9 Add correct palette for pc versions of v1 games
Add some correct colors for v1 games

svn-id: r8988
2003-07-13 15:13:43 +00:00
Max Horn
beef7347e6 added some FIXMEs
svn-id: r8974
2003-07-13 11:54:31 +00:00
Travis Howell
88550e5d21 Restore correct value
svn-id: r8908
2003-07-11 12:10:58 +00:00
Travis Howell
4c6e10bfd6 Add amiga pallete for Amiga versions
svn-id: r8904
2003-07-11 09:38:46 +00:00
Jonathan Gray
f12d23f846 correct palette on amiga version of mi, from Hibernatus
svn-id: r8797
2003-07-06 10:01:23 +00:00
Travis Howell
580e9ec770 Add support for Amiga version of Monkey Island 1
Palette is still wrong

svn-id: r8790
2003-07-06 06:19:52 +00:00
Max Horn
ea3b77e3a6 rewrote desaturatePalette using integer arithmetics only
svn-id: r8732
2003-07-03 23:59:35 +00:00
Max Horn
b13c0bb201 Fix for bug #743041: ZAK256: wrong color in costume (intro). Thanks to Hibernatus for providing the deciding clue
svn-id: r8684
2003-07-01 11:59:51 +00:00
Jonathan Gray
5a6c3109a0 note that we are missing decompress routines for codecs 8,9,10 and which games they occur in
svn-id: r8646
2003-06-25 03:24:02 +00:00
Bertrand Augereau
73f2ea0b94 Special case for screen-wide blits
svn-id: r8626
2003-06-22 17:22:40 +00:00
Torbjörn Andersson
90b8e7615d Tweaks to colours 10, 11, 13 and 14 in the EGA palette. They don't make
much difference visually, but this way I understand where the colours come
from. (Except for colour 6 which seems to be some sort of exception.)

svn-id: r8532
2003-06-17 14:52:23 +00:00
Travis Howell
6e5471029d Revert Amiga specific changes to EGA palette.
An option for C64 and Amiga palette should be added in future

svn-id: r8531
2003-06-17 13:06:40 +00:00
Jonathan Gray
d2bb0149d3 tweak ega palette a bit more
svn-id: r8525
2003-06-17 08:21:46 +00:00
Jonathan Gray
33791b7929 ega palette changes, correct colour used for sentence line and use amiga colour for colour normally used for skin colours, sarien does something similiar...
svn-id: r8524
2003-06-17 07:14:39 +00:00
Max Horn
f7a8cbf7c7 Patch #754151: Removed READ_*_UNALIGNED and always read stuff bytewise; augmented by some more changes of mine
svn-id: r8482
2003-06-14 18:52:30 +00:00
Max Horn
b7ddc7bc57 allow quit during smush playback; cleanup
svn-id: r8411
2003-06-09 01:32:36 +00:00
Torbjörn Andersson
ab7f8b3378 Fixed recent regression (too many blast texts) in The Dig's end credits and
made the text scroll off the screen instead of just vanishing at the top.
(The latter also applies to Full Throttle's end credits.)

svn-id: r8402
2003-06-08 15:17:14 +00:00
Max Horn
209cd912cf cleanup
svn-id: r8384
2003-06-07 22:56:47 +00:00
Torbjörn Andersson
b6b6fb52e5 CD Loom and EGA Loom should not use the same dissolve effect, so I've
reverted that part of the Loom unification and clarified the comments
slightly.

I also slowed down the CD Loom dissolve a bit. It's still faster than the
default behaviour, but I think it looks better this way. (Feel free to
change that back again if you don't agree.)

svn-id: r8381
2003-06-07 11:59:56 +00:00
Max Horn
49b9a8fc9d follow our coding conventions
svn-id: r8377
2003-06-07 00:49:36 +00:00
Max Horn
033c264ea5 Loom unification
svn-id: r8373
2003-06-07 00:16:22 +00:00
Max Horn
86df3537b9 replaced GF_AFTER with _version
svn-id: r8372
2003-06-07 00:13:26 +00:00
Max Horn
1cae280e79 rewrite code a bit: personally I find it much easier to understand what the code does this way (the &6 trick is cute, but obfuscates the meaning of the code)
svn-id: r8360
2003-06-06 20:55:39 +00:00
Torbjörn Andersson
6e0a3ec6fa Order matters! Inverse iris is transition effect 5 and nothing else.
svn-id: r8350
2003-06-06 12:27:33 +00:00
Jonathan Gray
620762b466 v1 object drawing updates from aquadran
svn-id: r8346
2003-06-06 07:35:19 +00:00
Paweł Kołodziejski
00288b07f8 fixed almost object drawing for v1 games, (ugly hack for drawBitmap)
svn-id: r8345
2003-06-06 05:27:45 +00:00
Max Horn
067609c832 cleanup
svn-id: r8341
2003-06-06 00:16:34 +00:00
Max Horn
6f9b34df1e unified some code
svn-id: r8339
2003-06-05 23:55:57 +00:00
Paweł Kołodziejski
5e18dc19ff a little better
svn-id: r8333
2003-06-05 19:26:43 +00:00
Paweł Kołodziejski
da6ac080af disabled mask for now
svn-id: r8331
2003-06-05 18:37:11 +00:00
Paweł Kołodziejski
44e76b4da6 fixed my last commit
svn-id: r8330
2003-06-05 18:30:29 +00:00
Paweł Kołodziejski
94bbf1b9a0 added v1 gfx codec, (not working)
svn-id: r8329
2003-06-05 17:22:15 +00:00
Torbjörn Andersson
b8080605cc Inverse iris transition effect for V2 games. Also, some transition effects
weren't working properly unless the entire screen was first marked as not
dirty. I hope fixing that didn't break anything else.

svn-id: r8314
2003-06-05 07:05:37 +00:00
Max Horn
870572ca49 there are a few places in maniac and zakdemo where we *do* have to store the run & color <grmbl>
svn-id: r8306
2003-06-05 00:18:15 +00:00
Max Horn
c898d6117e finished my drawBitmap optimisations
svn-id: r8305
2003-06-05 00:12:23 +00:00
Max Horn
ffef453d1a cache room strip offsets (this should help performance on PalmOS)
svn-id: r8300
2003-06-04 21:45:29 +00:00
Torbjörn Andersson
0bb87879c8 V2 mouse cursor, for that extra retro feel
svn-id: r8288
2003-06-04 06:34:14 +00:00
Max Horn
333f0d15fd fix flashlight in MM
svn-id: r8285
2003-06-03 15:27:11 +00:00
Max Horn
281cce32b9 cleanup color cyclcing code; also perform color cycling on 'indirect' palettes like the shadow palette(s) (bug #706721)
svn-id: r8257
2003-06-02 00:34:58 +00:00
Max Horn
393e749785 charset masking fixes, mostly for The Dig (hey I think I finally almost understand that part of the code :-)
svn-id: r8248
2003-06-01 17:29:45 +00:00
Max Horn
cb5fb5d403 added a getMaskBuffer method (makes it easier to read some of the code); merged setVirtscreenDirty() into updateDirtyRect(); made setDirtyRange a method of struct VirtScreen
svn-id: r8241
2003-06-01 14:30:26 +00:00
Max Horn
e63dec5f56 clearUpperMask -> clearCharsetMask
svn-id: r8206
2003-06-01 01:02:35 +00:00
Max Horn
eb039ec554 some cheap doxygen docs; cleanup
svn-id: r8154
2003-05-30 20:13:29 +00:00
Max Horn
c6b35e15a0 moved bomp stuff into own files; removed some of our 6 (!) bomp decoders
svn-id: r8151
2003-05-30 19:00:33 +00:00
Max Horn
90468ea46e cleanup
svn-id: r8150
2003-05-30 17:52:17 +00:00
Max Horn
5725ee392a code unification
svn-id: r8146
2003-05-30 15:39:06 +00:00
Max Horn
3d28cfaf82 cleanup
svn-id: r8145
2003-05-30 15:06:29 +00:00
Max Horn
37fa2df49a cleanup; removed last horizontal bound check from updateDirtyRect -> now all the various 'offscreen actor redraw' problems should be fixed (at least I can't reproduce them in COMI anymore), while The Dig should still work just fine (at least it does in my test cases)
svn-id: r8129
2003-05-30 02:01:45 +00:00
Max Horn
9f301f16e6 removed more harmful clipping
svn-id: r8128
2003-05-30 01:37:50 +00:00
Max Horn
5ea6cbe51d this clip is bad: it's not needed (we clip later anyway), and it clips too much
svn-id: r8125
2003-05-30 00:48:35 +00:00
Max Horn
1db0f749ca moved camera stuff to own file
svn-id: r8099
2003-05-29 12:55:28 +00:00