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/CBotFunction.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/CBotFunction.cpp')
| -rw-r--r-- | src/CBot/CBotFunction.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
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);
|