diff options
| author | Johannes Schickel | 2014-06-08 17:55:05 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2014-06-08 17:57:02 +0200 |
| commit | 9e4dfe556edcb0e12ccfdb440b4f7ded8614ae1e (patch) | |
| tree | 2f652fa33c8f8627bf1cde2bc8d04cab14284b2a /engines/cruise/script.cpp | |
| parent | 06b01b8920ec36b31fe9bb758a75bbaf9809686d (diff) | |
| download | scummvm-rg350-9e4dfe556edcb0e12ccfdb440b4f7ded8614ae1e.tar.gz scummvm-rg350-9e4dfe556edcb0e12ccfdb440b4f7ded8614ae1e.tar.bz2 scummvm-rg350-9e4dfe556edcb0e12ccfdb440b4f7ded8614ae1e.zip | |
CRUISE: Directly use assert.
This fixes an ASSERT macro redefinition when compiling the Symbian port.
See bug #6622 "SYMBIAN: CRUISE: warning: `ASSERT' redefined".
Diffstat (limited to 'engines/cruise/script.cpp')
| -rw-r--r-- | engines/cruise/script.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/cruise/script.cpp b/engines/cruise/script.cpp index eae20414ce..1f308714f7 100644 --- a/engines/cruise/script.cpp +++ b/engines/cruise/script.cpp @@ -170,7 +170,7 @@ int32 opcodeType1() { if (var_6 == 5) { ptr = overlayTable[byte2].ovlData->data4Ptr + var_C; } else { - ASSERT(0); + assert(0); } } else { ptr = scriptDataPtrTable[var_6] + var_C; @@ -249,7 +249,7 @@ int32 opcodeType2() { if (!overlayTable[overlay].ovlData) { return (-4); } - ASSERT(0); + assert(0); } adresse += offset; |