Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reformat all files #273

Merged
merged 2 commits into from
Jun 23, 2024
Merged

Reformat all files #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
75cb900
Reformat all files
SquareMan Jun 23, 2024
40b1054
Merge remote-tracking branch 'origin/main' into HEAD
mattbruv Jun 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/SB/Core/gc/iAnim.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,7 +204,6 @@ void iAnimBlend(float32 BlendFactor, float32 BlendRecip, uint16* BlendTimeOffset

Quat1++;


if (Quat2)
{
q2++;
Expand Down
1 change: 0 additions & 1 deletion src/SB/Core/gc/iPad.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ int32 iPadInit()
return 1;
}


#if 0
_tagxPad* iPadEnable(_tagxPad* pad, int16 port)
{
Expand Down
93 changes: 1 addition & 92 deletions src/SB/Core/gc/iSnd.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ extern float32 _1262;
extern float32 _1263;
extern volatile int32 fc;


void arq_callback(long32)
{
if (!soundInited)
Expand All @@ -25,58 +24,22 @@ void arq_callback(long32)
SoundFlags = 0;
}

















void iSndExit()
{
soundInited = 0;
AXQuit();
}


//not sure where this type is from.
void iSndSetEnvironmentalEffect(isound_effect)
{
return;
}


void iSndInitSceneLoaded()
{
}



















#ifdef NON_MATCHING
uint32 iVolFromX(float32 param1)
{
Expand All @@ -95,13 +58,6 @@ uint32 iVolFromX(float32 param1)
}
#endif








void iSndVolUpdate(xSndVoiceInfo* info, vinfo* vinfo)
{
MIXUnMute(vinfo->voice);
Expand All @@ -116,10 +72,6 @@ void iSndVolUpdate(xSndVoiceInfo* info, vinfo* vinfo)
}
}





void iSndUpdateSounds()
{
if (!soundInited)
Expand All @@ -136,39 +88,10 @@ void iSndUpdateSounds()
}
}





























void iSndStartStereo(uint32 id1, uint32 id2, float32 pitch)
{
}


void iSndStereo(uint32 i)
{
if (i == 0)
Expand Down Expand Up @@ -199,16 +122,11 @@ void iSndWaitForDeadSounds()
}
#endif


//
//
void iSndSuspendCD(uint32)
{
}





void iSndMessWithEA(sDSPADPCM* param1) //sDSPADPCM*
{
if (param1 != NULL)
Expand All @@ -227,24 +145,15 @@ uint32 SampleToNybbleAddress(uint32 sample)
}
#endif


void sndloadcb(tag_xFile* tag)
{
SoundFlags = 0;
}








void iSndSetExternalCallback(void (*func_ptr)(uint32))
{
}


void iSndMyAXFree(_AXVPB** param1)
{
if (param1 != NULL && *param1 != NULL)
Expand Down
19 changes: 0 additions & 19 deletions src/SB/Core/gc/iSystem.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,10 +40,6 @@ uint16 my_dsc(uint16 dsc)
return dsc;
}





//

void MemoryProtectionErrorHandler(uint16 last, OSContext* ctx, uint64 unk1, uint64 unk2)
Expand Down Expand Up @@ -72,9 +68,6 @@ void TRCInit()

#endif




/*
void iSystemExit()
{
Expand All @@ -89,25 +82,13 @@ void iSystemExit()
}
*/










int32 RenderWareExit()
{
RwEngineStop();
RwEngineClose();
return RwEngineTerm();
}




void null_func()
{
mem_base_alloc += 4;
Expand Down
5 changes: 0 additions & 5 deletions src/SB/Core/gc/isavegame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ extern st_ISGSESSION g_isgdata_MAIN;

extern int32 g_isginit;


#if 0
int32 iSGStartup()
{
Expand All @@ -32,14 +31,12 @@ int32 iSGStartup()
}
#endif


int32 iSGShutdown()
{
iSG_discard_icondata();
return 1;
}


#if 0
// WIP
int8* iSGMakeName(en_NAMEGEN_TYPE type, const int8* base, int32 idx)
Expand Down Expand Up @@ -79,7 +76,6 @@ int8* iSGMakeName(en_NAMEGEN_TYPE type, const int8* base, int32 idx)
}
#endif


