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

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