kawa/banjo-kazooie
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

address variaty of compiler warnings and code documentation

Browse Source
This commit is contained in:
Banjo Kazooie
2022-12-03 01:30:35 -06:00
parent 263b5bab4e
commit 1c063c781c
211 changed files with 1341 additions and 1323 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/MM/ch/conga.c
View File

@@ -223,12 +223,12 @@ void func_803876D0(Actor *this){
func_80304D4C(sp40, &((ActorLocal_Conga *)&this->local)->unk10);
}
if(0.0f == this->unk28){
this->unk28 = (func_80326CCC(0x36) != NULL)? 2.0f: 1.0f;
this->unk28 = (actorArray_findActorFromMarkerId(MARKER_36_ORANGE_COLLECTABLE) != NULL)? 2.0f: 1.0f;
}
if(0.0f != this->velocity_x){
this->velocity_x -= 1.0f;
if(0.0f == this->velocity_x){
__spawnqueue_add_1((GenMethod_1)func_80387100, (s32)this->marker);
__spawnQueue_add_1((GenMethod_1)func_80387100, (s32)this->marker);
}
}
marker_setCollisionScripts(this->marker, NULL, NULL, func_80387168);
@@ -369,6 +369,6 @@ void func_803876D0(Actor *this){
|| (this->state == 7 && actor_animationIsAt(this, 0.468f))
){
func_8034A1B4(this->marker->unk44, 5, &this->local);
__spawnqueue_add_1((GenMethod_1)func_803873C8, (s32)this->marker); //spawn orange
__spawnQueue_add_1((GenMethod_1)func_803873C8, (s32)this->marker); //spawn orange
}
}

4
src/MM/ch/hut.c
View File

