diff options
author | Eugene Sandulenko | 2010-07-29 19:53:24 +0000 |
---|---|---|
committer | Eugene Sandulenko | 2010-10-12 21:39:36 +0000 |
commit | 385e4944394699327b380d841602d196cb85ec8d (patch) | |
tree | a1f241b63bd13f5b1b025d98c12325d465bcbd0f /engines | |
parent | 2cbeeb1e97500b23eeb864519e7daef50783a6b5 (diff) | |
download | scummvm-rg350-385e4944394699327b380d841602d196cb85ec8d.tar.gz scummvm-rg350-385e4944394699327b380d841602d196cb85ec8d.tar.bz2 scummvm-rg350-385e4944394699327b380d841602d196cb85ec8d.zip |
SWORD25: removed ASM usage
svn-id: r53174
Diffstat (limited to 'engines')
-rwxr-xr-x | engines/sword25/kernel/common.h | 11 | ||||
-rwxr-xr-x | engines/sword25/kernel/kernel.h | 6 |
2 files changed, 2 insertions, 15 deletions
diff --git a/engines/sword25/kernel/common.h b/engines/sword25/kernel/common.h index 29e4a20e73..e9d35e4961 100755 --- a/engines/sword25/kernel/common.h +++ b/engines/sword25/kernel/common.h @@ -41,15 +41,6 @@ #include "memleaks.h" #include "log.h" -#ifdef DEBUG -#define BS_ASSERT(EXP) \ - if (!(EXP)) \ - { \ - BS_Log::Log("!!ASSERTION FAILED!! - FILE: %s - LINE: %d.\n", __FILE__, __LINE__); \ - __asm { int 3 }; \ - } -#else -#define BS_ASSERT(EXP) do { (void)(EXP); } while(0) -#endif +#define BS_ASSERT(EXP) assert(EXP) #endif diff --git a/engines/sword25/kernel/kernel.h b/engines/sword25/kernel/kernel.h index 539ce7a9fb..8fda511451 100755 --- a/engines/sword25/kernel/kernel.h +++ b/engines/sword25/kernel/kernel.h @@ -236,11 +236,7 @@ public: */ void Crash() const { - __asm - { - xor eax, eax - mov [eax], 0 - } + error(0); } private: |