diff options
| author | Jonathan Gray | 2003-07-28 09:49:46 +0000 |
|---|---|---|
| committer | Jonathan Gray | 2003-07-28 09:49:46 +0000 |
| commit | f22cca2be21035760c6b2cfb72ad4e1ba5a08182 (patch) | |
| tree | e588774ea7e4ebaee6b013066fabe3a5eb3af6e7 /sword2/maketext.cpp | |
| parent | 84bccaa83b996ef49fbedf6bb52bb64e9f3c5fd4 (diff) | |
| download | scummvm-rg350-f22cca2be21035760c6b2cfb72ad4e1ba5a08182.tar.gz scummvm-rg350-f22cca2be21035760c6b2cfb72ad4e1ba5a08182.tar.bz2 scummvm-rg350-f22cca2be21035760c6b2cfb72ad4e1ba5a08182.zip | |
rename _DEBUG define to _BS2_DEBUG to stop it conflicting with VC
svn-id: r9237
Diffstat (limited to 'sword2/maketext.cpp')
| -rw-r--r-- | sword2/maketext.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sword2/maketext.cpp b/sword2/maketext.cpp index 617565892a..ddb6313b94 100644 --- a/sword2/maketext.cpp +++ b/sword2/maketext.cpp @@ -284,7 +284,7 @@ mem* BuildTextSprite( uint8 *sentence, uint32 fontRes, uint8 pen, _lineInfo *lin { charPtr = FindChar( sentence[pos++], charSet ); - #ifdef _DEBUG + #ifdef _BS2_DEBUG if ((charPtr->height) != charHeight) Con_fatal_error("FONT ERROR: '%c' is not same height as the space (%s line %u)",sentence[pos-1],__FILE__,__LINE__); #endif @@ -425,11 +425,11 @@ void CopyChar( _frameHeader *charPtr, uint8 *spritePtr, uint16 spriteWidth, uint //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- //----------------------------------------------------------------------------- -#ifdef _DEBUG +#ifdef _BS2_DEBUG #define MAX_text_blocs MAX_DEBUG_TEXT_BLOCKS+1 // allow enough for all the debug text blocks (see debug.cpp) #else #define MAX_text_blocs 2 // only need one for speech, and possibly one for "PAUSED" -#endif // _DEBUG +#endif // _BS2_DEBUG typedef struct { @@ -469,7 +469,7 @@ uint32 Build_new_block(uint8 *ascii, int16 x, int16 y, uint16 width, uint8 pen, while((j<MAX_text_blocs)&&(text_sprite_list[j].text_mem)) j++; -#ifdef _DEBUG +#ifdef _BS2_DEBUG if (j==MAX_text_blocs) //we've run out Con_fatal_error("Build_new_block ran out of blocks! (%s line %u)",__FILE__,__LINE__); //might as well stop the system #endif |