diff options
author | Piotr Dziwinski <piotrdz@gmail.com> | 2012-04-15 00:50:13 +0200 |
---|---|---|
committer | Piotr Dziwinski <piotrdz@gmail.com> | 2012-04-15 00:50:13 +0200 |
commit | 011d86ed668cbbff5c7bfc5f7e88086acb849921 (patch) | |
tree | a47f2a0d1f61f33455c5b53f9ef63741ca9b35d8 /src/CBot/TestCBot/TestCBotDoc.cpp | |
parent | a0303105b616331778b61db06f9012f5c8970609 (diff) | |
download | colobot-011d86ed668cbbff5c7bfc5f7e88086acb849921.tar.gz colobot-011d86ed668cbbff5c7bfc5f7e88086acb849921.tar.bz2 colobot-011d86ed668cbbff5c7bfc5f7e88086acb849921.zip |
Pulled changes from test mingw branch
* include fixes
* syntax fixes for MinGW
* fixed encoding of restext.cpp
* temporary fix for MinGW in joystick.cpp
Successfully compiles under MinGW :)
Diffstat (limited to 'src/CBot/TestCBot/TestCBotDoc.cpp')
-rw-r--r-- | src/CBot/TestCBot/TestCBotDoc.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/CBot/TestCBot/TestCBotDoc.cpp b/src/CBot/TestCBot/TestCBotDoc.cpp index fdb8604..8880c57 100644 --- a/src/CBot/TestCBot/TestCBotDoc.cpp +++ b/src/CBot/TestCBot/TestCBotDoc.cpp @@ -643,7 +643,7 @@ if ( mode == 2 ) if (!m_pProg->Compile(m_DocText, m_Liste, (void*) 44)) while ( pVar != NULL )
{
info += sep;
- info += pVar->GivName() + " = " + pVar->GivValString();
+ info += pVar->GivName() + CBotString(" = ") + pVar->GivValString();
sep = ", ";
pVar = pVar->GivNext();
}
|