From fa7d3e514151bc423382390b14dd28063d7ac2c4 Mon Sep 17 00:00:00 2001
From: Steve Checkoway <stevecheckoway@users.sourceforge.net>
Date: Fri, 26 Dec 2008 12:57:13 +0000
Subject: [PATCH] The first of these was correct, the second was actually
 incorrect, so fix and simplify.

---
 stepmania/src/RageUtil.cpp | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/stepmania/src/RageUtil.cpp b/stepmania/src/RageUtil.cpp
index 56eca20dfb..5d7c88abae 100644
--- a/stepmania/src/RageUtil.cpp
+++ b/stepmania/src/RageUtil.cpp
@@ -1418,7 +1418,7 @@ bool utf8_to_wchar_ec( const RString &s, unsigned &start, wchar_t &ch )
 			start += i;
 			return false;
 		}
-		ch = (ch << 6) | byte & 0x3F;
+		ch = (ch << 6) | (byte & 0x3F);
 	}
 
 	bool bValid = true;
@@ -1850,8 +1850,7 @@ void Replace_Unicode_Markers( RString &sText )
 			continue;
 
 		int iNumDigits = 0;
-		while( p < sText.size() &&
-			(bHex && isxdigit(sText[p])) || (!bHex && isdigit(sText[p])) )
+		while( p < sText.size() && bHex? isxdigit(sText[p]):isdigit(sText[p]) )
 		{
 		   p++;
 		   iNumDigits++;