@@ -92,10 +92,10 @@ void chhut_update(Actor *this){
func_8030E484(SFX_5B_HEAVY_STUFF_FALLING);
func_80328A84(this, 1);
actor_playAnimationOnce(this);
__spawnqueue_add_1((GenMethod_1)func_803869EC, (s32)this->marker);
__spawnQueue_add_1((GenMethod_1)func_803869EC, (s32)this->marker);
func_802C8F70(this->yaw);
if(D_8037DCB0 < 5){
func_802C3F04(func_802C4218, D_803898D8[D_8037DCB0], *(s32*)(&sp3C[0]),*(s32*)(&sp3C[1]),*(s32*)(&sp3C[2]));
__spawnQueue_add_4((GenMethod_4)func_802C4218, D_803898D8[D_8037DCB0], *(s32*)(&sp3C[0]),*(s32*)(&sp3C[1]),*(s32*)(&sp3C[2]));
}
else{
jiggySpawn(JIGGY_5_MM_HUTS, sp3C);

4
src/MM/ch/juju.c
View File

@@ -48,7 +48,7 @@ Actor* func_80389014(ActorMarker *this, Gfx **dl, Mtx **mPtr, Vtx **arg2){
Actor * actorPtr;
ActorLocal_Juju_2 *jujuPtr;
actorPtr = func_80325300(this, sp34);
actorPtr = marker_getActorAndRotation(this, sp34);
jujuPtr = (ActorLocal_Juju_2 *)&actorPtr->local;
if(jujuPtr->unk0 != 2){
modelRender_setDepthMode(MODEL_RENDER_DEPTH_FULL);
@@ -92,7 +92,7 @@ void func_803891E8(s32 x, s32 y, s32 z, s32 yaw){
}
void func_80389244(s32 x, s32 y, s32 z, s32 yaw){
func_802C3F04(func_803891E8, x, y, z, yaw);
__spawnQueue_add_4((GenMethod_4)func_803891E8, x, y, z, yaw);
func_802BB3DC(0, 10.0f, 0.8f);
gcpausemenu_80314AC8(1);
}

6
src/MM/ch/jujuhitbox.c
View File

@@ -59,7 +59,7 @@ void func_80388BEC(NodeProp *arg0, ActorMarker *arg1){
sp20[0] = (f32)arg0->x;
sp20[1] = (f32)arg0->y;
sp20[2] = (f32)arg0->z;
sp30 = func_80326D68(sp20, 0x11, -1, &sp34);
sp30 = actorArray_findClosestActorFromActorId(sp20, 0x11, -1, &sp34);
if( sp30 != NULL
&& !( sp34 > 500.0f )
&& (sp30->state ==3)
@@ -71,7 +71,7 @@ void func_80388BEC(NodeProp *arg0, ActorMarker *arg1){
((ActorLocal_JujuHitbox *)&sp30->local)->unk4++;
func_803892A8(((ActorLocal_JujuHitbox *)&sp30->local)->unk8);
func_80353580(arg1);
func_802C3F04((GenMethod_4)func_802C4140, 0x58, *(s32 *)&sp20[0], *(s32 *)&sp20[1], *(s32 *)&sp20[2]);
__spawnQueue_add_4((GenMethod_4)func_802C4140, 0x58, *(s32 *)&sp20[0], *(s32 *)&sp20[1], *(s32 *)&sp20[2]);
}
}
}
@@ -123,7 +123,7 @@ void func_80388E20(Actor *this){
}
if(!this->unk16C_4){
this->unk16C_4 = 1;
func_802C3D3C(func_80388DFC,this->marker, jujuCtlPtr->unk4);
__spawnQueue_add_2((GenMethod_2)func_80388DFC,this->marker, jujuCtlPtr->unk4);
func_80388D14(this);
}else{
if( func_80329530(this, 0xfa)

27
src/MM/ch/orangepad.c
View File

@@ -28,8 +28,8 @@ void MM_func_803863F0(s32 x, s32 y, s32 z){
}
void func_80386444(ActorMarker *arg0){
f32 sp54;
Actor *actor;
f32 orange_pad_distance;
Actor *orange_pad;
f32 sp44[3];
ParticleEmitter *s0;
s32 temp_a0;
@@ -37,27 +37,30 @@ void func_80386444(ActorMarker *arg0){
sp44[0] = arg0->propPtr->x;
sp44[1] = arg0->propPtr->y;
sp44[2] = arg0->propPtr->z;
actor = func_80326D68(sp44, 0x57, 1, &sp54);
orange_pad = actorArray_findClosestActorFromActorId(sp44, ACTOR_57_ORANGE_PAD, 1, &orange_pad_distance);
if(actor && !(500.0f < sp54)){
actor->state = 1;
if(func_80326D68(sp44, 0x57, 1, &sp54)){
if(orange_pad && !(500.0f < orange_pad_distance)){
orange_pad->state = 1;
if(actorArray_findClosestActorFromActorId(sp44, ACTOR_57_ORANGE_PAD, 1, &orange_pad_distance)){
func_8025A6EC(COMUSIC_2B_DING_B, 22000);
}else{
temp_a0 = (actor->unk78_13 == 0x106) ? 0x10 : (actor->unk78_13 == 0x76) ? 0xf : 0xe;
temp_a0 = (orange_pad->unk78_13 == 0x106) ? 0x10
: (orange_pad->unk78_13 == 0x76) ? 0xf
: 0xe;
func_802BAFE4(temp_a0);
sp44[1] += 50.0f;
timedFunc_set_3(0.6f, (TFQM3) MM_func_803863F0, (s32)sp44[0], (s32)sp44[1], (s32)sp44[2]);
timedFunc_set_3(0.6f, (GenMethod_3) MM_func_803863F0, (s32)sp44[0], (s32)sp44[1], (s32)sp44[2]);
func_8025A6EC(COMUSIC_2D_PUZZLE_SOLVED_FANFARE, 0x7FFF);
if(!jiggyscore_isCollected(JIGGY_8_MM_ORANGE_PADS)){
func_80311480(0xB3B, 4, NULL, NULL, NULL, NULL);
}
}// L803865D8
s0 = partEmitList_pushNew(0x1e);
particleEmitter_setPosition(s0, actor->position);
//emmit sparkles
s0 = partEmitList_pushNew(30);
particleEmitter_setPosition(s0, orange_pad->position);
particleEmitter_setModel(s0, 0x89f);
func_802EFB70(s0, 0.09f, 0.19f);
func_802EFB84(s0, 0.0f, 0.0f);
@@ -81,7 +84,7 @@ void func_80386444(ActorMarker *arg0){
func_802EF9F8(s0, 0.01f);
func_802EFA18(s0, 3);
func_802EFA20(s0, 1.0f, 1.3f);
particleEmitter_emitN(s0, 0x1e);
particleEmitter_emitN(s0, 30);
}
}
@@ -102,7 +105,7 @@ void func_80386768(Actor * this){
}//L803867B0
if(!this->unk16C_4){
this->unk100 = func_80326D68(this->position, 8,-1, &sp34)->marker;
this->unk100 = actorArray_findClosestActorFromActorId(this->position, 8,-1, &sp34)->marker;
this->unk16C_4 = 1;
}//L803867E0