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/cruise_main.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/cruise_main.cpp')
| -rw-r--r-- | engines/cruise/cruise_main.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp index d7f5871d39..c3b6cd01d6 100644 --- a/engines/cruise/cruise_main.cpp +++ b/engines/cruise/cruise_main.cpp @@ -427,7 +427,7 @@ void resetFileEntry(int32 entryNumber) { } uint8 *mainProc14(uint16 overlay, uint16 idx) { - ASSERT(0); + assert(0); return NULL; } @@ -1359,7 +1359,7 @@ void closeAllMenu() { menuTable[1] = NULL; } if (linkedMsgList) { - ASSERT(0); + assert(0); // freeMsgList(linkedMsgList); } @@ -1514,7 +1514,7 @@ int CruiseEngine::processInput() { menuTable[0] = NULL; if (linkedMsgList) { - ASSERT(0); + assert(0); // freeMsgList(linkedMsgList); } @@ -1918,7 +1918,7 @@ void CruiseEngine::mainLoop() { processAnimation(); if (remdo) { - // ASSERT(0); + // assert(0); /* main3 = 0; * var24 = 0; * var23 = 0; @@ -1927,7 +1927,7 @@ void CruiseEngine::mainLoop() { } if (cmdLine[0]) { - ASSERT(0); + assert(0); /* redrawStrings(0,&cmdLine,8); waitForPlayerInput(); |