57 Commits

Author SHA1 Message Date
Max Horn
0ce2ca4e00 COMMON: Replace MKID_BE by MKTAG
MKID_BE relied on unspecified behavior of the C++ compiler,
and as such was always a bit unsafe. The new MKTAG macro
is slightly less elegant, but does no longer depend on the
behavior of the compiler.
Inspired by FFmpeg, which has an almost identical macro.
2011-04-12 16:53:15 +02:00
Travis Howell
4f0cc6a435 SCUMM: Add patch #3093541 - MMC64: Actor Walk / Object Fix.
svn-id: r53806
2010-10-25 08:03:55 +00:00
Max Horn
3b21db1618 SCUMM: Fix parts of bug #3087898 (SCUMM: Code analysis warnings)
svn-id: r53567
2010-10-18 16:00:07 +00:00
Torbjörn Andersson
c91a07229a JANITORIAL: Removed most punctuation at end of warning() and error()
Our warning() and error() functions always add an exclamation mark
to the end of the message anyway.

svn-id: r52791
2010-09-18 10:55:16 +00:00
Johannes Schickel
aed02365ec Strip trailing spaces/tabs.
svn-id: r47541
2010-01-25 01:39:44 +00:00
Travis Howell
8bb99f4571 Fix object names in PCE version of Loom.
svn-id: r45346
2009-10-23 12:50:51 +00:00
Travis Howell
4350f7b8c0 Fix objects structure and object scripts in PCE version of Loom.
svn-id: r45335
2009-10-22 11:33:05 +00:00
Torbjörn Andersson
b92477f6ab Fixed GCC warnings.
svn-id: r42739
2009-07-25 06:55:28 +00:00
Travis Howell
c02ad3b7bf Add patch #2821100 - MM C64 Objects / Verb fixes, with minor clean up applied.
svn-id: r42737
2009-07-25 06:27:41 +00:00
Max Horn
c4f6295330 Fixed some more warnings observed on buildbot
svn-id: r42010
2009-07-01 20:51:34 +00:00
Torbjörn Andersson
0999534749 The error() and warning() functions add ! and newline automatically. (I didn't
look at debug() and debugC(), since I'm really bored with this now. :-)

svn-id: r41061
2009-05-31 10:02:16 +00:00
Max Horn
6f4b567124 SCUMM: Split intern.h into multiple headers
svn-id: r39567
2009-03-20 16:33:58 +00:00
Travis Howell
9ffd6a8768 Fix regression in AppleII/C64 versions of Maniac Mansion.
svn-id: r38999
2009-03-01 03:45:42 +00:00
Max Horn
c96b4f692a SCUMM: Turned two former warnings into errors -- I never got reports on this warnings, with some luck we'll never get reports on the errors, too. If we get them, I'll deal with them :)
svn-id: r35292
2008-12-09 19:53:01 +00:00
Max Horn
618e7f3e31 Fix for bug #1917981: Game crash when finishing Indy3 demo. At the same time, added a new paranoia check
svn-id: r34635
2008-09-23 11:43:57 +00:00
Jordi Vilalta Prat
38a8aa516e Allow static and dynamic plugins to be used at the same time
svn-id: r31888
2008-05-06 03:00:26 +00:00
Max Horn
98a851d25e cleanup
svn-id: r31192
2008-03-19 10:17:29 +00:00
Torbjörn Andersson
aa38a8eb96 Fixed regression that would cause ScummEngine_v80he to leak polygon slots at an
alarming rate.

svn-id: r30249
2008-01-05 17:43:33 +00:00
Travis Howell
410a4a974e Enable Windows version of early HE games by default, to match already enabled 3DO/DOS/Macintosh versions of early HE games. Adding only the minimum code required for HE70 games.
svn-id: r30011
2007-12-27 11:40:29 +00:00
Nicola Mettifogo
258901bab9 Merged common/stdafx.h into common/scummsys.h. All referencing files have been updated.
svn-id: r28966
2007-09-19 08:40:12 +00:00
Max Horn
4cc9d17c34 Adding various FIXME comments to bogus (non-self-explanatory) existing FIXME comments; and some other related cleanup
svn-id: r28890
2007-09-11 09:20:39 +00:00
Max Horn
6419311a2e Added some comments
svn-id: r28886
2007-09-10 13:16:06 +00:00
Max Horn
0cccbb29d6 Some cleanup (yay for whomever had the brilliant idea to let SVN work over HTTPS and hence through proxies&firewalls :)
svn-id: r28877
2007-09-08 11:15:27 +00:00
Max Horn
218e132e37 Updated legal headers in source files, based on what Pidgin (the IM client formerly knowns as Gaim) does; added new (incomplete) COPYRIGHT file; updated copyright dates in a few spots
svn-id: r27024
2007-05-30 21:56:52 +00:00
Max Horn
aba0cd04d6 SCUMM: got rid of the _bompActorPalettePtr member var (which was only used as a hidden param to drawBomp); turned drawBomp into a regular function (used to be a ScummEngine member method)
svn-id: r26045
2007-03-10 00:34:20 +00:00
Travis Howell
8e70329ce3 Fix level selection in PC Engine version of Loom.
svn-id: r25954
2007-03-03 23:02:54 +00:00
Travis Howell
b0fea397ab Allow PC Engine version of Loom to at least start up.
svn-id: r25951
2007-03-03 12:59:48 +00:00
Travis Howell
28408d8b7b Rename C64 engine class, since it is been used by Apple II and Commodore 64 versions now.
svn-id: r25850
2007-02-25 11:38:19 +00:00
Max Horn
dc5ef8425b Introduced V12_X_SHIFT / V12_Y_SHIFT
svn-id: r25611
2007-02-15 18:12:29 +00:00
Max Horn
be052be462 Rewrote the actor walk code for SCUMM V0-V2 games: Now it uses the C64 character coordinates internally, not pixel coordinates. This should fix some walk bugs, but also might cause some regressions. Watch out
svn-id: r25370
2007-02-04 01:24:43 +00:00
Max Horn
4ce7b74085 Changed ScummEngine::_actors from an Actor array to a an array of Actor points (i.e. indirection)
svn-id: r24922
2006-12-25 15:03:36 +00:00
Max Horn
c210aff40c * Made Actor::_pos protected, added public Actor::getPos() method
* Added default params to Actor::putActor()
* Removed Actor::getActorXYPos

