encounter/bfbb
0
0
Fork 0
mirror of https://github.com/encounter/bfbb.git synced 2026-07-09 18:19:36 -07:00
Code Issues Packages Projects Releases Wiki Activity

Reformat all files (#273)

Browse Source 
Co-authored-by: Matt P <5638426+mattbruv@users.noreply.github.com>
This commit is contained in:
Steven Casper
2024-06-23 10:12:54 -05:00
committed by GitHub
co-authored by Matt P
parent 63bae718b5
commit dbf834afee
130 changed files with 976 additions and 14271 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/SB/Core/gc/iAnim.cpp
-1
View File
@@ -204,7 +204,6 @@ void iAnimBlend(float32 BlendFactor, float32 BlendRecip, uint16* BlendTimeOffset
Quat1++;
if (Quat2)
{
q2++;
src/SB/Core/gc/iPad.cpp
-1
View File
@@ -10,7 +10,6 @@ int32 iPadInit()
return 1;
}
#if 0
_tagxPad* iPadEnable(_tagxPad* pad, int16 port)
{
src/SB/Core/gc/iSnd.cpp
+1 -92
View File
@@ -15,7 +15,6 @@ extern float32 _1262;
extern float32 _1263;
extern volatile int32 fc;
void arq_callback(long32)
{
if (!soundInited)
@@ -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)
{
@@ -95,13 +58,6 @@ uint32 iVolFromX(float32 param1)
}
#endif
void iSndVolUpdate(xSndVoiceInfo* info, vinfo* vinfo)
{
MIXUnMute(vinfo->voice);
@@ -116,10 +72,6 @@ void iSndVolUpdate(xSndVoiceInfo* info, vinfo* vinfo)
}
}
void iSndUpdateSounds()
{
if (!soundInited)
@@ -136,39 +88,10 @@ void iSndUpdateSounds()
}
}
void iSndStartStereo(uint32 id1, uint32 id2, float32 pitch)
{
}
void iSndStereo(uint32 i)
{
if (i == 0)
@@ -199,16 +122,11 @@ void iSndWaitForDeadSounds()
}
#endif
//
//
void iSndSuspendCD(uint32)
{
}
void iSndMessWithEA(sDSPADPCM* param1) //sDSPADPCM*
{
if (param1 != NULL)
@@ -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)
src/SB/Core/gc/iSystem.cpp
-19
View File
@@ -40,10 +40,6 @@ uint16 my_dsc(uint16 dsc)
return dsc;
}
//
void MemoryProtectionErrorHandler(uint16 last, OSContext* ctx, uint64 unk1, uint64 unk2)
@@ -72,9 +68,6 @@ void TRCInit()
#endif
/*
void iSystemExit()
{
@@ -89,15 +82,6 @@ void iSystemExit()
}
*/
int32 RenderWareExit()
{
RwEngineStop();
@@ -105,9 +89,6 @@ int32 RenderWareExit()
return RwEngineTerm();
}
void null_func()
{
mem_base_alloc += 4;
src/SB/Core/gc/isavegame.cpp
-5
View File
@@ -12,7 +12,6 @@ extern st_ISGSESSION g_isgdata_MAIN;
extern int32 g_isginit;
#if 0
int32 iSGStartup()
{
@@ -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)
@@ -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)
@@ -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)
src/SB/Core/x/iCamera.cpp
-3
View File
@@ -329,9 +329,6 @@ iFogParams& iFogParams::operator=(const iFogParams& other) // temp
return *this;
}
void iCameraSetFogRenderStates()
{
RwCamera* pCamera;
src/SB/Core/x/xAnim.cpp
-33
View File
@@ -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);
@@ -105,9 +104,6 @@ float std::atan2f(float y, float x)
}
#endif
float CalcRecipBlendMax(uint16*);
static uint32 StateHasTransition(xAnimState* state, xAnimTransition* tran)
@@ -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);
@@ -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*);
@@ -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;
@@ -635,12 +617,6 @@ static void LoopUpdate(xAnimSingle* single)
}
}
void SingleUpdate(xAnimSingle* single, float32 timeDelta);
static void SingleEval(xAnimSingle* single, xVec3* tran, xQuat* quat)
@@ -713,9 +689,6 @@ void xAnimPlayChooseTransition(xAnimPlay* play)
}
}
void xAnimPlayUpdate(xAnimPlay* play, float32 timeDelta)
{
uint32 i;
@@ -734,9 +707,6 @@ void xAnimPlayUpdate(xAnimPlay* play, float32 timeDelta)
}
}
void xAnimPoolCB(xMemPool* pool, void* data)
{
int32 i;
@@ -800,9 +770,6 @@ void xAnimPoolCB(xMemPool* pool, void* data)
clone->Pool = pool;
}
xAnimPlay* xAnimPoolAlloc(xMemPool* pool, void* object, xAnimTable* table,
xModelInstance* modelInst)
{
src/SB/Core/x/xBehaveMgr.cpp
-25
View File
@@ -8,7 +8,6 @@
extern int32 g_modinit_xBehaveMgr;
extern xBehaveMgr* g_behavmgr;
#ifdef NON_MATCHING
void xBehaveMgr_Startup()
{
@@ -20,7 +19,6 @@ void xBehaveMgr_Startup()
}
#endif
#if 0
void xBehaveMgr_Shutdown()
{
@@ -36,46 +34,36 @@ void xBehaveMgr_Shutdown()
}
#endif
xBehaveMgr* xBehaveMgr_GetSelf()
{
return g_behavmgr;
}
xFactory* xBehaveMgr_GoalFactory()
{
return g_behavmgr->GetFactory();
}
void xBehaveMgr_ScenePrepare()
{
g_behavmgr->ScenePrepare();
}
void xBehaveMgr_SceneFinish()
{
g_behavmgr->SceneFinish();
}
void xBehaveMgr_SceneReset()
{
g_behavmgr->SceneReset();
}
void xBehaveMgr::RegBuiltIn()
{
xGoalSimple_RegisterTypes(this->goalFactory);
}
xPsyche* xBehaveMgr::Subscribe(xBase* owner, int32 i)
{
xPsyche* psyche = &this->psypool[this->psylist.cnt];
@@ -85,25 +73,21 @@ xPsyche* xBehaveMgr::Subscribe(xBase* owner, int32 i)
return psyche;
}
void xBehaveMgr::UnSubscribe(xPsyche* psy)
{
psy->KillBrain(this->goalFactory);
XOrdRemove(&this->psylist, psy, -1);
}
void xBehaveMgr::ScenePrepare()
{
}
void xBehaveMgr::SceneFinish()
{
XOrdReset(&this->psylist);
}
void xBehaveMgr::SceneReset()
{
for (int32 i = 0; i < this->psylist.cnt; i++)
@@ -113,7 +97,6 @@ void xBehaveMgr::SceneReset()
}
}
void xPsyche::BrainBegin()
{
xFactory* factory = xBehaveMgr_GoalFactory();
@@ -121,7 +104,6 @@ void xPsyche::BrainBegin()
factory->GrowDataEnable(&this->fakebase, false);
}
void xPsyche::BrainExtend()
{
xFactory* factory = xBehaveMgr_GoalFactory();
@@ -129,14 +111,12 @@ void xPsyche::BrainExtend()
factory->GrowDataEnable(&this->fakebase, true);
}
void xPsyche::BrainEnd()
{
xBehaveMgr_GoalFactory()->GrowDataDisable();
this->psystat = PSY_STAT_THINK;
}
#ifdef NON_MATCHING
// Regalloc
xGoal* xPsyche::AddGoal(int32 gid, void* createData)
@@ -163,7 +143,6 @@ xGoal* xPsyche::AddGoal(int32 gid, void* createData)
}
#endif
extern float32 _750;
void xPsyche::FreshWipe()
{
@@ -189,7 +168,6 @@ void xPsyche::FreshWipe()
this->flg_psyche |= 1;
}
void xPsyche::SetOwner(xBase* clt_owner, void* userContext)
{
this->clt_owner = clt_owner;
@@ -207,14 +185,12 @@ void xPsyche::SetOwner(xBase* clt_owner, void* userContext)
this->fakebase.eventFunc = NULL;
}
void xPsyche::KillBrain(xFactory* factory)
{
this->Lobotomy(factory);
this->fun_remap = NULL;
}
void xPsyche::Lobotomy(xFactory* factory)
{
while (this->goallist != NULL)
@@ -224,7 +200,6 @@ void xPsyche::Lobotomy(xFactory* factory)
}
}
#if 0
void xPsyche::Amnesia(int32 i)
{
src/SB/Core/x/xCamera.cpp
-3
View File
@@ -918,9 +918,6 @@ void xCameraSetScene(xCamera* cam, xScene* sc)
iCameraAssignEnv(cam->lo_cam, sc->env->geom);
}
void xCameraSetTargetMatrix(xCamera* cam, xMat4x3* mat)
{
cam->tgt_mat = mat;
src/SB/Core/x/xClimate.cpp
+15 -17
View File
@@ -14,8 +14,8 @@ _tagClimate* sClimate;
float snow_life = 3.0f;
const xVec3 snow_vel = {0.0f, -2.0f, 0.0f};
const xVec3 snow_dvel = {0.1f, 0.1f, 0.1f};
const xVec3 snow_vel = { 0.0f, -2.0f, 0.0f };
const xVec3 snow_dvel = { 0.1f, 0.1f, 0.1f };
void xClimateVecFromAngle(float32 angleDegrees, xVec3* vec)
{
@@ -46,20 +46,20 @@ void xClimateInitAsset(_tagClimate* climate, xEnvAsset* asset)
sClimate = climate;
climate->wind.strength = 0.0f;
xClimateVecFromAngle(climate->wind.angle, &climate->wind.dir);
if(asset->climateFlags == 0)
if (asset->climateFlags == 0)
{
climate->wind.strength = 0.0f;
climate->rain.strength = 0.0f;
return;
}
if(asset->climateFlags & 1)
if (asset->climateFlags & 1)
{
climate->rain.rain = 1.0f;
climate->rain.strength = 0.5f * (asset->climateStrengthMax - asset->climateStrengthMin);
climate->rain.strength += asset->climateStrengthMin;
}
else if(asset->climateFlags & 2)
else if (asset->climateFlags & 2)
{
climate->rain.rain = 0.0f;
climate->rain.strength = 0.5f * (asset->climateStrengthMax - asset->climateStrengthMin);
@@ -102,10 +102,10 @@ void UpdateRain(_tagClimate* climate, float seconds)
memset(&info, 0, sizeof(xParEmitterCustomSettings));
info.custom_flags = 0x100;
if(r->rain != 0)
if (r->rain != 0)
{
int32 total_rain_drops = 25.0f * r->strength;
for(int32 i = 0; i < total_rain_drops; i++)
for (int32 i = 0; i < total_rain_drops; i++)
{
GetPosBigDogWhattupFool(&info.pos);
info.pos.x += 25.0f * xurand() - 12.5f;
@@ -114,15 +114,15 @@ void UpdateRain(_tagClimate* climate, float seconds)
xParEmitterEmitCustom(r->rain_emitter, seconds, &info);
}
return;
}
}
xVec3 fool;
int32 total_snow_flakes = 25.0f * r->strength;
info.custom_flags |= 0x202;
GetPosBigDogWhattupFool(&fool);
if(gPTankDisable)
if (gPTankDisable)
{
for(int32 i = 0; i < total_snow_flakes; i++)
for (int32 i = 0; i < total_snow_flakes; i++)
{
info.pos = fool;
info.pos.x += 45.0f * xurand() - 22.5f;
@@ -137,7 +137,6 @@ void UpdateRain(_tagClimate* climate, float seconds)
info.vel.y = snow_dvel.y * xurand() + snow_vel.y;
info.vel.z = snow_dvel.z * xurand() + snow_vel.z;
info.life.val[0] = snow_life * perc + snow_life;
xParEmitterEmitCustom(r->snow_emitter, seconds, &info);
}
@@ -145,14 +144,13 @@ void UpdateRain(_tagClimate* climate, float seconds)
}
int32 num = (float32)total_snow_flakes * 0.1f;
if(num > 0)
if (num > 0)
{
xVec3* pos = (xVec3*)xMemPushTemp(num * 2 * sizeof(xVec3));
xVec3* vel = pos+num;
if(pos != NULL)
xVec3* vel = pos + num;
if (pos != NULL)
{
for(int32 i = 0; i < num; i++)
for (int32 i = 0; i < num; i++)
{
*pos = fool;
pos->x += 45.0f * xurand() - 22.5f;
src/SB/Core/x/xClumpColl.cpp
-2
View File
@@ -2,7 +2,6 @@
#include <types.h>
xClumpCollBSPTree* xClumpColl_StaticBufferInit(void* data, uint32 param_2)
{
uint32* header; // unused
@@ -26,7 +25,6 @@ xClumpCollBSPTree* xClumpColl_StaticBufferInit(void* data, uint32 param_2)
return tree;
}
void xClumpColl_InstancePointers(xClumpCollBSPTree* tree, RpClump* clump)
{
int32 i;
src/SB/Core/x/xCollide.cpp
-3
View File
@@ -7,7 +7,6 @@
// extern float32 lbl_803CCAA8; // 0.0
#ifdef NON_MATCHING
// Will match once we can use float literals for this
_xCollsIdx xCollideGetCollsIdx(const xCollis* coll, const xVec3* tohit, const xMat3x3* mat)
@@ -86,13 +85,11 @@ _xCollsIdx xCollideGetCollsIdx(const xCollis* coll, const xVec3* tohit, const xM
}
#endif
void xCollideInit(xScene* sc)
{
iCollideInit(sc);
}
#if 0
//WIP, very wrong but it compiles at least
// Need to figure out why it defines scale twice and why ghidra passes in wrong values to xVec3SMul
src/SB/Core/x/xCollideFast.cpp
-1
View File
@@ -3,7 +3,6 @@
#include <types.h>
void xCollideFastInit(xScene* sc)
{
iCollideFastInit(sc);
src/SB/Core/x/xCutscene.cpp
-33
View File
@@ -22,7 +22,6 @@ extern float32 _672; // 1.0
extern float32 lbl_803CCB3C; // 0.0
extern float32 lbl_803CCB40; // 0.033333335
#ifdef NON_MATCHING
// Non-matching: scheduling
void xCutscene_Init(void* toc)
@@ -54,7 +53,6 @@ void xCutscene_Init(void* toc)
}
#endif
#if 0
// Damn RwEngineInstance ruining this (as well as the members being accessed incorrectly by Ghidra)
xCutscene* xCutscene_Create(uint32 id)
@@ -98,7 +96,6 @@ xCutscene* xCutscene_Create(uint32 id)
}
#endif
#if 0
// WIP
int32 xCutscene_Destroy(xCutscene* csn)
@@ -144,7 +141,6 @@ int32 xCutscene_Destroy(xCutscene* csn)
}
#endif
int32 xCutscene_LoadStart(xCutscene* csn)
{
uint32 cnt;
@@ -160,7 +156,6 @@ int32 xCutscene_LoadStart(xCutscene* csn)
return 1;
}
#if 0
// WIP
float32 xCutsceneConvertBreak(float param_1, xCutsceneBreak* param_2, uint32 param_3, int param_4)
@@ -195,34 +190,6 @@ float32 xCutsceneConvertBreak(float param_1, xCutsceneBreak* param_2, uint32 par
}
#endif
xCutscene* xCutscene_CurrentCutscene()
{
return &sActiveCutscene;
src/SB/Core/x/xDebug.cpp
-9
View File
@@ -41,9 +41,6 @@ void xtextbox::render(bool cache) const
render(temp_layout(cache), 0, -1);
}
#if 0
// WIP.
xfont& xfont::operator=(const xfont& other)
@@ -75,12 +72,6 @@ xfont& xfont::operator=(const xfont& other)
#endif
float32 NSCREENY(float32 scale)
{
return _781 * scale;
src/SB/Core/x/xDecal.cpp
-4
View File
@@ -5,10 +5,6 @@
//Doesn't OK if you use it from header, so assuming it's global.
extern uint32 active_emitters_size;
void xDecalInit()
{
active_emitters_size = 0;
src/SB/Core/x/xDecal.h
+5 -5
View File
@@ -69,11 +69,11 @@ struct xDecalEmitter
uint32 curve_index;
float32 ilife;
void set_curve(const curve_node* curve, ulong32 size);
void refresh_config();
void set_texture(const int8* name);
void set_default_config();
void init(int32 max_size, const int8*);
void set_curve(const curve_node* curve, ulong32 size);
void refresh_config();
void set_texture(const int8* name);
void set_default_config();
void init(int32 max_size, const int8*);
};
void xDecalInit();
src/SB/Core/x/xEntBoulder.cpp
-73
View File
@@ -4,25 +4,11 @@
#include <types.h>
void xEntBoulder_Init(void* ent, void* asset)
{
xEntBoulder_Init((xEntBoulder*)ent, (xEntAsset*)asset);
}
void xEntBoulder_AddInstantForce(xEntBoulder* ent, xVec3* force)
{
if (ent->update != 0)
@@ -32,7 +18,6 @@ void xEntBoulder_AddInstantForce(xEntBoulder* ent, xVec3* force)
}
}
void xEntBoulder_AddForce(xEntBoulder* ent, xVec3* force)
{
if (ent->update != 0)
@@ -42,69 +27,11 @@ void xEntBoulder_AddForce(xEntBoulder* ent, xVec3* force)
}
}
void xEntBoulder_BUpdate()
{
//For some reason this seems to be a completely empty function
}
void xMat3x3RMulVec(xVec3* o, const xMat3x3* m, const xVec3* v)
{
float32 x = m->right.x * v->x + m->up.x * v->y + m->at.x * v->z;
src/SB/Core/x/xEntMotion.cpp
-72
View File
@@ -2,78 +2,6 @@
#include <types.h>
void xMat3x3RMulVec(xVec3* o, const xMat3x3* m, const xVec3* v)
{
float32 x = m->right.x * v->x + m->up.x * v->y + m->at.x * v->z;
src/SB/Core/x/xFFX.cpp
-9
View File
@@ -10,9 +10,6 @@ extern uint32 rot_match_psize;
extern xFFXRotMatchState* rot_match_pool;
extern xFFXRotMatchState* rot_match_alist;
// Structure same as the bottom function, get that one, you get this one.
//void xFFXPoolInit(uint32 num_ffx);
@@ -120,12 +117,6 @@ void xFFXApply(xEnt* ent, xScene* sc, float32 dt)
}
}
// The structure of this is identical to the pool init below. Figure out that one, you get this one as well.
//void xFFXShakePoolInit(uint32 num);

Some files were not shown because too many files have changed in this diff Show More