Commit Graph

6181 Commits

Author SHA1 Message Date
Torbjörn Andersson
641d164e21 Added light mask support (in the demo this is most visible when walking
under the shack), plus some other cleanups. The s->blend & 0x02 case looks
bogus to me, but I don't know where it's used and I can't see that the
original did it differently.

svn-id: r9819
2003-08-22 07:04:50 +00:00
Torbjörn Andersson
812f42ce8e Only hide the mouse cursor if both the mouse animation and the luggage
animation are removed.

svn-id: r9818
2003-08-22 06:59:05 +00:00
Travis Howell
d960058e49 Enable bs2
svn-id: r9817
2003-08-22 06:58:02 +00:00
Jonathan Gray
a02eba1bee add sword2 cd dirs
svn-id: r9816
2003-08-22 06:40:29 +00:00
Jonathan Gray
5018d206bc stop bs2 trying to cache clusters
svn-id: r9815
2003-08-22 06:39:18 +00:00
Jonathan Gray
abf7f33dc4 loom towns needs this as well you can now learn f
svn-id: r9814
2003-08-22 03:14:29 +00:00
Jamieson Christian
bcd1f49125 More tweaks to the PPQN and tempo of AD resources.
Loom, Indy3 and monkeyvga are now all running
at the right tempo and returning appropriate
quarter note counts for the script timers.
Fixes a sync regression with the Indy3 opening
sequence under -eadlib.

Ask me if I care that these numbers may not
precisely match the disasm.

svn-id: r9813
2003-08-22 02:24:55 +00:00
Jonathan Gray
485852ba6c change sound queue overflow error to warning as error was supposed to be temporarily apparently...
svn-id: r9812
2003-08-22 01:47:15 +00:00
Jonathan Gray
d9a78a5feb change description of -b option to be more correct, also some consistency in -h output
svn-id: r9811
2003-08-22 01:18:49 +00:00
Jamieson Christian
47c33674ec Fix for Bug [792178] MI1: Intro asynchronity regression
Reverted Hoenicke's change. Why was this change made anyway?
Do not reinstate the "tempo tweak" before talking to me
about why it was needed.

svn-id: r9810
2003-08-21 15:51:28 +00:00
Jonathan Gray
446ca58580 crude fix for bug #786995 stop arrow keys being sent to scripts as they are currently stolen by the keyboard cursor control stuff. I will soon either gut the keyboard cursor stuff or make it non default as it breaks several things
svn-id: r9809
2003-08-21 15:33:25 +00:00
Jonathan Gray
a51be5d39e -Werror cleanup, don't try to free const variables...
svn-id: r9808
2003-08-21 14:58:47 +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
Torbjörn Andersson
255c7ae5ff When a menu icon reaches its full size it can be drawn directly, without
being run through the shrinker first.

svn-id: r9806
2003-08-21 11:42:27 +00:00
Oliver Kiehl
bfefcc3567 Draw combined cursor properly. Thanks to joost for finding out that the
maximum cursor size in SDL is 80x80. This *might* cause problems in some cases

svn-id: r9805
2003-08-20 21:46:00 +00:00
Torbjörn Andersson
8b9158817d Lots of cleanup.
Oh, and the menus should work now. :-)

svn-id: r9804
2003-08-20 21:17:23 +00:00
Marcus Comstedt
470fd27009 Need explicit include of stdafx because of free_check kluge...
svn-id: r9803
2003-08-20 20:03:50 +00:00
Torbjörn Andersson
875decf544 Initial (slightly buggy) support for "luggage" mouse cursors, i.e. cursors
made up from two different images.

svn-id: r9802
2003-08-20 15:43:25 +00:00
Travis Howell
f16aec61f0 Fix speedy music regression in monkeyega/vga/pass.
Add unique tag to sfx when converting AD resources, to solve sfx cutting off music issue in monkeyega/vga.

