diff options
| author | Filippos Karapetis | 2009-03-17 08:03:42 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2009-03-17 08:03:42 +0000 |
| commit | 80c243e5ca48680bf85c752c976f4ccc11941fb0 (patch) | |
| tree | 117d8b0067ef4b5e4908d506b1825f69f9d5de02 /engines/sci/engine/kgraphics.cpp | |
| parent | a9da116ceb318d3223bb515cad46f613dfdc0d36 (diff) | |
| download | scummvm-rg350-80c243e5ca48680bf85c752c976f4ccc11941fb0.tar.gz scummvm-rg350-80c243e5ca48680bf85c752c976f4ccc11941fb0.tar.bz2 scummvm-rg350-80c243e5ca48680bf85c752c976f4ccc11941fb0.zip | |
Renamed some defines:
- FREESCI_CURRENT_SAVEGAME_VERSION, FREESCI_MINIMUM_SAVEGAME_VERSION -> CURRENT_SAVEGAME_VERSION, MINIMUM_SAVEGAME_VERSION (saved games are not compatible with FreeSCI's ones anymore)
- _K_VIEW_SIG_FLAG_FREESCI_STOPUPD -> _K_VIEW_SIG_FLAG_STOPUPD (like the rest of the flags)
- Removed FREESCI_KFUNCT_GLUTTON (unused)
svn-id: r39478
Diffstat (limited to 'engines/sci/engine/kgraphics.cpp')
| -rw-r--r-- | engines/sci/engine/kgraphics.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp index 90deb1a3a2..446f5be4b7 100644 --- a/engines/sci/engine/kgraphics.cpp +++ b/engines/sci/engine/kgraphics.cpp @@ -816,7 +816,7 @@ reg_t kCanBeHere(EngineState *s, int funct_nr, int argc, reg_t * argv) { SCIkdebug(SCIkBRESEN, "Checking vs dynviews:\n"); while (widget) { - if (widget->ID && (widget->signal & _K_VIEW_SIG_FLAG_FREESCI_STOPUPD) + if (widget->ID && (widget->signal & _K_VIEW_SIG_FLAG_STOPUPD) && ((widget->ID != obj.segment) || (widget->subID != obj.offset)) && is_object(s, make_reg(widget->ID, widget->subID))) if (collides_with(s, abs_zone, make_reg(widget->ID, widget->subID), 1, GASEOUS_VIEW_MASK_ACTIVE, funct_nr, argc, argv)) @@ -1697,7 +1697,7 @@ static void _k_view_list_do_postdraw(EngineState *s, gfxw_list_t *list) { * this fixes a few problems, but doesn't match SSCI's logic. * The semantics of the private flag need to be verified before this can be uncommented. * Fixes bug #326 (CB1, ego falls down stairs) - * if ((widget->signal & (_K_VIEW_SIG_FLAG_FREESCI_PRIVATE | _K_VIEW_SIG_FLAG_REMOVE | _K_VIEW_SIG_FLAG_NO_UPDATE)) == _K_VIEW_SIG_FLAG_FREESCI_PRIVATE) { + * if ((widget->signal & (_K_VIEW_SIG_FLAG_PRIVATE | _K_VIEW_SIG_FLAG_REMOVE | _K_VIEW_SIG_FLAG_NO_UPDATE)) == _K_VIEW_SIG_FLAG_PRIVATE) { */ if ((widget->signal & (_K_VIEW_SIG_FLAG_REMOVE | _K_VIEW_SIG_FLAG_NO_UPDATE)) == 0) { int has_nsrect = lookup_selector(s, obj, s->selector_map.nsBottom, NULL, NULL) == kSelectorVariable; @@ -2024,7 +2024,7 @@ static void _k_prepare_view_list(EngineState *s, gfxw_list_t *list, int options) // CR (from :Bob Heitman:) stopupdated views (like pic views) have // their clipped nsRect drawn to the control map if (view->signal & _K_VIEW_SIG_FLAG_STOP_UPDATE) { - view->signal |= _K_VIEW_SIG_FLAG_FREESCI_STOPUPD; + view->signal |= _K_VIEW_SIG_FLAG_STOPUPD; SCIkdebug(SCIkGRAPHICS, "Setting magic STOP_UPD for "PREG"\n", PRINT_REG(obj)); } @@ -2063,7 +2063,7 @@ static void _k_prepare_view_list(EngineState *s, gfxw_list_t *list, int options) // Never happens /* if (view->signal & 0) { - view->signal &= ~_K_VIEW_SIG_FLAG_FREESCI_STOPUPD; + view->signal &= ~_K_VIEW_SIG_FLAG_STOPUPD; fprintf(stderr, "Unsetting magic StopUpd for view "PREG"\n", PRINT_REG(obj)); } */ @@ -2090,7 +2090,7 @@ static void _k_update_signals_in_view_list(gfxw_list_t *old_list, gfxw_list_t *n new_widget = (gfxw_dyn_view_t *) new_widget->next; if (new_widget) { - int carry = old_widget->signal & _K_VIEW_SIG_FLAG_FREESCI_STOPUPD; + int carry = old_widget->signal & _K_VIEW_SIG_FLAG_STOPUPD; // Transfer 'stopupd' flag if ((new_widget->pos.x != old_widget->pos.x) |