From a1f7624847d60b259a6b9228c00a5189fff97ab9 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 7 Jan 2003 04:02:57 +0000 Subject: [PATCH] small fixes --- stepmania/src/FontManager.cpp | 4 ++-- stepmania/src/FontManager.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stepmania/src/FontManager.cpp b/stepmania/src/FontManager.cpp index fbf54e998f..3e62ba0ddb 100644 --- a/stepmania/src/FontManager.cpp +++ b/stepmania/src/FontManager.cpp @@ -45,8 +45,8 @@ FontManager::~FontManager() * character; game 0 is 0x01nnnnnn, game 1 is 0x02nnnnnn, and so on. */ longchar FontManager::MakeGameGlyph(longchar c, Game g) { - ASSERT(g >= 0 && g <= 0xFF && c >= 0 && c <= 0xFFFFFF); - return ((g+1) << 24) + c; + ASSERT(g >= 0 && g <= 0xFF && c >= 0 && c <= 0xFFFF); + return longchar (((g+1) << 24) + c); } bool FontManager::ExtractGameGlyph(longchar ch, int &c, Game &g) diff --git a/stepmania/src/FontManager.h b/stepmania/src/FontManager.h index bc842265ff..1113ffc85e 100644 --- a/stepmania/src/FontManager.h +++ b/stepmania/src/FontManager.h @@ -33,7 +33,7 @@ public: static bool MatchesFont(CString FontName, CString FileName); - static longchar MakeGameGlyph(int c, Game g); + static longchar MakeGameGlyph(longchar c, Game g); static bool ExtractGameGlyph(longchar ch, int &c, Game &g); typedef map aliasmap;