svn-id: r9801
2003-08-20 15:19:23 +00:00
Travis Howell
be0d723e7f Change Amiga palette option to Amiga version
svn-id: r9800
2003-08-20 14:01:39 +00:00
Robert Göffringmann
af17c1ac51 copied some fixes which only were in 0.5.1 branch.
svn-id: r9799
2003-08-20 12:12:11 +00:00
Joost Peters
123af30147 fix warning (properly initialise 2 dimensional arrays)
svn-id: r9798
2003-08-20 12:08:55 +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
cc781cb9b1 Ooops that would have broken v2
svn-id: r9795
2003-08-20 11:49:22 +00:00
Travis Howell
1757d5a448 v1 zak costume color almost all right.
svn-id: r9794
2003-08-20 11:45:40 +00:00
Torbjörn Andersson
7651aa2bb7 Applied a different fix for the mouse offset problem. As far as I can tell,
the old way would have made it impossible to access the (not yet
implemented) menu icons at the top of the window. I hope this one works...

svn-id: r9793
2003-08-20 11:41:43 +00:00
Torbjörn Andersson
264b2d8767 Removed some memset()s that I added earlier out of paranoia. Added a FIXME
comment, noting that DrawMouse() used to handle the "luggage animations" as
well. I don't know if I broke anything when I moved that part of the code.

svn-id: r9792
2003-08-20 11:28:22 +00:00
Jonathan Gray
77f13830ed SetMenuIcon(), other stubs in menu.cpp will have to be done for things to be visible, don't have time to do this at the moment. As a side note the demo is now finishable even though you can't see the inventory :)
svn-id: r9791
2003-08-20 11:13:13 +00:00
Jonathan Gray
52f3fa76dc correction from olki that fixes mouse y offset being too high
svn-id: r9790
2003-08-20 11:04:32 +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
Torbjörn Andersson
1100a46242 Cleaned up DrawSprite() and added scaling, based on the "line doubling"
method in the original code.

There are still a few minor things missing, but it should work well enough
for now.

svn-id: r9788
2003-08-20 06:51:35 +00:00
Torbjörn Andersson
c2df1277a6 This should fix the crash in the demo when you tried to walk down the
stairs to the water. (And probably countless other places as well.)

svn-id: r9787
2003-08-20 06:48:07 +00:00
Torbjörn Andersson
d0faf4c225 This should fix mouse cursor animations. (Actually, I hardly even looked at
what the old mouse cursor patch did. I simply replaced it with my own.
Sorry about that. :-)

svn-id: r9786
2003-08-20 06:35:15 +00:00
Oliver Kiehl
050241ff87 preliminary cursor code. dirty, hacky and no animation yet. but at least something...
svn-id: r9785
2003-08-19 21:42:21 +00:00
Torbjörn Andersson
f5cdcfa3db Fix compile.
svn-id: r9784
2003-08-19 16:10:05 +00:00
Chris Apers
a6d7d1521e Fix 1 memory leak + 102 memory leaks using launcher
svn-id: r9783
2003-08-19 15:03:27 +00:00
James Brown
ec447fdfbb Remove a bunch of unneeded cruft - but barely the surface of it. This code is depressing and duplicated all over the place... I don't think I can bear to touch this code until it's undergone some MAJOR cleanup :)
svn-id: r9782
2003-08-19 14:57:26 +00:00
Travis Howell
c284e1b507 This is only require for v1 maniac
svn-id: r9781
2003-08-19 11:11:11 +00:00
Jonathan Gray
b6ec652a49 patch #791032 from erik SWORD2: Sprite drawing (incomplete)
svn-id: r9780
2003-08-19 08:47:09 +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
f25b54159c Remove fixme
svn-id: r9777
2003-08-19 04:36:46 +00:00
Travis Howell
7771433b20 Fix for v1 maniac demo mode not setting text color before displaying text
svn-id: r9776
2003-08-19 04:34:41 +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
Travis Howell
161ef54777 Correction for v1 zak faces
svn-id: r9773
2003-08-19 03:20:09 +00:00
Robert Göffringmann
e7fb69e3d9 added MDT_PREFER_NATIVE flag to BASS VersionSettings
svn-id: r9772
2003-08-18 23:20:27 +00:00
Robert Göffringmann
f6d697444b added VersionSettings flag MDT_PREFER_NATIVE for defaulting to midi music
svn-id: r9771
2003-08-18 23:19:53 +00:00
Robert Göffringmann
cc7700f01d fix sfx restart after restoring a savegame
svn-id: r9770
2003-08-18 20:36:55 +00:00