zydronium/SBSPSS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Browse source
This commit is contained in:
Charles 2001-03-21 20:00:22 +00:00
parent e0ba80202e
commit a067d6d551
10 changed files with 17 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/fileio/fileio.cpp
View file

@ -181,13 +181,13 @@ u8 * CFileIO::loadFile( FileEquate file, char *allocName )
buffer = (u8 *)MemAlloc( Length ,allocName); buffer = (u8 *)MemAlloc( Length ,allocName);
ASSERT( buffer ); ASSERT( buffer );
#if defined(__USER_ART__) #if defined(__CLIMAX_DEVKIT__)
EnterCriticalSection(); EnterCriticalSection();
#endif #endif
OpenFile( file ); OpenFile( file );
ReadFile( buffer, Length ); ReadFile( buffer, Length );
CloseFile(); CloseFile();
#if defined(__USER_ART__) #if defined(__CLIMAX_DEVKIT__)
ExitCriticalSection(); ExitCriticalSection();
#endif #endif
@ -222,13 +222,13 @@ u8 * CFileIO::loadFileAtAddr( FileEquate file, u8* buffer)
Length = getFileSize( file ); Length = getFileSize( file );
ASSERT( buffer ); ASSERT( buffer );
#if defined(__USER_ART__) #if defined(__CLIMAX_DEVKIT__)
EnterCriticalSection(); EnterCriticalSection();
#endif #endif
OpenFile( file ); OpenFile( file );
ReadFile( buffer, Length ); ReadFile( buffer, Length );
CloseFile(); CloseFile();
#if defined(__USER_ART__) #if defined(__CLIMAX_DEVKIT__)
ExitCriticalSection(); ExitCriticalSection();
#endif #endif
@ -248,13 +248,13 @@ void CFileIO::CloseFile()
/*****************************************************************************/ /*****************************************************************************/
void CFileIO::LoadFileSizeAtAddr(FileEquate Filename,void *Buffer,u32 Length) void CFileIO::LoadFileSizeAtAddr(FileEquate Filename,void *Buffer,u32 Length)
{ {
#if defined(__USER_ART__) #if defined(__CLIMAX_DEVKIT__)
EnterCriticalSection(); EnterCriticalSection();
#endif #endif
OpenFile(Filename); OpenFile(Filename);
ReadFile(Buffer,Length); ReadFile(Buffer,Length);
CloseFile(); CloseFile();
#if defined(__USER_ART__) #if defined(__CLIMAX_DEVKIT__)
ExitCriticalSection(); ExitCriticalSection();
#endif #endif

2
source/frontend/frontend.cpp
View file

@ -135,7 +135,7 @@ void CFrontEndScene::init()
m_exitToGame=false; m_exitToGame=false;
m_mode=MODE__NONE; m_mode=MODE__NONE;
#ifdef __USER_art__ #if defined(__USER_art__) || defined(__USER_sbart__)
setMode(MODE__CHOOSE_SLOT); setMode(MODE__CHOOSE_SLOT);
#else #else
setMode(MODE__MAIN_TITLES); setMode(MODE__MAIN_TITLES);

2
source/level/layercollision.cpp
View file

@ -177,7 +177,7 @@ const colrgb s_typeColours[]={
typedef enum {SHOW_NONE,SHOW_OPAQUE,SHOW_SEMITRANS}ColShowType; typedef enum {SHOW_NONE,SHOW_OPAQUE,SHOW_SEMITRANS}ColShowType;
#if defined (__USER_paul__) #if defined (__USER_paul__)
ColShowType showCollision=SHOW_OPAQUE; ColShowType showCollision=SHOW_OPAQUE;
#elif defined (__USER_art__) #elif defined (__USER_art__) || defined (__USER_sbart__)
ColShowType showCollision=SHOW_SEMITRANS; ColShowType showCollision=SHOW_SEMITRANS;
#else #else
ColShowType showCollision=SHOW_NONE; ColShowType showCollision=SHOW_NONE;

2
source/level/layertile3d.cpp
View file

@ -13,7 +13,7 @@
#include "gfx\font.h" #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 #define _SHOW_POLYZ_ 1
#endif #endif
/*****************************************************************************/ /*****************************************************************************/

2
source/level/level.cpp
View file

@ -392,7 +392,7 @@ void CLevel::init()
exitTrigger=new ("LevelExitTrigger") CLevelExitTrigger(); exitTrigger=new ("LevelExitTrigger") CLevelExitTrigger();
exitTrigger->init(); exitTrigger->init();
// (pkg) // (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) if(lvlTab->exitX==0&&lvlTab->exitY==0)
{ {
PAUL_DBGMSG("-- NO LEVEL EXIT DEFINED FOR %d",s_globalLevelSelectThing); PAUL_DBGMSG("-- NO LEVEL EXIT DEFINED FOR %d",s_globalLevelSelectThing);

2
source/system/dbg.cpp
View file

@ -291,7 +291,7 @@ void DoAssert( const char * Txt, const char * file, const int line )
/*****************************************************************************/ /*****************************************************************************/
void DbgPollHost() void DbgPollHost()
{ {
#if !defined(__USER_ART__) #ifndef __CLIMAX_DEVKIT__
#if __FILE_SYSTEM__==PC #if __FILE_SYSTEM__==PC
pollhost(); pollhost();
#endif #endif

2
source/system/main.cpp
View file

@ -207,6 +207,8 @@ int main()
GameState::setNextScene( &SceneSelector ); GameState::setNextScene( &SceneSelector );
#elif __USER_art__ #elif __USER_art__
GameState::setNextScene( &FrontEndScene ); GameState::setNextScene( &FrontEndScene );
#elif __USER_sbart__
GameState::setNextScene( &FrontEndScene );
#else #else
GameState::setNextScene( &GameScene ); GameState::setNextScene( &GameScene );
#endif #endif

6
source/system/vid.cpp
View file

@ -431,11 +431,7 @@ int OldX=Scr->Disp.disp.x,OldY=Scr->Disp.disp.y;
PadUpdate(); PadUpdate();
DbgPollHost(); DbgPollHost();
#ifdef __USER_ARTDEV__ Pad=PadGetHeld(0);
Pad=PadGetHeld(1);
#else
Pad=PadGetHeld(0);
#endif
#ifdef __USER_paul__ #ifdef __USER_paul__
// my finger was hurting.. // my finger was hurting..
if((PadGetDown(0) & PAD_SELECT)) Done=1; if((PadGetDown(0) & PAD_SELECT)) Done=1;

4
source/triggers/tlevexit.cpp
View file

@ -51,7 +51,7 @@
Params: Params:
Returns: Returns:
---------------------------------------------------------------------- */ ---------------------------------------------------------------------- */
#ifdef __USER_art__ #if defined (__USER_art__) || defined (__USER_sbart__)
#include "gfx\prim.h" #include "gfx\prim.h"
void CLevelExitTrigger::render() void CLevelExitTrigger::render()
{ {
@ -111,7 +111,7 @@ void CLevelExitTrigger::collidedWith(CThing *_thisThing)
{ {
ASSERT(_thisThing->getThingType()==TYPE_PLAYER); ASSERT(_thisThing->getThingType()==TYPE_PLAYER);
#ifndef __USER_art__ #if !defined (__USER_art__) && !defined (__USER_sbart__)
CGameScene::levelFinished(); CGameScene::levelFinished();
#endif #endif
} }

2
source/triggers/tlevexit.h
View file

@ -37,7 +37,7 @@
class CLevelExitTrigger : public CTriggerThing class CLevelExitTrigger : public CTriggerThing
{ {
public: public:
#ifdef __USER_art__ #if defined (__USER_art__) || defined (__USER_sbart__)
virtual void render(); virtual void render();
#endif #endif
void setExitPosition(int _x,int _y,int _w,int _h); void setExitPosition(int _x,int _y,int _w,int _h);