From 7ccb7e53fe941a4b076bc4856dfba0c0476af249 Mon Sep 17 00:00:00 2001
From: Simon Robertshaw <simon@hardwired.org.uk>
Date: Tue, 14 Aug 2012 16:01:57 +0100
Subject: Show some info when selecting stamps, #104


diff --git a/src/game/GameView.cpp b/src/game/GameView.cpp
index 435e277..0d561a3 100644
--- a/src/game/GameView.cpp
+++ b/src/game/GameView.cpp
@@ -1268,6 +1268,8 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
 	case 's':
 		selectMode = SelectStamp;
 		selectPoint1 = ui::Point(-1, -1);
+		infoTip = "\x0F\xEF\xEF\x10Select an area to create a stamp";
+		infoTipPresence = 120;
 		break;
 	case 'w':
 		c->SwitchGravity();
@@ -1293,6 +1295,8 @@ void GameView::OnKeyPress(int key, Uint16 character, bool shift, bool ctrl, bool
 		{
 			selectMode = SelectCopy;
 			selectPoint1 = ui::Point(-1, -1);
+			infoTip = "\x0F\xEF\xEF\x10Select an area to copy";
+			infoTipPresence = 120;
 		}
 		break;
 	case 'v':
diff --git a/src/graphics/OpenGLDrawMethods.inl b/src/graphics/OpenGLDrawMethods.inl
index 55b4f21..8392e28 100644
--- a/src/graphics/OpenGLDrawMethods.inl
+++ b/src/graphics/OpenGLDrawMethods.inl
@@ -22,9 +22,9 @@ int PIXELMETHODS_CLASS::drawtext(int x, int y, const char *s, int r, int g, int
 			oR = r;
 			oG = g;
 			oB = b;
-			r = s[1];
-			g = s[2];
-			b = s[3];
+			r = (unsigned char)s[1];
+			g = (unsigned char)s[2];
+			b = (unsigned char)s[3];
 			s += 3;
 		}
 		else if (*s == '\x0E')
diff --git a/src/graphics/RasterDrawMethods.inl b/src/graphics/RasterDrawMethods.inl
index b5d52a9..d1236a5 100644
--- a/src/graphics/RasterDrawMethods.inl
+++ b/src/graphics/RasterDrawMethods.inl
@@ -22,9 +22,9 @@ int PIXELMETHODS_CLASS::drawtext(int x, int y, const char *s, int r, int g, int
 			oR = r;
 			oG = g;
 			oB = b;
-			r = s[1];
-			g = s[2];
-			b = s[3];
+			r = (unsigned char)s[1];
+			g = (unsigned char)s[2];
+			b = (unsigned char)s[3];
 			s += 3;
 		}
 		else if (*s == '\x0E')
--
cgit v0.9.2-21-gd62e