#if 0
// Struct definition is screwed up.
st_ISGSESSION* iSGSessionBegin(void* cltdata, void (*chgfunc)(void*, en_CHGCODE), int32 monitor)
Expand All @@ -95,7 +91,6 @@ st_ISGSESSION* iSGSessionBegin(void* cltdata, void (*chgfunc)(void*, en_CHGCODE)
}
#endif


#if 0
// Structs make no sense
void iSGSessionEnd(st_ISGSESSION* isgdata)
Expand Down
3 changes: 0 additions & 3 deletions src/SB/Core/x/iCamera.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -329,9 +329,6 @@ iFogParams& iFogParams::operator=(const iFogParams& other) // temp
return *this;
}




void iCameraSetFogRenderStates()
{
RwCamera* pCamera;
Expand Down
33 changes: 0 additions & 33 deletions src/SB/Core/x/xAnim.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,6 @@ static bool _xCharIn(char ch, const char* str)

// _xCheckAnimNameInner(const char*,const char*,int,char*,int*,int*)


bool _xCheckAnimNameInner(const char* name, const char* pattern, int32 patternSize, int8* extra,
int32* nameOut, int32* extraOut);

Expand Down Expand Up @@ -105,9 +104,6 @@ float std::atan2f(float y, float x)
}
#endif




float CalcRecipBlendMax(uint16*);

static uint32 StateHasTransition(xAnimState* state, xAnimTransition* tran)
Expand Down Expand Up @@ -186,9 +182,6 @@ static void TransitionTimeInit(xAnimSingle* single, xAnimTransition* tran)
}
#endif




xAnimFile* xAnimFileNewBilinear(void** rawData, const char* name, uint32 flags,
xAnimFile** linkedList, uint32 numX, uint32 numY);

Expand All @@ -197,12 +190,6 @@ xAnimFile* xAnimFileNew(void* rawData, const char* name, uint32 flags, xAnimFile
return xAnimFileNewBilinear(&rawData, name, flags, linkedList, 1, 1);
}







void xAnimFileEval(xAnimFile* data, float32 time, float32* bilinear, uint32 flags, xVec3* tran,
xQuat* quat, float32*);

Expand Down Expand Up @@ -607,19 +594,14 @@ static void EffectSingleRun(xAnimSingle* single)
single->Effect = effect;
}




void EffectSingleLoop(xAnimSingle* single);

// EffectSingleStop(xAnimSingle*)


void EffectSingleStop(xAnimSingle* single);

// StopUpdate(xAnimSingle*)


static void LoopUpdate(xAnimSingle* single)
{
float32 time = single->Time;
Expand All @@ -635,12 +617,6 @@ static void LoopUpdate(xAnimSingle* single)
}
}







void SingleUpdate(xAnimSingle* single, float32 timeDelta);

static void SingleEval(xAnimSingle* single, xVec3* tran, xQuat* quat)
Expand Down Expand Up @@ -713,9 +689,6 @@ void xAnimPlayChooseTransition(xAnimPlay* play)
}
}




void xAnimPlayUpdate(xAnimPlay* play, float32 timeDelta)
{
uint32 i;
Expand All @@ -734,9 +707,6 @@ void xAnimPlayUpdate(xAnimPlay* play, float32 timeDelta)
}
}




void xAnimPoolCB(xMemPool* pool, void* data)
{
int32 i;
Expand Down Expand Up @@ -800,9 +770,6 @@ void xAnimPoolCB(xMemPool* pool, void* data)
clone->Pool = pool;
}




xAnimPlay* xAnimPoolAlloc(xMemPool* pool, void* object, xAnimTable* table,
xModelInstance* modelInst)
{
Expand Down
Loading