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

62
src/overlays/actors/ovl_Obj_Roomtimer/z_obj_roomtimer.c
View file

@ -2,20 +2,19 @@
* File: z_obj_roomtimer.c
* Overlay: ovl_Obj_Roomtimer
* Description:
*/
*/
#include <ultra64.h>
#include <global.h>
#include <z64.h>
typedef struct
{
/* 0x0000 */ Actor actor;
typedef struct {
/* 0x0000 */ Actor actor;
/* 0x014C */ ActorFunc updateFunc;
/* 0x0150 */ u32 switchFlag;
/* 0x0150 */ u32 switchFlag;
} ActorRoomTimer; // size = 0x0154
#define ROOM 0x00
#define ROOM 0x00
#define FLAGS 0x00000010
static void Init(ActorRoomTimer* this, GlobalContext* globalCtx);
@ -24,8 +23,7 @@ static void Update(ActorRoomTimer* this, GlobalContext* globalCtx);
static void func_80B9D054(ActorRoomTimer* this, GlobalContext* globalCtx);
static void func_80B9D0B0(ActorRoomTimer* this, GlobalContext* globalCtx);
const ActorInit Obj_Roomtimer_InitVars =
{
const ActorInit Obj_Roomtimer_InitVars = {
ACTOR_OBJ_ROOMTIMER,
ACTORTYPE_ENEMY,
ROOM,
@ -38,61 +36,54 @@ const ActorInit Obj_Roomtimer_InitVars =
(ActorFunc)NULL,
};
static void Init(ActorRoomTimer* this, GlobalContext* globalCtx)
{
static void Init(ActorRoomTimer* this, GlobalContext* globalCtx) {
s16 params = this->actor.params;
this->switchFlag = (params >> 10) & 0x3F;
this->actor.params = params & 0x3FF;
params = this->actor.params;
if (params != 0x3FF)
{
if (params > 600)
if (params != 0x3FF) {
if (params > 600) {
this->actor.params = 600;
else
} else {
this->actor.params = params;
}
}
this->updateFunc = (ActorFunc)func_80B9D054;
}
static void Destroy(ActorRoomTimer* this, GlobalContext* globalCtx)
{
if (this->actor.params != 0x3FF)
{
if (gSaveContext.timer_1_value > 0)
static void Destroy(ActorRoomTimer* this, GlobalContext* globalCtx) {
if (this->actor.params != 0x3FF) {
if (gSaveContext.timer_1_value > 0) {
gSaveContext.timer_1_state = 10;
}
}
}
static void func_80B9D054(ActorRoomTimer* this, GlobalContext* globalCtx)
{
if (this->actor.params != 0x3FF)
static void func_80B9D054(ActorRoomTimer* this, GlobalContext* globalCtx) {
if (this->actor.params != 0x3FF) {
func_80088B34(this->actor.params);
}
Actor_ChangeType(globalCtx, &globalCtx->actorCtx, &this->actor, ACTORTYPE_PROP);
this->updateFunc = (ActorFunc)func_80B9D0B0;
}
static void func_80B9D0B0(ActorRoomTimer* this, GlobalContext* globalCtx)
{
if (Flags_GetTempClear(globalCtx, this->actor.room))
{
if (this->actor.params != 0x3FF)
static void func_80B9D0B0(ActorRoomTimer* this, GlobalContext* globalCtx) {
if (Flags_GetTempClear(globalCtx, this->actor.room)) {
if (this->actor.params != 0x3FF) {
gSaveContext.timer_1_state = 10;
}
Flags_SetClear(globalCtx, this->actor.room);
Flags_SetSwitch(globalCtx, this->switchFlag);
func_80078884(NA_SE_SY_CORRECT_CHIME);
Actor_Kill(&this->actor);
}
else
{
if (this->actor.params != 0x3FF)
{
if (gSaveContext.timer_1_value == 0)
{
} else {
if (this->actor.params != 0x3FF) {
if (gSaveContext.timer_1_value == 0) {
Audio_PlaySoundGeneral(NA_SE_OC_ABYSS, &D_801333D4, 4, &D_801333E0, &D_801333E0, &D_801333E8);
func_800C0B60(globalCtx); // Void Out
Actor_Kill(&this->actor);
@ -101,7 +92,6 @@ static void func_80B9D0B0(ActorRoomTimer* this, GlobalContext* globalCtx)
}
}
static void Update(ActorRoomTimer* this, GlobalContext* globalCtx)
{
static void Update(ActorRoomTimer* this, GlobalContext* globalCtx) {
this->updateFunc(this, globalCtx);
}