diff options
| author | robojumper <robojumper@gmail.com> | 2026-09-13 15:14:22 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2026-09-13 15:14:22 +0200 |
| commit | 83a06ced84253a3136210f4d43f1e50f1f1303b2 (patch) | |
| tree | 486b09ac0bb9da838dcb3b6cbbb1b1118118d00f /include/d/a | |
| parent | 9481f3ab62d690bd6534cb0adf7e02db5579b333 (diff) | |
| parent | ae87d5a5b1f99fa73b3541f8d01dbdc51a99eb10 (diff) | |
Salvage mgr 99%
Diffstat (limited to 'include/d/a')
| -rw-r--r-- | include/d/a/d_a_salbage_obj.h | 8 | ||||
| -rw-r--r-- | include/d/a/obj/d_a_obj_base.h | 4 |
2 files changed, 11 insertions, 1 deletions
diff --git a/include/d/a/d_a_salbage_obj.h b/include/d/a/d_a_salbage_obj.h index 742224bd..70b1d082 100644 --- a/include/d/a/d_a_salbage_obj.h +++ b/include/d/a/d_a_salbage_obj.h @@ -17,11 +17,17 @@ class dAcSalbageObj_c; enum SalvageObj_e { + SALVAGE_OBJ_NONE = -1, + SALVAGE_OBJ_PROPERA = 0, SALVAGE_OBJ_ROULETTE = 1, SALVAGE_OBJ_DIVINER_CRYSTAL = 2, + SALVAGE_OBJ_SALVAGE_MORRY = 3, + SALVAGE_OBJ_MOLE_ELDER = 4, SALVAGE_OBJ_WATER_JAR = 5, SALVAGE_OBJ_POT = 6, + + SALVAGE_OBJ_MAX = 7, }; class dSalvageIfObj_c : public dSalvageIf_c { @@ -176,7 +182,7 @@ protected: /* 0x908 */ mMtx_c mWorldSRMtx; /* 0x938 */ f32 field_0x938; /* 0x93C */ DowsingTarget mDowsingTarget; - /* 0x95C */ mVec3_c field_0x95C; + /* 0x95C */ mVec3_c mDowsingOffset; /* 0x968 */ bool mIsDowsingRegistered; /* 0x96C */ const sStateID_c *mpNextStateId; }; diff --git a/include/d/a/obj/d_a_obj_base.h b/include/d/a/obj/d_a_obj_base.h index fab81e6d..ccd41832 100644 --- a/include/d/a/obj/d_a_obj_base.h +++ b/include/d/a/obj/d_a_obj_base.h @@ -167,6 +167,10 @@ public: mLinkage.field_0xA0 = pCol; } + dSalvageIf_c *getSalvageIf() const { + return mpSalvageIf; + } + // could be their own thing? static void *getOarcFile(const char *oarcName, const char *fileName); static void *getOarcSubEntry(const char *oarcName, const char *fileName); |