mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-06 22:30:15 +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

44
src/overlays/actors/ovl_Bg_Umajump/z_bg_umajump.c
View file

@ -2,20 +2,19 @@
* File: z_bg_umajump.c
* Overlay: ovl_Bg_Umajump
* Description: Hoppable horse fence
*/
*/
#include <ultra64.h>
#include <global.h>
#include <z64.h>
typedef struct
{
typedef struct {
/* 0x0000 */ Actor actor;
/* 0x014C */ u32 dynaPolyId;
/* 0x0150 */ char unk_150[0x14];
/* 0x014C */ u32 dynaPolyId;
/* 0x0150 */ char unk_150[0x14];
} ActorBgUmajump; // size = 0x0164
#define ROOM 0x00
#define ROOM 0x00
#define FLAGS 0x00000000
static void Init(ActorBgUmajump* this, GlobalContext* globalCtx);
@ -23,8 +22,7 @@ static void Destroy(ActorBgUmajump* this, GlobalContext* globalCtx);
static void Update(ActorBgUmajump* this, GlobalContext* globalCtx);
static void Draw(ActorBgUmajump* this, GlobalContext* globalCtx);
const ActorInit Bg_Umajump_InitVars =
{
const ActorInit Bg_Umajump_InitVars = {
ACTOR_BG_UMAJUMP,
ACTORTYPE_PROP,
ROOM,
@ -34,19 +32,17 @@ const ActorInit Bg_Umajump_InitVars =
(ActorFunc)Init,
(ActorFunc)Destroy,
(ActorFunc)Update,
(ActorFunc)Draw
(ActorFunc)Draw,
};
extern D_06001438; //segmented address: 0x06001438
extern D_06001220; //segmented address: 0x06001220
extern D_06001438; // segmented address: 0x06001438
extern D_06001220; // segmented address: 0x06001220
static InitChainEntry initChain[] =
{
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP)
static InitChainEntry initChain[] = {
ICHAIN_VEC3F_DIV1000(scale, 100, ICHAIN_STOP),
};
static void Init(ActorBgUmajump* this, GlobalContext* globalCtx)
{
static void Init(ActorBgUmajump* this, GlobalContext* globalCtx) {
s32 pad[2];
u32 sp24 = 0;
@ -55,10 +51,8 @@ static void Init(ActorBgUmajump* this, GlobalContext* globalCtx)
DynaPolyInfo_Alloc(&D_06001438, &sp24);
this->dynaPolyId = DynaPolyInfo_RegisterActor(globalCtx, &globalCtx->colCtx.dyna, &this->actor, sp24);
if (this->actor.params == 1)
{
if ((!Flags_GetEventChkInf(0x18)) && (DREG(1) == 0))
{
if (this->actor.params == 1) {
if ((!Flags_GetEventChkInf(0x18)) && (DREG(1) == 0)) {
Actor_Kill(&this->actor);
return;
}
@ -66,17 +60,13 @@ static void Init(ActorBgUmajump* this, GlobalContext* globalCtx)
}
}
static void Destroy(ActorBgUmajump* this, GlobalContext* globalCtx)
{
static void Destroy(ActorBgUmajump* this, GlobalContext* globalCtx) {
DynaPolyInfo_Free(globalCtx, &globalCtx->colCtx.dyna, this->dynaPolyId);
}
static void Update(ActorBgUmajump* this, GlobalContext* globalCtx)
{
static void Update(ActorBgUmajump* this, GlobalContext* globalCtx) {
}
static void Draw(ActorBgUmajump* this, GlobalContext* globalCtx)
{
static void Draw(ActorBgUmajump* this, GlobalContext* globalCtx) {
Draw_DListOpa(globalCtx, &D_06001220);
}