[Scummvm-cvs-logs] SF.net SVN: scummvm:[53823] scummvm/trunk/engines/hugo

[strangerke at users.sourceforge.net]

Revision: 53823
          http://scummvm.svn.sourceforge.net/scummvm/?rev=53823&view=rev
Author:   strangerke
Date:     2010-10-25 13:20:15 +0000 (Mon, 25 Oct 2010)

Log Message:
-----------
HUGO: Fix display priority order in H1 Dos

Modified Paths:
--------------
    scummvm/trunk/engines/hugo/display.h
    scummvm/trunk/engines/hugo/object_v1d.cpp

Modified: scummvm/trunk/engines/hugo/display.h
===================================================================
--- scummvm/trunk/engines/hugo/display.h	2010-10-25 12:07:07 UTC (rev 53822)
+++ scummvm/trunk/engines/hugo/display.h	2010-10-25 13:20:15 UTC (rev 53823)
@@ -49,6 +49,8 @@
 	Screen(HugoEngine *vm);
 	virtual ~Screen();
 
+	virtual void loadFont(int16 fontId) = 0;
+
 	int16    fontHeight();
 	int16    stringLength(const char *s);
 
@@ -61,7 +63,6 @@
 	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 @@
 	Screen_v1d(HugoEngine *vm);
 	~Screen_v1d();
 
-	virtual void loadFont(int16 fontId);
+	void loadFont(int16 fontId);
 };
 
 class Screen_v1w : public Screen {
@@ -127,7 +128,7 @@
 	Screen_v1w(HugoEngine *vm);
 	~Screen_v1w();
 
-	virtual void loadFont(int16 fontId);
+	void loadFont(int16 fontId);
 };
 
 } // End of namespace Hugo

Modified: scummvm/trunk/engines/hugo/object_v1d.cpp
===================================================================
--- scummvm/trunk/engines/hugo/object_v1d.cpp	2010-10-25 12:07:07 UTC (rev 53822)
+++ scummvm/trunk/engines/hugo/object_v1d.cpp	2010-10-25 13:20:15 UTC (rev 53823)
@@ -81,13 +81,13 @@
 		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 @@
 					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:


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.