diff options
| author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-15 18:50:51 +0200 |
|---|---|---|
| committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-09-15 18:50:51 +0200 |
| commit | ad6bc13dc2b70741ee3f006e321ba46dd421b9b5 (patch) | |
| tree | 72540c0d47f5501f6080f7b03de600daed0a029a /src/ui/edit.cpp | |
| parent | 95d2f8da2c1df9a02fc1d668f2ce9c0b64c4bf65 (diff) | |
| parent | 94e7fd920353c39471d8836a8bf87ffb113f1349 (diff) | |
| download | colobot-ad6bc13dc2b70741ee3f006e321ba46dd421b9b5.tar.gz colobot-ad6bc13dc2b70741ee3f006e321ba46dd421b9b5.tar.bz2 colobot-ad6bc13dc2b70741ee3f006e321ba46dd421b9b5.zip | |
Merge dev-common and various fixes to achieve compilation
- merged changes from dev-common
- fixed many compilation errors (CBrain, UI, ...)
- temporarily commented out some problematic code (e.g. input bindings)
- (partially) fixed #include styling
- everything compiles except for CRobotMain, CMainDialog and CStudio
Diffstat (limited to 'src/ui/edit.cpp')
| -rw-r--r-- | src/ui/edit.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/ui/edit.cpp b/src/ui/edit.cpp index cc911a4..d298ad3 100644 --- a/src/ui/edit.cpp +++ b/src/ui/edit.cpp @@ -20,6 +20,8 @@ #include "edit.h" +#include <string.h> + namespace Ui { const float MARGX = (5.0f/640.0f); @@ -1778,7 +1780,8 @@ bool CEdit::ReadText(const char *filename, int addSize) { if ( SearchKey(buffer+i+5, key) ) { - res = m_app->GetKey(key, 0); // TODO + res = 0; + //res = m_app->GetInputBinding(key).key; // TODO input bindings if ( res != 0 ) { if ( GetResource(RES_KEY, res, iName) ) @@ -1797,7 +1800,8 @@ bool CEdit::ReadText(const char *filename, int addSize) m_format[j] = font; j ++; - res = m_app->GetKey(key, 1); // TODO + // res = m_app->GetInputBinding(key).joy; // TODO input bindings + res = 0; if ( res != 0 ) { if ( GetResource(RES_KEY, res, iName) ) |