From 46ff36c80b9c3672577d9ef40dd2e85ec945e7e6 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Sun, 26 Jun 2011 03:41:20 +0000 Subject: [PATCH] - missed one conversion in keyboard test menu --- source/glest_game/menu/menu_state_keysetup.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/source/glest_game/menu/menu_state_keysetup.cpp b/source/glest_game/menu/menu_state_keysetup.cpp index 4233b6413..3156d02b2 100644 --- a/source/glest_game/menu/menu_state_keysetup.cpp +++ b/source/glest_game/menu/menu_state_keysetup.cpp @@ -18,6 +18,7 @@ #include "menu_state_options.h" #include "menu_state_root.h" #include "metrics.h" +#include "string_utils.h" #include "leak_dumper.h" @@ -367,11 +368,17 @@ void MenuStateKeysetup::keyDown(SDL_KeyboardEvent key) { // keyName = SDL_GetKeyName(keysym); // } + char szCharText[20]=""; + sprintf(szCharText,"%c",hotkeyChar); + char *utfStr = String::ConvertToUTF8(&szCharText[0]); + char szBuf[1024] = ""; //sprintf(szBuf,"%s [%d][%d]",keyName.c_str(),key.keysym.sym,keysym); - sprintf(szBuf,"%s [%c][%d][%d][%d]",keyName.c_str(),hotkeyChar,key.keysym.sym,hotkeyChar,key.keysym.unicode); + sprintf(szBuf,"%s [%s][%d][%d][%d]",keyName.c_str(),utfStr,key.keysym.sym,hotkeyChar,key.keysym.unicode); labelTestValue.setText(szBuf); + delete [] utfStr; + if(SystemFlags::VERBOSE_MODE_ENABLED) printf("In [%s::%s Line: %d] hotkeyChar [%d]\n",__FILE__,__FUNCTION__,__LINE__,hotkeyChar); }