summaryrefslogtreecommitdiffstats
path: root/src/common/restext.cpp
diff options
context:
space:
mode:
authorPiotr Dziwinski <piotrdz@gmail.com>2012-10-07 00:46:46 +0200
committerPiotr Dziwinski <piotrdz@gmail.com>2012-10-07 00:46:46 +0200
commit97f44035f1b3ebd2681236c23f14c4d3ea7f09ac (patch)
tree6937ba54a2e43d5e42fcb1cb2950684b4ab3c3ac /src/common/restext.cpp
parent70dae8796e96b309d95f220dfb083ed81261ceb6 (diff)
downloadcolobot-97f44035f1b3ebd2681236c23f14c4d3ea7f09ac.tar.gz
colobot-97f44035f1b3ebd2681236c23f14c4d3ea7f09ac.tar.bz2
colobot-97f44035f1b3ebd2681236c23f14c4d3ea7f09ac.zip
Changing and saving input bindings
Diffstat (limited to 'src/common/restext.cpp')
-rw-r--r--src/common/restext.cpp6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/common/restext.cpp b/src/common/restext.cpp
index 0f33f52..9a3d964 100644
--- a/src/common/restext.cpp
+++ b/src/common/restext.cpp
@@ -105,7 +105,7 @@ static void PutKeyName(char* dst, const char* src)
{
if ( SearchKey(src+s+5, key) )
{
- res = CRobotMain::GetInstancePointer()->GetInputBinding(key).key;
+ res = CRobotMain::GetInstancePointer()->GetInputBinding(key).primary;
if (res != KEY_INVALID)
{
if ( GetResource(RES_KEY, res, name) )
@@ -172,7 +172,9 @@ static const char* GetResourceBase(ResType type, int num)
case RES_KEY:
- if (num == VIRTUAL_KMOD_CTRL)
+ if (num == KEY_INVALID)
+ return "";
+ else if (num == VIRTUAL_KMOD_CTRL)
return "Ctrl";
else if (num == VIRTUAL_KMOD_SHIFT)
return "Shift";