svn-id: r24742
2006-11-19 00:39:48 +00:00
Max Horn
46dc61163a Named / documented the V0-V2 object states (we should probably rename the corresponding opcodes here and in descumm to make reading script dumps easier)
svn-id: r24566
2006-10-29 14:45:31 +00:00
Max Horn
a0b9f78bd3 SCUMM: Introduced V12_X_MULTIPLIER and V12_Y_MULTIPLIER to make it a bit easier to find spots where we convert between C64-style coordinates and pixel coordinates (but beware, this probably doesnt't cover all relevant instances)
svn-id: r24384
2006-10-19 00:26:55 +00:00
Max Horn
5148dbb3fb cleanup
svn-id: r24383
2006-10-19 00:06:59 +00:00
Max Horn
3467a6f19b SCUMM: Got rid of BompHeader
svn-id: r24371
2006-10-18 15:08:43 +00:00
Max Horn
5e46a45aa5 SCUMM: Moved getDistanceBetween to clas ScummEngine_v6; grouped inventory related stuff in object.cpp
svn-id: r24368
2006-10-18 14:21:44 +00:00
Max Horn
d02e4d7f7c Removed CHECK_HEAP
svn-id: r23979
2006-09-23 11:29:32 +00:00
Max Horn
06ddd876a5 Fix --disable-he
svn-id: r23932
2006-09-18 19:22:40 +00:00
Max Horn
fab33bf663 Moved stored flobjects to class ScummEngine_v70he
svn-id: r23924
2006-09-17 22:22:50 +00:00
Max Horn
51017cf1b2 Renamed ScummEngine::res to _res and allocate the ResourceManager on the heap (i.e. _res is a pointer now)
svn-id: r23922
2006-09-17 20:36:48 +00:00
Max Horn
8c0b0c0120 Changed ScummEngine::gdi to _gdi and allocate the Gdi object on the heap (i.e. _gdi is a pointer now)
svn-id: r23921
2006-09-17 20:22:47 +00:00
Max Horn
b860f002b2 Replaced checkRange by assertRange, which has (a) an (IMO) more logical order of parameters, and (b) removes lots of useless duplicate information in error messages
svn-id: r23885
2006-09-16 13:38:43 +00:00
Max Horn
ceefad6634 Added workaround (and warnings to find corner cases) for bug #1535358
svn-id: r23738
2006-08-21 13:02:47 +00:00
Torbjörn Andersson
c32076e5d0 Use #include "..." instead of #include <...> for pack-start.h and pack-end.h
for consistency with other #includes.

svn-id: r23585
2006-07-23 16:13:26 +00:00
Max Horn
2859b64702 Fix struct packing issues (macros are not resolve in #pragma params, at least for GCC)
svn-id: r23569
2006-07-22 17:28:48 +00:00
Max Horn
f59cf1fcdc Removing GCC_PACK, we fully rely on START_PACK_STRUCTS / END_PACK_STRUCTS now (hiya eriktorbjorn, this one is for you *ggg*)
svn-id: r23547
2006-07-21 21:25:17 +00:00
Max Horn
f35f4a4d1c Use START_PACK_STRUCTS / END_PACK_STRUCTS when available, instead of checking for GCC / not GCC
svn-id: r23458
2006-07-09 13:01:15 +00:00
Travis Howell
a0d14a0832 Fix Commodore 64 versions
svn-id: r22732
2006-05-29 12:45:11 +00:00
Max Horn
c4df5037dc * Renamed several methods in favor of a somewhat more uniform naming scheme: setupFOO for stuff that inits static data (i.e. will be called only once, or after loading savegames), vs. resetFOO / updateFOO methods which are called frequently and (re)set dynamic data.
* Doing this, split scummInit into setupScumm and resetScumm methods
* Moved some init code to new methods (huuuuge init methods are hard to read, and hard to customize using subclassing)
* Renmaed various setup???Palette methods to set???Palette
* Some minor cleanup / tweaks

svn-id: r22227
2006-04-29 16:24:39 +00:00