From a067d6d551d1bb81e64d62d63bc74fdb887e6993 Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 21 Mar 2001 20:00:22 +0000 Subject: [PATCH] --- source/fileio/fileio.cpp | 12 ++++++------ source/frontend/frontend.cpp | 2 +- source/level/layercollision.cpp | 2 +- source/level/layertile3d.cpp | 2 +- source/level/level.cpp | 2 +- source/system/dbg.cpp | 2 +- source/system/main.cpp | 2 ++ source/system/vid.cpp | 6 +----- source/triggers/tlevexit.cpp | 4 ++-- source/triggers/tlevexit.h | 2 +- 10 files changed, 17 insertions(+), 19 deletions(-) diff --git a/source/fileio/fileio.cpp b/source/fileio/fileio.cpp index f95f5f10c..914688e2c 100644 --- a/source/fileio/fileio.cpp +++ b/source/fileio/fileio.cpp @@ -181,13 +181,13 @@ u8 * CFileIO::loadFile( FileEquate file, char *allocName ) buffer = (u8 *)MemAlloc( Length ,allocName); ASSERT( buffer ); -#if defined(__USER_ART__) +#if defined(__CLIMAX_DEVKIT__) EnterCriticalSection(); #endif OpenFile( file ); ReadFile( buffer, Length ); CloseFile(); -#if defined(__USER_ART__) +#if defined(__CLIMAX_DEVKIT__) ExitCriticalSection(); #endif @@ -222,13 +222,13 @@ u8 * CFileIO::loadFileAtAddr( FileEquate file, u8* buffer) Length = getFileSize( file ); ASSERT( buffer ); -#if defined(__USER_ART__) +#if defined(__CLIMAX_DEVKIT__) EnterCriticalSection(); #endif OpenFile( file ); ReadFile( buffer, Length ); CloseFile(); -#if defined(__USER_ART__) +#if defined(__CLIMAX_DEVKIT__) ExitCriticalSection(); #endif @@ -248,13 +248,13 @@ void CFileIO::CloseFile() /*****************************************************************************/ void CFileIO::LoadFileSizeAtAddr(FileEquate Filename,void *Buffer,u32 Length) { -#if defined(__USER_ART__) +#if defined(__CLIMAX_DEVKIT__) EnterCriticalSection(); #endif OpenFile(Filename); ReadFile(Buffer,Length); CloseFile(); -#if defined(__USER_ART__) +#if defined(__CLIMAX_DEVKIT__) ExitCriticalSection(); #endif diff --git a/source/frontend/frontend.cpp b/source/frontend/frontend.cpp index fb5801d68..c0208d909 100644 --- a/source/frontend/frontend.cpp +++ b/source/frontend/frontend.cpp @@ -135,7 +135,7 @@ void CFrontEndScene::init() m_exitToGame=false; m_mode=MODE__NONE; -#ifdef __USER_art__ +#if defined(__USER_art__) || defined(__USER_sbart__) setMode(MODE__CHOOSE_SLOT); #else setMode(MODE__MAIN_TITLES); diff --git a/source/level/layercollision.cpp b/source/level/layercollision.cpp index d5428d726..b1baa9b85 100644 --- a/source/level/layercollision.cpp +++ b/source/level/layercollision.cpp @@ -177,7 +177,7 @@ const colrgb s_typeColours[]={ typedef enum {SHOW_NONE,SHOW_OPAQUE,SHOW_SEMITRANS}ColShowType; #if defined (__USER_paul__) ColShowType showCollision=SHOW_OPAQUE; -#elif defined (__USER_art__) +#elif defined (__USER_art__) || defined (__USER_sbart__) ColShowType showCollision=SHOW_SEMITRANS; #else ColShowType showCollision=SHOW_NONE; diff --git a/source/level/layertile3d.cpp b/source/level/layertile3d.cpp index 43eeb2577..bfb39b8e3 100644 --- a/source/level/layertile3d.cpp +++ b/source/level/layertile3d.cpp @@ -13,7 +13,7 @@ #include "gfx\font.h" -#if defined(__USER_art__) || defined(__USER_daveo__) +#if defined(__USER_art__) || defined(__USER_sbart__) || defined(__USER_daveo__) #define _SHOW_POLYZ_ 1 #endif /*****************************************************************************/ diff --git a/source/level/level.cpp b/source/level/level.cpp index 013b96a34..3f09a42d2 100644 --- a/source/level/level.cpp +++ b/source/level/level.cpp @@ -392,7 +392,7 @@ void CLevel::init() exitTrigger=new ("LevelExitTrigger") CLevelExitTrigger(); exitTrigger->init(); // (pkg) -#if defined(__USER_art__) || defined(__USER_paul__) +#if defined(__USER_art__) || defined(__USER_sbart__) || defined(__USER_paul__) if(lvlTab->exitX==0&&lvlTab->exitY==0) { PAUL_DBGMSG("-- NO LEVEL EXIT DEFINED FOR %d",s_globalLevelSelectThing); diff --git a/source/system/dbg.cpp b/source/system/dbg.cpp index c2e78536c..10790f936 100644 --- a/source/system/dbg.cpp +++ b/source/system/dbg.cpp @@ -291,7 +291,7 @@ void DoAssert( const char * Txt, const char * file, const int line ) /*****************************************************************************/ void DbgPollHost() { -#if !defined(__USER_ART__) +#ifndef __CLIMAX_DEVKIT__ #if __FILE_SYSTEM__==PC pollhost(); #endif diff --git a/source/system/main.cpp b/source/system/main.cpp index b131a9689..179077db9 100644 --- a/source/system/main.cpp +++ b/source/system/main.cpp @@ -207,6 +207,8 @@ int main() GameState::setNextScene( &SceneSelector ); #elif __USER_art__ GameState::setNextScene( &FrontEndScene ); +#elif __USER_sbart__ + GameState::setNextScene( &FrontEndScene ); #else GameState::setNextScene( &GameScene ); #endif diff --git a/source/system/vid.cpp b/source/system/vid.cpp index 19f98f8ee..7165679a8 100644 --- a/source/system/vid.cpp +++ b/source/system/vid.cpp @@ -431,11 +431,7 @@ int OldX=Scr->Disp.disp.x,OldY=Scr->Disp.disp.y; PadUpdate(); DbgPollHost(); -#ifdef __USER_ARTDEV__ - Pad=PadGetHeld(1); -#else - Pad=PadGetHeld(0); -#endif + Pad=PadGetHeld(0); #ifdef __USER_paul__ // my finger was hurting.. if((PadGetDown(0) & PAD_SELECT)) Done=1; diff --git a/source/triggers/tlevexit.cpp b/source/triggers/tlevexit.cpp index 021a39e8f..d9ba1f238 100644 --- a/source/triggers/tlevexit.cpp +++ b/source/triggers/tlevexit.cpp @@ -51,7 +51,7 @@ Params: Returns: ---------------------------------------------------------------------- */ -#ifdef __USER_art__ +#if defined (__USER_art__) || defined (__USER_sbart__) #include "gfx\prim.h" void CLevelExitTrigger::render() { @@ -111,7 +111,7 @@ void CLevelExitTrigger::collidedWith(CThing *_thisThing) { ASSERT(_thisThing->getThingType()==TYPE_PLAYER); -#ifndef __USER_art__ +#if !defined (__USER_art__) && !defined (__USER_sbart__) CGameScene::levelFinished(); #endif } diff --git a/source/triggers/tlevexit.h b/source/triggers/tlevexit.h index aa579f47a..925243700 100644 --- a/source/triggers/tlevexit.h +++ b/source/triggers/tlevexit.h @@ -37,7 +37,7 @@ class CLevelExitTrigger : public CTriggerThing { public: -#ifdef __USER_art__ +#if defined (__USER_art__) || defined (__USER_sbart__) virtual void render(); #endif void setExitPosition(int _x,int _y,int _w,int _h);