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

[strangerke at users.sourceforge.net]

Revision: 52858
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52858&view=rev
Author:   strangerke
Date:     2010-09-22 20:37:03 +0000 (Wed, 22 Sep 2010)

Log Message:
-----------
HUGO: Fix intro in H3 Win

This fixes the path on the world map, during intro

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

Modified: scummvm/trunk/engines/hugo/display.cpp
===================================================================
--- scummvm/trunk/engines/hugo/display.cpp	2010-09-22 20:19:35 UTC (rev 52857)
+++ scummvm/trunk/engines/hugo/display.cpp	2010-09-22 20:37:03 UTC (rev 52858)
@@ -139,17 +139,6 @@
 	// How???  Translate existing pixels in dib before objects rendered?
 }
 
-// Write the supplied character in the supplied color to x,y pixel coords
-void Screen::writeChar(int16 x, int16 y, char c, byte color) {
-	debugC(1, kDebugDisplay, "writeChar(%d, %d, %c, %d)", x, y, c, color);
-
-	warning("STUB: writeChar()");
-	// x = (int16)((long) x * config.cx / XPIX);
-	// y = (int16)((long) y * config.cy / YPIX);
-	// SetTextColor(hDC, GetPalIndex(color));
-	// TextOut(hDC, x, y, &c, 1);
-}
-
 // Return the overlay state (Foreground/Background) of the currently
 // processed object by looking down the current column for an overlay
 // base bit set (in which case the object is foreground).

Modified: scummvm/trunk/engines/hugo/display.h
===================================================================
--- scummvm/trunk/engines/hugo/display.h	2010-09-22 20:19:35 UTC (rev 52857)
+++ scummvm/trunk/engines/hugo/display.h	2010-09-22 20:37:03 UTC (rev 52858)
@@ -58,7 +58,7 @@
 	void     setBackgroundColor(long color);
 	void     shadowStr(int16 sx, int16 sy, char *s, byte color);
 	void     userHelp();
-	void     writeChar(int16 x, int16 y, char c, byte color);
+	void     writeChr(int sx, int sy, byte color, char *local_fontdata);
 	void     writeStr(int16 sx, int16 sy, char *s, byte color);
 
 	icondib_t &getIconBuffer() {
@@ -96,7 +96,6 @@
 	overlayState_t findOvl(seq_t *seq_p, image_pt dst_p, uint16 y);
 	void merge(rect_t *rectA, rect_t *rectB);
 	int16 mergeLists(rect_t *list, rect_t *blist, int16 len, int16 blen, int16 bmax);
-	void writeChr(int sx, int sy, byte color, char *local_fontdata);
 	int16 center(char *s);
 };
 

Modified: scummvm/trunk/engines/hugo/intro.cpp
===================================================================
--- scummvm/trunk/engines/hugo/intro.cpp	2010-09-22 20:19:35 UTC (rev 52857)
+++ scummvm/trunk/engines/hugo/intro.cpp	2010-09-22 20:37:03 UTC (rev 52858)
@@ -109,10 +109,16 @@
 //TODO : Add proper check of story mode
 //#if STORY
 //	SetBkMode(TRANSPARENT);
+
+// FIXME: This initialization shouldn't be there, as all the fonts should be loaded directly
+	_vm.screen().loadFont(0);
+
 	if (introTicks < introSize) {
 		// Scale viewport x_intro,y_intro to screen (offsetting y)
-		_vm.screen().writeChar(_vm._introX[introTicks], _vm._introY[introTicks] - DIBOFF_Y, 'x', _TBRIGHTWHITE);
+		_vm.screen().writeStr(_vm._introX[introTicks], _vm._introY[introTicks] - DIBOFF_Y, "x", _TBRIGHTWHITE);
+		_vm.screen().displayBackground();
 
+
 		// Text boxes at various times
 		switch (introTicks) {
 		case 4:


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