libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-30 07:23:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

SCI: kAnimate bit 2 is hoyle 4 exclusive

Browse Source 
adjusted comments about that and also renamed the bit, also added additional TODO, because hoyle 4 has special code that gets into action, when bit 0 is not set, but bit 2 is

svn-id: r53853
This commit is contained in:
Martin Kiewitz 2010-10-26 16:21:00 +00:00
parent a877ba0026
commit 9af803f575
2 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/sci/graphics/animate.cpp
View File

@ -286,16 +286,12 @@ void GfxAnimate::fill(byte &old_picNotValid) {
view->getCelRect(it->loopNo, it->celNo, it->x, it->y, it->z, it->celRect);
}
// This statement must be here for Hoyle4, otherwise cards are unclickable.
// This is probably one of the experimental features that were occasionally
// added to SCI interpreters; the corresponding check is absent in many SSCI
// versions. m_kiewitz knew about this flag before I (lskovlun) implemented it,
// so it is possible that more test cases are known. Also, some presently open
// SCI1.1 bugs may be fixed by this and should be re-tested with this patch generalized.
// NOTE: *this* breaks at least eco quest 2. One should go through interpreters and check
// the code before enabling it for more games (TODO)
if ((g_sci->getGameId() == GID_HOYLE4) && (it->scaleSignal & kScaleSignalDontSetNsrect))
// Checking for this bit must be here for Hoyle4, otherwise cards are unclickable.
// This feature is not included in the other SCI1.1 interpreters and MUST NOT be
// checked in those cases, otherwise we will break games (e.g. EcoQuest 2, room 200)
// TODO: hoyle 4 has different code inside kAnimate and even special code, when bit 0 is not
// set, but bit 2 is
if ((g_sci->getGameId() == GID_HOYLE4) && (it->scaleSignal & kScaleSignalHoyle4DontSetNsrect))
setNsRect = false;
if (setNsRect) {

6
engines/sci/graphics/animate.h
View File

@ -51,9 +51,9 @@ enum ViewSignals {
};
enum ViewScaleSignals {
kScaleSignalDoScaling = 0x0001, // enables scaling when drawing that cel (involves scaleX and scaleY)
kScaleSignalGlobalScaling = 0x0002, // means that global scaling shall get applied on that cel (sets scaleX/scaleY)
kScaleSignalDontSetNsrect = 0x0004 // do not set nsRect inside kAnimate(); for a test case see bug #3038424
kScaleSignalDoScaling = 0x0001, // enables scaling when drawing that cel (involves scaleX and scaleY)
kScaleSignalGlobalScaling = 0x0002, // means that global scaling shall get applied on that cel (sets scaleX/scaleY)
kScaleSignalHoyle4DontSetNsrect = 0x0004 // HOYLE4-exclusive: do not set nsRect inside kAnimate(); for a test case see bug #3038424
};