mirror/tww
1
0
Fork 0
mirror of https://github.com/zeldaret/tww.git synced 2026-08-10 19:16:45 -04:00
Code Issues Packages Projects Releases Wiki Activity

d_magma minor work

Browse Source
This commit is contained in:
Jasper St. Pierre
2024-09-02 23:31:19 -07:00
parent 804e0aaf9e
commit 2f9974c47a
5 changed files with 49 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
include/d/d_magma.h
+13
View File
@@ -55,6 +55,14 @@ public:
dMagma_ball_c** create(cXyz&, cXyz&, s16, u8, int);
void remove();
dMagma_floor_c* getNext() { return mpNext; }
void setNext(dMagma_floor_c* v) { mpNext = v; }
dMagma_ball_c** getBall() { return mpBalls; }
s32 getBallNum() { return mBallNum; }
cXyz& getPos() { return mPos; }
f32 getScaleX() { return mScaleX; }
f32 getScaleZ() { return mScaleZ; }
/* 0x00 */ dMagma_ball_c** mpBalls;
/* 0x04 */ u8 mBallNum;
/* 0x05 */ u8 mPathNo;
@@ -71,6 +79,7 @@ public:
class dMagma_room_c {
public:
void newFloor(dMagma_floor_c*);
dMagma_floor_c* getFloor() { return mpFirst; }
void deleteFloor();
dMagma_room_c();
@@ -90,6 +99,10 @@ public:
virtual void draw();
virtual ~dMagma_packet_c();
static GXTexObj& getKuroTexObj() { return mKuroTexObj; }
static GXTexObj& getColTexObj() { return mColTexObj; }
static Mtx& getKuroMtx() { return mKuroMtx; }
static GXTexObj mKuroTexObj;
static Mtx mKuroMtx;
static GXTexObj mColTexObj;
include/d/d_map.h
+1 -1
View File
@@ -65,7 +65,7 @@ public:
dMap_RoomInfo_c();
~dMap_RoomInfo_c();
u32 getRoomDspFloorNo(u8, int);
void init(dMap_RoomInfo_c*, int);
dMap_RoomInfo_c* init(dMap_RoomInfo_c*, int);
void getRoomImage(int, u8, int, ResTIMG**, ResTIMG**, map_dt_c**, stage_map_info_class**, u8*);
void makeRoomDspFloorNoTbl(int);
u32 roomEntryRoom(int, u8, int, u8, dMap_RoomInfo_c*, s16, s16, f32);