Commit Graph

6270 Commits

Author SHA1 Message Date
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
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
8141126e6e fixed y position of mask in v1 costume rendering
svn-id: r9767
2003-08-18 17:59:06 +00:00
Paweł Kołodziejski
c9b0544625 some changes for smush codec 1 and 3, handled by bomp decompression
svn-id: r9766
2003-08-18 15:13:15 +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
Jamieson Christian
4748b92b33 Commented MI1 Demo fix.
svn-id: r9764
2003-08-18 13:55:12 +00:00
Chris Apers
d76b92d2b7 Make smush player works under PalmOS
svn-id: r9763
2003-08-18 12:53:26 +00:00
Chris Apers
a3c5ba1da4 Updated
svn-id: r9762
2003-08-18 11:25:50 +00:00
Chris Apers
48c17b76a5 Added missing files
svn-id: r9761
2003-08-18 11:15:43 +00:00
Travis Howell
d91320f7ce Remove debug
svn-id: r9760
2003-08-18 11:09:11 +00:00
Chris Apers
a47e80cb55 Updated globals access for PalmOS
svn-id: r9759
2003-08-18 10:59:21 +00:00