[Gemrb-commits] gemrb: branch master updated. v0.7.2-352-g5e8eb7f

[Jens G. <fi...@us...>]

gemrb: Infinity Engine emulator

The branch master has been updated
       via  5e8eb7f085f5e61c26376702a61762272f20917d (commit)

Summary of changes:
 gemrb/core/GUI/WorldMapControl.cpp |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)
      from  8b9e64fe44c1c3301acf6d99dcf30a382619a797 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://gemrb.git.sourceforge.net/git/gitweb.cgi?p=gemrb/gemrb;a=commitdiff;h=5e8eb7f085f5e61c26376702a61762272f20917d

commit 5e8eb7f085f5e61c26376702a61762272f20917d
Author: Jens Granseuer <je...@gm...>
Date:   Fri Jan 11 11:56:52 2013 +0100

    highlight area icon on mouseover

diff --git a/gemrb/core/GUI/WorldMapControl.cpp b/gemrb/core/GUI/WorldMapControl.cpp
index 7e1e138..d6a342c 100644
--- a/gemrb/core/GUI/WorldMapControl.cpp
+++ b/gemrb/core/GUI/WorldMapControl.cpp
@@ -125,12 +125,20 @@ void WorldMapControl::Draw(unsigned short XWin, unsigned short YWin)
 		int yOffs = MAP_TO_SCREENY(m->Y);
 		Sprite2D* icon = m->GetMapIcon(worldmap->bam);
 		if( icon ) {
-			video->BlitSprite( icon, xOffs, yOffs, true, &r );
+			if (m == Area) {
+				Palette *pal = icon->GetPalette();
+				icon->SetPalette(pal_selected);
+				video->BlitSprite( icon, xOffs, yOffs, true, &r );
+				icon->SetPalette(pal);
+				pal->Release();
+			} else {
+				video->BlitSprite( icon, xOffs, yOffs, true, &r );
+			}
 			video->FreeSprite( icon );
 		}
 
 		if (AnimPicture && !strnicmp(m->AreaResRef, currentArea, 8) ) {
-			core->GetVideoDriver()->BlitSprite( AnimPicture, xOffs, yOffs, true, &r );
+			video->BlitSprite( AnimPicture, xOffs, yOffs, true, &r );
 		}
 	}
 

-----------------------------------------------------------------------


This is an automated email from the git hooks/post-receive script.
-- 
gemrb: Infinity Engine emulator