mirror/oot
1
0
Fork 0
mirror of https://github.com/zeldaret/oot.git synced 2025-08-21 22:41:14 +00:00
Code Issues Projects Releases Wiki Activity

Reduce overlay dependencies on global.h (5) (#2466)

Browse source 
* remove global.h dependency from all actors

* fix compiler error

* fix another build issue

* fix bss
This commit is contained in:
mzxrules 2025-02-12 15:50:46 -05:00 • committed by GitHub
parent 1d2c912fbb
commit 494aecc9fc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
437 changed files with 2743 additions and 506 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/overlays/actors/ovl_En_Nwc/z_en_nwc.c
View file

@ -5,6 +5,14 @@
*/
#include "z_en_nwc.h"
#include "libc64/qrand.h"
#include "gfx.h"
#include "gfx_setupdl.h"
#include "sys_matrix.h"
#include "z_lib.h"
#include "z64play.h"
#include "assets/objects/object_nwc/object_nwc.h"
#define FLAGS (ACTOR_FLAG_UPDATE_CULLING_DISABLED | ACTOR_FLAG_DRAW_CULLING_DISABLED)

10
src/overlays/actors/ovl_En_Nwc/z_en_nwc.h
View file

@ -2,13 +2,13 @@
#define Z_EN_NWC_H
#include "ultra64.h"
#include "global.h"
#include "z64actor.h"
struct EnNwc;
struct EnNwcChick;
typedef void (*EnNwcUpdateFunc)(struct EnNwc*, PlayState*);
typedef void (*EnNwcChickFunc)(struct EnNwcChick*, struct EnNwc*, PlayState*);
typedef void (*EnNwcUpdateFunc)(struct EnNwc*, struct PlayState*);
typedef void (*EnNwcChickFunc)(struct EnNwcChick*, struct EnNwc*, struct PlayState*);
typedef struct EnNwcChick {
/* 0x00 */ s8 type;
@ -21,8 +21,8 @@ typedef struct EnNwcChick {
/* 0x2C */ f32 velY;
/* 0x30 */ Vec3s rot;
/* 0x36 */ u16 height;
/* 0x38 */ CollisionPoly* floorPoly;
/* 0x44 */ char unk_3C[0x20];
/* 0x38 */ struct CollisionPoly* floorPoly;
/* 0x3C */ char unk_3C[0x20];
} EnNwcChick; // size = 0x5C
typedef struct EnNwc {