[Scummvm-cvs-logs] SF.net SVN: scummvm: [30229] scummvm/trunk/engines/lure/room.cpp

[dreammaster at users.sourceforge.net]

Revision: 30229
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30229&view=rev
Author:   dreammaster
Date:     2008-01-05 02:36:36 -0800 (Sat, 05 Jan 2008)

Log Message:
-----------
Fix for showing the correct colour in the status line in EGA mode

Modified Paths:
--------------
    scummvm/trunk/engines/lure/room.cpp

Modified: scummvm/trunk/engines/lure/room.cpp
===================================================================
--- scummvm/trunk/engines/lure/room.cpp	2008-01-05 10:35:47 UTC (rev 30228)
+++ scummvm/trunk/engines/lure/room.cpp	2008-01-05 10:36:36 UTC (rev 30229)
@@ -430,6 +430,7 @@
 	Surface &s = _screen.screen();
 	Resources &res = Resources::getReference();
 	HotspotList &hotspots = res.activeHotspots();
+	byte white = LureEngine::getReference().isEGA() ?  EGA_DIALOG_WHITE_COLOUR : VGA_DIALOG_WHITE_COLOUR;
 	HotspotList::iterator i;
 
 	// Copy the background to the temporary screen surface
@@ -489,7 +490,7 @@
 	if (!*_statusLine) {
 		// No current status action being display
 		if (_hotspotId != 0) 
-			s.writeString(0, 0, _hotspotName, false, DIALOG_TEXT_COLOUR);
+			s.writeString(0, 0, _hotspotName, false);
 	} else {
 		// Word wrap (if necessary) the status line and dispaly it
 		char *statusLineCopy = strdup(_statusLine);
@@ -498,7 +499,7 @@
 		int16 yPos = 0;
 		s.wordWrap(statusLineCopy, s.width(), lines, numLines);
 		for (int lineNum = 0; lineNum < numLines; ++lineNum) {
-			s.writeString(0, yPos, lines[lineNum], false, DIALOG_WHITE_COLOUR);
+			s.writeString(0, yPos, lines[lineNum], false, white);
 			yPos += FONT_HEIGHT;
 		}
 		Memory::dealloc(lines);
@@ -535,7 +536,7 @@
 		Mouse &m = Mouse::getReference();
 		sprintf(buffer, "Room %d Pos (%d,%d) @ (%d,%d)", _roomNumber, m.x(), m.y(),
 			m.x() / RECT_SIZE, (m.y() - MENUBAR_Y_SIZE) / RECT_SIZE);
-		s.writeString(FULL_SCREEN_WIDTH / 2, 0, buffer, false, DIALOG_TEXT_COLOUR);
+		s.writeString(FULL_SCREEN_WIDTH / 2, 0, buffer, false, white);
 	}
 }
 


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