address variaty of compiler warnings and code documentation
This commit is contained in:
@@ -822,7 +822,7 @@ void func_80387F1C(void)
|
||||
{
|
||||
jiggySpawn(JIGGY_35_LAIR_CC_WITCH_SWITCH, tmp);
|
||||
// FIXME: macro?
|
||||
func_802C3F04((GenMethod_4)func_802C4140, ACTOR_4C_STEAM, *(s32 *)&tmp[0], *(s32 *)&tmp[1], *(s32 *)&tmp[2]);
|
||||
__spawnQueue_add_4((GenMethod_4)func_802C4140, ACTOR_4C_STEAM, *(s32 *)&tmp[0], *(s32 *)&tmp[1], *(s32 *)&tmp[2]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -871,7 +871,7 @@ void func_803880BC(Actor *this)
|
||||
this->position_y -= 51.f;
|
||||
this->unk1C[0] = 0;
|
||||
|
||||
__spawnqueue_add_1((GenMethod_1)func_80387E94, reinterpret_cast(s32, this->marker));
|
||||
__spawnQueue_add_1((GenMethod_1)func_80387E94, reinterpret_cast(s32, this->marker));
|
||||
|
||||
if (func_803203FC(0xBC) && !func_8031FF1C(0x9A))
|
||||
FUNC_8030E624(SFX_3F6_UNKNOWN, 0.75f, 30000);
|
||||
@@ -1144,7 +1144,7 @@ void func_80388524(Actor *this) {
|
||||
break;
|
||||
|
||||
case 0x235://L80388A24
|
||||
sp30 = func_80326EEC(0x236);
|
||||
sp30 = actorArray_findActorFromActorId(0x236);
|
||||
if(func_8031FF1C(0x35)){
|
||||
marker_despawn(this->marker);
|
||||
marker_despawn(sp30->marker);
|
||||
@@ -1270,7 +1270,7 @@ void func_80388524(Actor *this) {
|
||||
|
||||
case 0x235://L80388F34
|
||||
{
|
||||
sp28 = func_80326EEC(0x236);
|
||||
sp28 = actorArray_findActorFromActorId(0x236);
|
||||
this->unk1C[0] += 3.6;
|
||||
if (this->unk1C[0] > 250.0f) {
|
||||
lair_func_80388278(this);
|
||||
@@ -1563,7 +1563,7 @@ void func_8038982C(Actor *this)
|
||||
this->initialized = TRUE;
|
||||
|
||||
if (!func_8031FF1C(BKPROG_9E_CRYPT_COFFIN_LID_OPEN))
|
||||
__spawnqueue_add_1((GenMethod_1)func_803897D4, reinterpret_cast(s32, this->marker));
|
||||
__spawnQueue_add_1((GenMethod_1)func_803897D4, reinterpret_cast(s32, this->marker));
|
||||
}
|
||||
}
|
||||
|
||||
|
@@ -774,7 +774,7 @@ void func_8038D1E4(void)
|
||||
case 3:
|
||||
{
|
||||
timedFunc_set_2(
|
||||
0.5f, (TFQM2)func_8038D16C,
|
||||
0.5f, (GenMethod_2)func_8038D16C,
|
||||
D_80394354[D_8037DCB8->unkC].unk2,
|
||||
D_80394354[D_8037DCB8->unkC].unk4
|
||||
);
|
||||
@@ -839,7 +839,7 @@ void func_8038D4BC(void)
|
||||
|
||||
// trigger warp after a delay
|
||||
timedFunc_set_3(0.25f,
|
||||
(TFQM3)func_802E4078,
|
||||
(GenMethod_3)func_802E4078,
|
||||
D_803945B8[D_8037DCB8->unkC].map,
|
||||
D_803945B8[D_8037DCB8->unkC].exit,
|
||||
1
|
||||
|
@@ -54,7 +54,7 @@ void func_80390890(ActorMarker *marker, ActorMarker *other_marker) {
|
||||
func_80328B8C(this, 5, 0.0f, 1);
|
||||
actor_playAnimationOnce(this);
|
||||
func_8030E878(SFX_C2_GRUBLIN_EGH, local->unkC_27*0.1 + 0.8, 32000, this->position, 1250.0f, 2500.0f);
|
||||
func_802C3F04((GenMethod_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
|
||||
__spawnQueue_add_4((GenMethod_4)func_802C4140, ACTOR_4C_STEAM, reinterpret_cast(s32, this->position[0]), reinterpret_cast(s32, this->position[1]), reinterpret_cast(s32, this->position[2]));
|
||||
actor_collisionOff(this);
|
||||
this->unk138_24 = TRUE;
|
||||
}
|
||||
|
@@ -78,7 +78,7 @@ void func_80390D3C(Actor *this, s32 val)
|
||||
this->unk1C[2] = this->position_z;
|
||||
}
|
||||
|
||||
__spawnqueue_add_1((GenMethod_1)func_80390C00, reinterpret_cast(s32, this->marker));
|
||||
__spawnQueue_add_1((GenMethod_1)func_80390C00, reinterpret_cast(s32, this->marker));
|
||||
|
||||
break;
|
||||
}
|
||||
@@ -88,7 +88,7 @@ void func_80390D3C(Actor *this, s32 val)
|
||||
this->unk1C[1] = this->position_y;
|
||||
this->unk1C[2] = this->position_z;
|
||||
|
||||
__spawnqueue_add_1((GenMethod_1)func_80390CB4, reinterpret_cast(s32, this->marker));
|
||||
__spawnQueue_add_1((GenMethod_1)func_80390CB4, reinterpret_cast(s32, this->marker));
|
||||
|
||||
break;
|
||||
}
|
||||
|
Reference in New Issue
Block a user