Commit graph

216 commits

Author SHA1 Message Date
Max Horn
9f01b54bcf Turned setupRoomObject into a virtual method
svn-id: r17326
2005-04-01 13:05:40 +00:00
Travis Howell
879de392d1 A random object state is possible in scumm7 too.
svn-id: r17324
2005-04-01 09:55:17 +00:00
Max Horn
ac247c9b94 Started to move some resource related code into a new class ResourceManager (hypothetic goal for the future: use ResourceManager in ScummEx)
svn-id: r17311
2005-03-31 21:39:31 +00:00
Max Horn
c5a77afb01 Cleaned up the object mode code; removed the friend class ScummEngine from class Gdi; moved dither code to ScummEngine
svn-id: r17277
2005-03-28 20:18:36 +00:00
Max Horn
27c73db5c2 Fix for bug #1172037 (MANIAC v2: crash on mansion (regression))
svn-id: r17275
2005-03-28 19:49:02 +00:00
Travis Howell
11e1e246cc findObject in HE72+ only checks object bounds
findObject in He70/71 only needs additional polygon check

svn-id: r17270
2005-03-28 10:02:22 +00:00
Max Horn
7ed1c19f6c Cleanup: collect the C64 specific render data into a struct inside class Gdi
svn-id: r17224
2005-03-25 00:56:03 +00:00
Eugene Sandulenko
a827bb1c05 Patch from Quietust. Proper drawing of objects and fixes to inventory.
svn-id: r17162
2005-03-16 02:14:35 +00:00
Travis Howell
82c354b9d4 A few extra bits
svn-id: r17110
2005-03-13 00:04:32 +00:00
Travis Howell
44205266e8 Add missing case for getObjectData
svn-id: r17109
2005-03-12 23:59:14 +00:00
Eugene Sandulenko
154c4af8dc Mass-renamed all variables of Actor object according to our current code
formatting standards. Earlier we had half of vars named with leading
underscore and half without it.

Now code in actor.cpp is considerably more readable.

svn-id: r17068
2005-03-11 01:10:06 +00:00
Eugene Sandulenko
32ea1644a5 Fix crash in updated Russian freddi1.
svn-id: r16795
2005-02-15 03:32:07 +00:00
Max Horn
47280d9433 Updated copyright
svn-id: r16398
2005-01-01 16:09:25 +00:00
Max Horn
ca41dba220 Use image header to detect presence of the V8 flags field; rewrote that flags field to load the ObjectData.flags field differently; added a comment in saveload.cpp since we are not yet saving ObjectData.flags
svn-id: r15479
2004-10-08 23:06:19 +00:00
Travis Howell
7eb10f167c Restrict to full game, since it doesn't exist in demo.
svn-id: r15467
2004-10-08 07:34:06 +00:00
Max Horn
ad285d6349 Use proper range for the (screen/local) strip values
svn-id: r15453
2004-10-07 21:19:37 +00:00
Max Horn
22dc16fc25 Fix blast object drawing glitches introduced by the smooth scrolling changes (were visible with the inventory in The Dig)
svn-id: r15449
2004-10-07 16:34:54 +00:00
Max Horn
3f842b2017 Simplify calling drawBomp a littl
svn-id: r15448
2004-10-07 16:10:51 +00:00
Torbjörn Andersson
7564fc2323 I don't know if it matters, but I'll feel safer if we initialise maskPtr...
svn-id: r15446
2004-10-07 15:42:39 +00:00
Travis Howell
9383a074cd Correct values.
svn-id: r15445
2004-10-07 11:31:50 +00:00
Travis Howell
993ac60b9b Revert, just made matters worse.
svn-id: r15306
2004-09-27 07:32:49 +00:00
Travis Howell
9df6b70990 tentacle (and maybe others) were reading too far.
Hopefully this way will work better.

svn-id: r15305
2004-09-27 01:35:19 +00:00
Max Horn
925d7d1aa1 Use enums instead of hard coding assumptions about their values (i.e. 1 in this case)
svn-id: r15294
2004-09-26 15:44:49 +00:00
Travis Howell
2872781231 Add HE object flag support
svn-id: r15292
2004-09-26 15:25:58 +00:00
Travis Howell
3b24bb05e4 Correction.
svn-id: r15290
2004-09-26 14:46:51 +00:00
Max Horn
dd778741c9 flag computation makes no sense; the whole thing looks quirky :-/
svn-id: r15289
2004-09-26 14:07:53 +00:00
Travis Howell
175264c36a Ooops
svn-id: r15286
2004-09-26 09:13:02 +00:00
Travis Howell
db5e307901 COMI reads object flag from headers, it doesn't use useOrDecompress at all.
svn-id: r15285
2004-09-26 08:50:10 +00:00
Max Horn
fbfa606e4f More V7_SMOOTH_SCROLLING_HACK related fixes
svn-id: r15250
2004-09-24 20:37:24 +00:00
Max Horn
5f0ec872e0 More cleanup
svn-id: r15223
2004-09-21 12:57:38 +00:00
Eugene Sandulenko
64043ff1fc Removed some not necessary #defines which could (and did) lead to program
logic misinterpretation. I assume these were added for readability, but
 (a) names suggestet that they're class variables but they didn't
 (b) their use wasn't consistent, i.e. there were places where variables were
     used directly, not by means of the macros
 (c) they didn't save that much space because they are used in few places.

