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/CBotStack.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/CBot/CBotStack.cpp') diff --git a/src/CBot/CBotStack.cpp b/src/CBot/CBotStack.cpp index b97c2fd..b5aaba0 100644 --- a/src/CBot/CBotStack.cpp +++ b/src/CBot/CBotStack.cpp @@ -53,7 +53,8 @@ CBotStack* CBotStack::FirstStack() CBotStack* pp = p; pp += MAXSTACK; - for ( int i = 0 ; i< 10 ; i++ ) + int i; + for ( i = 0 ; i< 10 ; i++ ) { pp->m_bOver = TRUE; pp ++; @@ -75,12 +76,12 @@ CBotStack* CBotStack::FirstStack() CBotStack::CBotStack(CBotStack* ppapa) { // constructeur doit exister, sinon le destructeur n'est jamais appelé ! - __asm int 3; + ASM_TRAP(); } CBotStack::~CBotStack() { - __asm int 3; // utiliser Delete() à la place + ASM_TRAP(); // utiliser Delete() à la place } void CBotStack::Delete() @@ -696,7 +697,7 @@ void CBotStack::AddVar(CBotVar* pVar) *pp = pVar; // ajoute à la suite #ifdef _DEBUG - if ( pVar->GivUniqNum() == 0 ) __asm int 3; + if ( pVar->GivUniqNum() == 0 ) ASM_TRAP(); #endif } @@ -1094,7 +1095,7 @@ BOOL CBotVar::RestoreState(FILE* pf, CBotVar* &pVar) } break; default: - __asm int 3; + ASM_TRAP(); } if ( pPrev != NULL ) pPrev->m_next = pNew; @@ -1391,7 +1392,7 @@ void CBotCStack::AddVar(CBotVar* pVar) *pp = pVar; // ajoute à la suite #ifdef _DEBUG - if ( pVar->GivUniqNum() == 0 ) __asm int 3; + if ( pVar->GivUniqNum() == 0 ) ASM_TRAP(); #endif } -- cgit v1.2.3-1-g7c22