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
 

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);

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;

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
 /*****************************************************************************/

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);

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

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

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
 #ifdef __USER_paul__
 			// my finger was hurting..
             if((PadGetDown(0) & PAD_SELECT)) Done=1;

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
 }

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);