diff options
| -rw-r--r-- | engines/hugo/display.h | 7 | ||||
| -rw-r--r-- | engines/hugo/object_v1d.cpp | 8 |
2 files changed, 8 insertions, 7 deletions
diff --git a/engines/hugo/display.h b/engines/hugo/display.h index dc687e0bb6..d56f3e55aa 100644 --- a/engines/hugo/display.h +++ b/engines/hugo/display.h @@ -49,6 +49,8 @@ public: Screen(HugoEngine *vm); virtual ~Screen(); + virtual void loadFont(int16 fontId) = 0; + int16 fontHeight(); int16 stringLength(const char *s); @@ -61,7 +63,6 @@ public: void drawStatusText(); void initDisplay(); void initNewScreenDisplay(); - virtual void loadFont(int16 fontId) = 0; void moveImage(image_pt srcImage, uint16 x1, uint16 y1, uint16 dx, uint16 dy, uint16 width1, image_pt dstImage, uint16 x2, uint16 y2, uint16 width2); void remapPal(uint16 oldIndex, uint16 newIndex); void restorePal(Common::SeekableReadStream *f); @@ -119,7 +120,7 @@ public: Screen_v1d(HugoEngine *vm); ~Screen_v1d(); - virtual void loadFont(int16 fontId); + void loadFont(int16 fontId); }; class Screen_v1w : public Screen { @@ -127,7 +128,7 @@ public: Screen_v1w(HugoEngine *vm); ~Screen_v1w(); - virtual void loadFont(int16 fontId); + void loadFont(int16 fontId); }; } // End of namespace Hugo diff --git a/engines/hugo/object_v1d.cpp b/engines/hugo/object_v1d.cpp index 6a8be7f95a..6cee3d5dbe 100644 --- a/engines/hugo/object_v1d.cpp +++ b/engines/hugo/object_v1d.cpp @@ -81,13 +81,13 @@ void ObjectHandler_v1d::updateImages() { if (obj->cycling > ALMOST_INVISIBLE) { // Only if visible switch (obj->cycling) { case NOT_CYCLING: - _vm->_screen->displayFrame(obj->x, obj->y, obj->currImagePtr, true); + _vm->_screen->displayFrame(obj->x, obj->y, obj->currImagePtr, false); break; case CYCLE_FORWARD: if (obj->frameTimer) // Not time to see next frame yet - _vm->_screen->displayFrame(obj->x, obj->y, obj->currImagePtr, true); + _vm->_screen->displayFrame(obj->x, obj->y, obj->currImagePtr, false); else - _vm->_screen->displayFrame(obj->x, obj->y, obj->currImagePtr->nextSeqPtr, true); + _vm->_screen->displayFrame(obj->x, obj->y, obj->currImagePtr->nextSeqPtr, false); break; case CYCLE_BACKWARD: { seq_t *seqPtr = obj->currImagePtr; @@ -95,7 +95,7 @@ void ObjectHandler_v1d::updateImages() { while (seqPtr->nextSeqPtr != obj->currImagePtr) seqPtr = seqPtr->nextSeqPtr; } - _vm->_screen->displayFrame(obj->x, obj->y, seqPtr, true); + _vm->_screen->displayFrame(obj->x, obj->y, seqPtr, false); break; } default: |