summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/SSystem/SComponent/c_m2d_g_box.h2
-rw-r--r--include/d/actor/d_a_sea.h10
-rw-r--r--include/dolphin/gx/GXBump.h1
3 files changed, 8 insertions, 5 deletions
diff --git a/include/SSystem/SComponent/c_m2d_g_box.h b/include/SSystem/SComponent/c_m2d_g_box.h
index 1a0bbda9..c58917a0 100644
--- a/include/SSystem/SComponent/c_m2d_g_box.h
+++ b/include/SSystem/SComponent/c_m2d_g_box.h
@@ -7,6 +7,8 @@ class cM2dGBox {
public:
cXy mP0, mP1;
+ virtual ~cM2dGBox() {}
+
void Set(cXy& pA, cXy& pB);
f32 GetLen(const cXy& pXy) const;
};
diff --git a/include/d/actor/d_a_sea.h b/include/d/actor/d_a_sea.h
index c77769a7..96c4d882 100644
--- a/include/d/actor/d_a_sea.h
+++ b/include/d/actor/d_a_sea.h
@@ -13,8 +13,8 @@ public:
public:
int Pos2Index(f32, f32*);
- u32 GetHeight(f32, f32);
- u32 GetHeight(int, int);
+ int GetHeight(f32, f32);
+ int GetHeight(int, int);
void GetArea(int, int, f32*, f32*, f32*, f32*);
void SetInf();
virtual ~daSea_WaterHeightInfo_Mng() {}
@@ -78,7 +78,7 @@ public:
GXTexObj* getYuraTexObj() { return &mTexYura; }
void ChkNowUse() {}
void GetSrcDataHeight(f32, f32) {}
- void ChkCullStop() {}
+ bool ChkCullStop() { return mCullStopFlag == 1; }
void end() {}
void getPos() {}
void GetCenterP() {}
@@ -101,7 +101,7 @@ public:
/* 0x120 */ f32 mDrawMaxZ;
/* 0x124 */ f32* mpHeightTable;
/* 0x128 */ cXyz mCurPos;
- /* 0x134 */ cXyz* mpDrawVtx;
+ /* 0x134 */ cXyz* m_draw_vtx;
/* 0x138 */ u8 mInitFlag;
/* 0x139 */ u8 mCullStopFlag;
/* 0x13A */ u8 m13A;
@@ -120,7 +120,7 @@ class sea_class : public fopAc_ac_c {
};
void daSea_Init();
-void daSea_ChkAreaBeforePos(f32, f32);
+bool daSea_ChkAreaBeforePos(f32, f32);
bool daSea_ChkArea(f32, f32);
f32 daSea_calcWave(f32, f32);
void daSea_GetPoly(void*, void (*)(void*, cXyz&, cXyz&, cXyz&), const cXyz&, const cXyz&);
diff --git a/include/dolphin/gx/GXBump.h b/include/dolphin/gx/GXBump.h
index ddb8d677..07f933f7 100644
--- a/include/dolphin/gx/GXBump.h
+++ b/include/dolphin/gx/GXBump.h
@@ -15,6 +15,7 @@ void GXSetIndTexCoordScale(GXIndTexStageID texStage, GXIndTexScale scaleS, GXInd
void GXSetIndTexOrder(GXIndTexStageID stage, GXTexCoordID coord, GXTexMapID map);
void GXSetNumIndStages(u8 num);
void GXSetTevDirect(GXTevStageID stage);
+void GXSetTevIndWarp(GXTevStageID tevStage, GXIndTexStageID texStage, GXBool, GXBool, GXIndTexMtxID mtxID); // Might be incorrect
#ifdef __cplusplus
};