From 011d86ed668cbbff5c7bfc5f7e88086acb849921 Mon Sep 17 00:00:00 2001 From: Piotr Dziwinski Date: Sun, 15 Apr 2012 00:50:13 +0200 Subject: 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 :) --- src/CBot/TestCBot/CBotConsoleDlg.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'src/CBot/TestCBot/CBotConsoleDlg.cpp') 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"); -- cgit v1.2.3-1-g7c22