mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-19 13:35:18 +00:00
Code Issues Projects Releases Wiki Activity

Format all src C files

Browse source
This commit is contained in:
Roman971 2020-03-22 22:19:43 +01:00
parent 251aea64ab
commit 8cfe7cce9f
652 changed files with 12488 additions and 19093 deletions
Download patch file Download diff file Expand all files Collapse all files

90
src/overlays/actors/ovl_Obj_Bombiwa/z_obj_bombiwa.c
View file

@ -2,11 +2,11 @@
* File: z_obj_bombiwa.c
* Overlay: ovl_Obj_Bombiwa
* Description: Round, brown, breakable boulder
*/
*/
#include "z_obj_bombiwa.h"
#define ROOM 0x00
#define ROOM 0x00
#define FLAGS 0x00000000
static void ObjBombiwa_Init(ObjBombiwa* this, GlobalContext* globalCtx);
@ -17,8 +17,7 @@ static void ObjBombiwa_Draw(ObjBombiwa* this, GlobalContext* globalCtx);
static void ObjBombiwa_InitCollision(ObjBombiwa* this, GlobalContext* globalCtx);
static void ObjBombiwa_Break(ObjBombiwa* this, GlobalContext* globalCtx);
const ActorInit Obj_Bombiwa_InitVars =
{
const ActorInit Obj_Bombiwa_InitVars = {
ACTOR_OBJ_BOMBIWA,
ACTORTYPE_PROP,
ROOM,
@ -31,77 +30,59 @@ const ActorInit Obj_Bombiwa_InitVars =
(ActorFunc)ObjBombiwa_Draw,
};
static ColliderCylinderInit colliderInit =
{
0x0C, 0x00, 0x0D, 0x39,
0x20, 0x01, 0x00, 0x00,
0x00, 0x00, 0x00, 0x00,
0x00000000, 0x00, 0x00,
0x00, 0x00, 0x4FC1FFFE,
0x00, 0x00, 0x00, 0x00,
0x00, 0x01, 0x01, 0x00,
0x0037, 0x0046, 0x0000,
0x0000, 0x0000, 0x0000,
static ColliderCylinderInit colliderInit = {
0x0C, 0x00, 0x0D, 0x39, 0x20, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00,
0x00, 0x00000000, 0x00, 0x00, 0x00, 0x00, 0x4FC1FFFE, 0x00, 0x00, 0x00, 0x00,
0x00, 0x01, 0x01, 0x00, 0x0037, 0x0046, 0x0000, 0x0000, 0x0000, 0x0000,
};
static u32 damageChart[] =
{
0x0000000C, 0x003CFF00,
static u32 damageChart[] = {
0x0000000C,
0x003CFF00,
};
static InitChainEntry initChain[] =
{
static InitChainEntry initChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 0x64, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F4, 0x7D0, ICHAIN_CONTINUE),
ICHAIN_F32(unk_F8, 0x15E, ICHAIN_CONTINUE),
ICHAIN_F32(unk_FC, 0x3E8, ICHAIN_STOP),
};
static s16 effectScales[] =
{
static s16 effectScales[] = {
17, 14, 10, 8, 7, 5, 3, 2,
};
extern Gfx* D_060009E0; //dlist
extern Gfx* D_060009E0; // dlist
static void ObjBombiwa_InitCollision(ObjBombiwa* this, GlobalContext* globalCtx)
{
static void ObjBombiwa_InitCollision(ObjBombiwa* this, GlobalContext* globalCtx) {
ObjBombiwa* thisLocal = this;
ActorCollider_AllocCylinder(globalCtx, &thisLocal->collider);
ActorCollider_InitCylinder(globalCtx, &thisLocal->collider, &thisLocal->actor, &colliderInit);
ActorCollider_Cylinder_Update(&thisLocal->actor, &thisLocal->collider);
}
static void ObjBombiwa_Init(ObjBombiwa* this, GlobalContext* globalCtx)
{
static void ObjBombiwa_Init(ObjBombiwa* this, GlobalContext* globalCtx) {
Actor_ProcessInitChain(&this->actor, initChain);
ObjBombiwa_InitCollision(this, globalCtx);
if ((Flags_GetSwitch(globalCtx, this->actor.params & 0x3F) != 0))
{
if ((Flags_GetSwitch(globalCtx, this->actor.params & 0x3F) != 0)) {
Actor_Kill(&this->actor);
}
else
{
} else {
func_80061ED4(&this->actor.sub_98.damageChart, NULL, damageChart);
if (this->actor.shape.rot.y == 0)
{
s16 rand = (s16) Math_Rand_ZeroFloat(65536.0f);
if (this->actor.shape.rot.y == 0) {
s16 rand = (s16)Math_Rand_ZeroFloat(65536.0f);
this->actor.posRot.rot.y = rand;
this->actor.shape.rot.y = rand;
}
this->actor.shape.unk_08 = -200.0f;
this->actor.posRot.pos.y = this->actor.initPosRot.pos.y + 20.0f;
}
}
static void ObjBombiwa_Destroy(ObjBombiwa* this, GlobalContext* globalCtx)
{
static void ObjBombiwa_Destroy(ObjBombiwa* this, GlobalContext* globalCtx) {
ActorCollider_FreeCylinder(globalCtx, &this->collider);
}
static void ObjBombiwa_Break(ObjBombiwa *this, GlobalContext *globalCtx)
{
static void ObjBombiwa_Break(ObjBombiwa* this, GlobalContext* globalCtx) {
Vec3f temp_s2;
Vec3f temp_s3;
Gfx** dlist;
@ -110,8 +91,7 @@ static void ObjBombiwa_Break(ObjBombiwa *this, GlobalContext *globalCtx)
s32 i;
dlist = &D_060009E0;
for (i = 0; i < ARRAY_COUNT(effectScales); i++)
{
for (i = 0; i < ARRAY_COUNT(effectScales); i++) {
temp_s2.x = ((Math_Rand_ZeroOne() - 0.5f) * 10.0f) + this->actor.initPosRot.pos.x;
temp_s2.y = ((Math_Rand_ZeroOne() * 5.0f) + this->actor.initPosRot.pos.y) + 8.0f;
temp_s2.z = ((Math_Rand_ZeroOne() - 0.5f) * 10.0f) + this->actor.initPosRot.pos.z;
@ -120,34 +100,29 @@ static void ObjBombiwa_Break(ObjBombiwa *this, GlobalContext *globalCtx)
temp_s3.z = (Math_Rand_ZeroOne() - 0.5f) * 15.0f;
scale = effectScales[i];
u0 = (scale >= 11) ? 37 : 33;
Effect_SpawnFragment(globalCtx, &temp_s2, &temp_s3, &temp_s2, -400, u0, 10, 2, 0, scale, 1, 0, 80, -1, OBJECT_BOMBIWA, dlist);
Effect_SpawnFragment(globalCtx, &temp_s2, &temp_s3, &temp_s2, -400, u0, 10, 2, 0, scale, 1, 0, 80, -1,
OBJECT_BOMBIWA, dlist);
}
func_80033480(globalCtx, &this->actor.posRot.pos, 60.0f, 8, 100, 160, 1);
}
static void ObjBombiwa_Update(ObjBombiwa* this, GlobalContext* globalCtx)
{
static void ObjBombiwa_Update(ObjBombiwa* this, GlobalContext* globalCtx) {
SubGlobalContext11E60* sub_11E60;
ColliderCylinderMain* collider;
if (func_80033684(globalCtx, &this->actor) != NULL ||
((this->collider.base.collideFlags & 2) != 0 &&
(this->collider.body.colliding->toucher.flags & 0x40000040) != 0))
{
if (func_80033684(globalCtx, &this->actor) != NULL ||
((this->collider.base.collideFlags & 2) != 0 &&
(this->collider.body.colliding->toucher.flags & 0x40000040) != 0)) {
ObjBombiwa_Break(this, globalCtx);
Flags_SetSwitch(globalCtx, this->actor.params & 0x3F);
Audio_PlaySoundAtPosition(globalCtx, &this->actor.posRot.pos, 80, NA_SE_EV_WALL_BROKEN);
if (((this->actor.params >> 0xF) & 1) != 0)
{
if (((this->actor.params >> 0xF) & 1) != 0) {
func_80078884(NA_SE_SY_CORRECT_CHIME);
}
Actor_Kill(&this->actor);
}
else
{
} else {
this->collider.base.collideFlags &= ~0x2;
if (this->actor.xzDistanceFromLink < 800.0f)
{
if (this->actor.xzDistanceFromLink < 800.0f) {
sub_11E60 = &globalCtx->sub_11E60;
collider = &this->collider;
Actor_CollisionCheck_SetAC(globalCtx, sub_11E60, collider);
@ -156,7 +131,6 @@ static void ObjBombiwa_Update(ObjBombiwa* this, GlobalContext* globalCtx)
}
}
static void ObjBombiwa_Draw(ObjBombiwa* this, GlobalContext* globalCtx)
{
static void ObjBombiwa_Draw(ObjBombiwa* this, GlobalContext* globalCtx) {
Draw_DListOpa(globalCtx, &D_060009E0);
}