diff options
| author | Yanis42 <35189056+Yanis42@users.noreply.github.com> | 2024-05-02 23:54:12 +0200 |
|---|---|---|
| committer | Yanis42 <35189056+Yanis42@users.noreply.github.com> | 2024-05-02 23:54:12 +0200 |
| commit | 3099ac3fed789d8c7442db81e319cf6b59ecd6cf (patch) | |
| tree | 276de2f5c5c309b8aa77737ee99d58ca9034c8ce /src/14_Land/Actor/ActorRupee.cpp | |
| parent | 0e4544d40e3468ccfdbabb2c3c497fbb2a097287 (diff) | |
| parent | 5c08baf1c24e50891ea12e8dcd0038c935875631 (diff) | |
Merge remote-tracking branch 'upstream/main' into match_actor_rupee
Diffstat (limited to 'src/14_Land/Actor/ActorRupee.cpp')
| -rw-r--r-- | src/14_Land/Actor/ActorRupee.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/14_Land/Actor/ActorRupee.cpp b/src/14_Land/Actor/ActorRupee.cpp index a7eb3ab3..759673af 100644 --- a/src/14_Land/Actor/ActorRupee.cpp +++ b/src/14_Land/Actor/ActorRupee.cpp @@ -1,6 +1,6 @@ #include "Actor/ActorRupee.hpp" #include "Item/ItemManager.hpp" - +#include "Map/MapManager.hpp" // char* data_ov14_021589b4 = *data_ov14_02158994; @@ -33,7 +33,6 @@ extern "C" void* _ZTV10ActorRupee = _ZN10ActorRupeeD2Ev; extern u32 data_ov00_020e9370[]; extern u32 data_ov00_020eec9c[]; -extern void *data_027e0e60; extern PlayerLinkBase *data_027e0fc8; // gPlayerLink extern u32 **data_027e0fe0[]; @@ -326,7 +325,7 @@ void ActorRupee::Update(bool param1) { Move(); if (mUnk_111) { local_1c = mPos; - func_ov00_02083fb0(&local_20, data_027e0e60, &local_1c); + func_ov00_02083fb0(&local_20, gMapManager, &local_1c); if (((local_20 >> 5) & 3) == 2) { Kill(); } else { |