svn-id: r15179
2004-09-19 00:15:17 +00:00
Max Horn
768133d6e6 Rename some member vars to avoid _ followed by an uppercase letter. More of those are left in the code, though (and I am not really sure whether we want to change that, so far we had no problems caused by this)
svn-id: r15175
2004-09-18 22:42:45 +00:00
Chris Apers
6b58b000c6 Correct variable name
svn-id: r15025
2004-09-12 10:51:00 +00:00
Jonathan Gray
3f42d6f0ab fix compiler warnings, including a if (foo = bar) occurance
svn-id: r14927
2004-09-06 07:06:11 +00:00
Travis Howell
c797a78177 HE 72+ games use a remove object from queue function.
svn-id: r14916
2004-09-06 01:10:31 +00:00
Eugene Sandulenko
96ad0d9cb7 Added BMAP support in objects.
Though I didn't test it as I don't know when it is used. Please, tell me when
you'll see warning that it is called.
Now we have BMAP for all cases in HE 70+ games.

svn-id: r14911
2004-09-05 17:39:54 +00:00
Travis Howell
fc9e18f26a HE games don't mask.
svn-id: r14863
2004-09-02 11:35:42 +00:00
Max Horn
13b6cf7c67 Added support for ImageHeader version 800, used by the COMI demo (inspired by cyx' work, see RFE #690559: support comi demo)
svn-id: r14798
2004-08-27 23:50:45 +00:00
Travis Howell
bfe88771cb A few changes for freddemo
svn-id: r14693
2004-08-23 00:17:07 +00:00
Max Horn
b20187a0e9 Cursor code cleanup
svn-id: r14690
2004-08-22 23:38:00 +00:00
Max Horn
152a5e97fe Modified VirtScreen to inherit from Graphics::Surface, and added getPixels()/getBackPixels() accessors (these changes make it a bit easier to implement smooth scrolling); also replaced some uses of rtBuffer by proper access through the corresponding VirtScreen
svn-id: r14612
2004-08-14 19:42:00 +00:00
Travis Howell
622f3ec78f Fix mouse cursors hotspot in HE games.
HE games don't change cursor hotspot, when changing cursor image.

svn-id: r14027
2004-06-24 12:32:19 +00:00
Travis Howell
b44caf2c17 Leave as warning for now
svn-id: r13992
2004-06-21 05:43:29 +00:00
Travis Howell
fce2762f29 Add some missing code
svn-id: r13990
2004-06-21 02:33:23 +00:00
Torbjörn Andersson
a15f20535f Applied my suggested fix for bug #960674, now that Fingolfin has had the
chance to look at it.

svn-id: r13957
2004-06-13 20:00:46 +00:00
Max Horn
faa12496e4 Fix for bug #893254 (MI1VGA: Changes in object names are not saved); this may introduce regressions, please report them (overall, this is a neat patch, it removes so many ugly hacks :-)
svn-id: r13325
2004-03-17 01:50:15 +00:00
Eugene Sandulenko
581e8f515a Update comment on runInventoryScript() argument in setOwnerOf().
svn-id: r13125
2004-03-01 21:36:15 +00:00
Torbjörn Andersson
e67aaba0c3 Got rid of the Sam & Max inventory hack. This fixes at least one aspect of
bug #907113. See also bug #493153 for the origins of the hack.

It would be very nice if we could get this fix into 0.6.0 as well, because
bug #907113 crashes ScummVM for reasons which escape me. But someone will
have to verify that the fix is correct first. Pretty please...?

svn-id: r13124
2004-03-01 16:07:16 +00:00
Travis Howell
929fd0591f Change debugs back to warnings (As requested)
svn-id: r12931
2004-02-18 11:46:07 +00:00
Travis Howell
2e7badd6dc Add back fix for bug #738352 and restrict to needed games only (Checked against disasm.)
svn-id: r12905
2004-02-15 13:06:09 +00:00