From 011d86ed668cbbff5c7bfc5f7e88086acb849921 Mon Sep 17 00:00:00 2001
From: Piotr Dziwinski <piotrdz@gmail.com>
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/CBotFunction.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/CBot/CBotFunction.cpp')

diff --git a/src/CBot/CBotFunction.cpp b/src/CBot/CBotFunction.cpp
index a7fbadc..488061c 100644
--- a/src/CBot/CBotFunction.cpp
+++ b/src/CBot/CBotFunction.cpp
@@ -1042,7 +1042,7 @@ BOOL CBotDefParam::Execute(CBotVar** ppVars, CBotStack* &pj)
 				}
 				break;
 			default:
-				__asm int 3;
+				ASM_TRAP();
 			}
 		}
 		newvar->SetUniqNum(p->m_nIdent);
-- 
cgit v1.2.3-1-g7c22