summaryrefslogtreecommitdiffstats
path: root/src/ui/edit.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/ui/edit.cpp
parent70dae8796e96b309d95f220dfb083ed81261ceb6 (diff)
downloadcolobot-97f44035f1b3ebd2681236c23f14c4d3ea7f09ac.tar.gz
colobot-97f44035f1b3ebd2681236c23f14c4d3ea7f09ac.tar.bz2
colobot-97f44035f1b3ebd2681236c23f14c4d3ea7f09ac.zip
Changing and saving input bindings
Diffstat (limited to 'src/ui/edit.cpp')
-rw-r--r--src/ui/edit.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ui/edit.cpp b/src/ui/edit.cpp
index ca53a7a..45e564d 100644
--- a/src/ui/edit.cpp
+++ b/src/ui/edit.cpp
@@ -1796,7 +1796,7 @@ bool CEdit::ReadText(const char *filename, int addSize)
if ( SearchKey(buffer+i+5, slot) )
{
CRobotMain* main = CRobotMain::GetInstancePointer();
- res = main->GetInputBinding(slot).key;
+ res = main->GetInputBinding(slot).primary;
if ( res != 0 )
{
if ( GetResource(RES_KEY, res, iName) )
@@ -1815,7 +1815,7 @@ bool CEdit::ReadText(const char *filename, int addSize)
m_format[j] = font;
j ++;
- res = main->GetInputBinding(slot).joy;
+ res = main->GetInputBinding(slot).secondary;
if ( res != 0 )
{
if ( GetResource(RES_KEY, res, iName) )