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/CBotConsoleDlg.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/CBotConsoleDlg.cpp')
| -rw-r--r-- | src/CBot/TestCBot/CBotConsoleDlg.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/CBot/TestCBot/CBotConsoleDlg.cpp b/src/CBot/TestCBot/CBotConsoleDlg.cpp index 2305bf3..55a271a 100644 --- a/src/CBot/TestCBot/CBotConsoleDlg.cpp +++ b/src/CBot/TestCBot/CBotConsoleDlg.cpp @@ -12,7 +12,9 @@ // * GNU General Public License for more details.
// *
// * You should have received a copy of the GNU General Public License
-// * along with this program. If not, see http://www.gnu.org/licenses/.// CBotConsoleDlg.cpp : implementation file
+// * along with this program. If not, see http://www.gnu.org/licenses/.
+
+// CBotConsoleDlg.cpp : implementation file
//
#include "stdafx.h"
@@ -208,7 +210,7 @@ BOOL CBotConsoleDlg::OnInitDialog() m_Edit1.ReplaceSel("Les fonctions suivantes sont disponibles:\r\n");
for ( int i = 0; i < m_pListe->GivSize(); i++ )
{
- CBotString x = (*m_pListe)[i] + "\r\n";
+ CBotString x = (*m_pListe)[i] + CBotString("\r\n");
m_Edit1.ReplaceSel(x);
}
m_Edit1.ReplaceSel("Entrez une commande ci-dessous.\r\n\r\n");
|