thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
13570 commits 35 branches 0 tags 1.4 GiB
Commit graph

225 commits

Author SHA1 Message Date
Max Horn
96e40213ef New virtual method getObjectIdFromOBIM 
svn-id: r17660
 2005-04-17 23:19:16 +00:00
Max Horn
871e278f8b Reduce dependencies on scumm/util.h; modified ScummNESFile a bit so that it complies a bit better with our code formatting rules 
svn-id: r17508
 2005-04-10 12:59:17 +00:00
Max Horn
15fd220a81 Init _numObjectsInRoom in another spot 
svn-id: r17499
 2005-04-10 01:42:00 +00:00
Max Horn
866e0c8613 Fix check of the return value of findLocalObjectSlot() in loadFlObject() 
svn-id: r17473
 2005-04-09 09:49:55 +00:00
Eugene Sandulenko
b8385b0af1 Patch from Quietust. 
Do not let invenotry arrows in MM NES trigger inventory script

svn-id: r17453
 2005-04-08 15:14:49 +00:00
Travis Howell
f04f741b8b Change from Quietust: 
-Fix inventory in NES version of maniac

svn-id: r17447
 2005-04-08 06:25:57 +00:00
Max Horn
3d5b5f2ad8 Moved createResource, resourceStats, expireResources to ResourceManager 
svn-id: r17420
 2005-04-06 17:31:35 +00:00
Max Horn
1419f0d5ef Split readResTypeList into a normal and a GF_OLD_BUNDLE version; added comments to many of the GF_ feature flags; removed GF_DRAWOBJ_OTHER_ORDER (it was only use by Sam&Max, I switched that to a direct check for Sam&Max) 
svn-id: r17362
 2005-04-03 22:10:10 +00:00
Max Horn
b507231f71 ScummEngine_v4 used to be a subclass of ScummEngine_v3, now it is the other way around; added a new class ScummEngine_v3old, for GF_OLD_BUNDLE games; took advantage of the new inheritance structure and turned various methods into virtual methods which then are overriden in subclasses 
svn-id: r17346
 2005-04-03 15:06:08 +00:00
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