diff options
| author | Aetias <144526980+AetiasHax@users.noreply.github.com> | 2025-07-13 15:09:17 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-07-13 15:09:17 +0200 |
| commit | 91e4cafc1906577aa792de2f072259e953ab60bf (patch) | |
| tree | 10b611479e8bb69021525cd77be53c79d2e8e775 /src/00_Core/Item/ItemManager.cpp | |
| parent | e3ba2b386d1ef7530d8be93f1c5a0550c30dac79 (diff) | |
| parent | ac0720a8ce43fde10c2f1c2901711a576d799dd1 (diff) | |
Merge pull request #114 from Yanis002/data_027e0618_cleanup
Name and replace `data_027e0618` by `gGame`
Diffstat (limited to 'src/00_Core/Item/ItemManager.cpp')
| -rw-r--r-- | src/00_Core/Item/ItemManager.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/00_Core/Item/ItemManager.cpp b/src/00_Core/Item/ItemManager.cpp index 3c77b0ab..e95326ab 100644 --- a/src/00_Core/Item/ItemManager.cpp +++ b/src/00_Core/Item/ItemManager.cpp @@ -2,6 +2,7 @@ #include "DTCM/UnkStruct_027e0d38.hpp"
#include "DTCM/UnkStruct_027e0f78.hpp"
#include "DTCM/UnkStruct_027e103c.hpp"
+#include "Game/Game.hpp"
#include "Item/ItemModelLoader.hpp"
#include "Map/MapManager.hpp"
#include "Player/PlayerLinkBase.hpp"
@@ -188,9 +189,8 @@ ARM void ItemManager::Shield_vfunc_38(unk32 param1) { (*mEquipItems)[ItemFlag_WoodenShield]->vfunc_38(param1);
}
-extern unk32 data_027e0618;
ARM void ItemManager::EquipItem_vfunc_38(unk32 param1) {
- if (data_027e0618 != 6) {
+ if (gGame.mModeId != GameModeId_Battle) {
this->Sword_vfunc_38(param1);
this->Shield_vfunc_38(param1);
}
|