libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 21:31:53 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed the hack used to check for the existence of the CantBeHere() selector

Browse Source 
svn-id: r40549
This commit is contained in:
Filippos Karapetis 2009-05-14 07:14:08 +00:00
parent dd54193f95
commit 3117a8d87f
4 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engines/sci/engine/kmovement.cpp
View File

@ -359,7 +359,7 @@ reg_t kDoBresen(EngineState *s, int funct_nr, int argc, reg_t *argv) {
SCIkdebug(SCIkBRESEN, "New data: (x,y)=(%d,%d), di=%d\n", x, y, bdi);
if (s->version >= SCI_VERSION_FTU_INVERSE_CANBEHERE)
if (s->selector_map.cantBeHere != -1)
invoke_selector(INV_SEL(client, cantBeHere, 0), 0);
else
invoke_selector(INV_SEL(client, canBeHere, 0), 0);

2
engines/sci/engine/state.h
View File

@ -285,7 +285,7 @@ public:
PaletteEntry get_pic_color(EngineState *s, int color);
static inline reg_t not_register(EngineState *s, reg_t r) {
if (s->version >= SCI_VERSION_FTU_INVERSE_CANBEHERE)
if (s->selector_map.cantBeHere != -1)
return make_reg(0, !r.offset);
else
return r;

1
engines/sci/sci.h
View File

@ -127,7 +127,6 @@ enum SciGameFlags {
GF_LOFSABSOLUTE = (1 << 5),
/* Applies to all versions from 1.000.510 onwards
** In later SCI1 versions, CanBeHere is called inversely.
** Also in kDisplay(), if the text would not fit on the screen, it
** is moved to the left and upwards until it fits.
** Finally, kDoSound() is different than in earlier SCI1 versions.

5
engines/sci/scicore/versions.h
View File

@ -88,11 +88,6 @@ namespace Sci {
instructions is absolute rather than relative.
*/
#define SCI_VERSION_FTU_INVERSE_CANBEHERE SCI_VERSION(1,000,510)
/* FIXME: This shouldn't be a version number.
* But it'll do for now.
*/
#define SCI_VERSION_FTU_DISPLAY_COORDS_FUZZY SCI_VERSION(1,000,510)
/* First version known to do this: ?
In later versions of SCI1 kDisplay(), if the text would not fit on