diff options
| author | Zaba999 <qrwfw5rp> | 2012-10-11 23:10:07 +0200 |
|---|---|---|
| committer | Zaba999 <qrwfw5rp> | 2012-10-11 23:10:07 +0200 |
| commit | 7575ffd49b76aaf4b054c0ca8cb8369fb12c11c9 (patch) | |
| tree | 10915bce6a98c2b0848421dbb79b36ce52bb045b /src/ui/edit.cpp | |
| parent | 8a932fed3e5700af283017deab3cb1da11cb0dce (diff) | |
| parent | dfe21c5a9c2ebf3df0f445014588bcce0387d699 (diff) | |
| download | colobot-7575ffd49b76aaf4b054c0ca8cb8369fb12c11c9.tar.gz colobot-7575ffd49b76aaf4b054c0ca8cb8369fb12c11c9.tar.bz2 colobot-7575ffd49b76aaf4b054c0ca8cb8369fb12c11c9.zip | |
Merge branch 'dev' of https://github.com/colobot/colobot into dev
Diffstat (limited to 'src/ui/edit.cpp')
| -rw-r--r-- | src/ui/edit.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ui/edit.cpp b/src/ui/edit.cpp index 547e73a..e14b19d 100644 --- a/src/ui/edit.cpp +++ b/src/ui/edit.cpp @@ -1794,7 +1794,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) ) @@ -1813,7 +1813,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) ) |