-
Notifications
You must be signed in to change notification settings - Fork 107
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #133 from Pistonight/playerinfo
PlayerInfo stuff that doesn't require PlayerBase
- Loading branch information
Showing
13 changed files
with
342 additions
and
74 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,15 +1,19 @@ | ||
| #pragma once | ||
|
|
||
| #include <prim/seadSafeString.h> | ||
| #include "KingSystem/ActorSystem/actActor.h" | ||
|
|
||
| namespace ksys::act { | ||
|
|
||
| // TODO | ||
| class PlayerBase { | ||
| class PlayerBase : public Actor { | ||
| public: | ||
| // FIXME: name for x and name+type for y | ||
| void switchEquipment(const sead::SafeString& slot, int frames, int x = -1, | ||
| const uintptr_t& y = {}); | ||
|
|
||
| // FIXME: name for x | ||
| void setExtraLife(s32 extra_life, f32 x); | ||
| }; | ||
|
|
||
| } // namespace ksys::act |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1 +1,134 @@ | ||
| #include "KingSystem/ActorSystem/actPlayerInfo.h" | ||
| #include "KingSystem/ActorSystem/Profiles/actPlayerBase.h" | ||
| #include "KingSystem/ActorSystem/actActorConstDataAccess.h" | ||
| #include "KingSystem/ActorSystem/actActorLinkConstDataAccess.h" | ||
| #include "KingSystem/ActorSystem/actBaseProc.h" | ||
| #include "KingSystem/ActorSystem/actBaseProcMgr.h" | ||
| #include "KingSystem/GameData/gdtCommonFlagsUtils.h" | ||
| #include "KingSystem/ksys.h" | ||
|
|
||
| namespace ksys::act { | ||
|
|
||
| SEAD_SINGLETON_DISPOSER_IMPL(PlayerInfo) | ||
|
|
||
| PlayerInfo::PlayerInfo() = default; | ||
| PlayerInfo::~PlayerInfo() = default; | ||
|
|
||
| bool PlayerInfo::init() { | ||
| return true; | ||
| } | ||
|
|
||
| void PlayerInfo::resetPlayer(PlayerBase* player) { | ||
| if (mPlayerActor == player) { | ||
| mPlayerActor = nullptr; | ||
| ksys::setPlayerLink(nullptr); | ||
| } | ||
| } | ||
|
|
||
| bool PlayerInfo::acquireHorse(BaseProc* horse) { | ||
| return mHorseLink.acquire(horse, false); | ||
| } | ||
|
|
||
| void PlayerInfo::setHorseLink(const BaseProcLink& horse_link) { | ||
| mHorseLink = horse_link; | ||
| } | ||
|
|
||
| PlayerBase* PlayerInfo::getPlayer() const { | ||
| if (!mPlayerActor) { | ||
| return nullptr; | ||
| } | ||
| BaseProcMgr::instance()->isAccessingProcSafe(mPlayerActor, nullptr); | ||
| return mPlayerActor; | ||
| } | ||
|
|
||
| PlayerBase* PlayerInfo::getPlayer_() const { | ||
| if (!mPlayerActor) { | ||
| return nullptr; | ||
| } | ||
| BaseProcMgr::instance()->isAccessingProcSafe(mPlayerActor, nullptr); | ||
| return mPlayerActor; | ||
| } | ||
|
|
||
| s32 PlayerInfo::getMaxLifeFromPlayerActor() const { | ||
| return mPlayerActor ? mPlayerActor->getMaxLife() : 0; | ||
| } | ||
|
|
||
| void PlayerInfo::setMaxHeartValue(s32 quarter_hearts) { | ||
| gdt::setFlag_MaxHartValue(quarter_hearts); | ||
| mMaxHeartValue = static_cast<f32>(quarter_hearts); | ||
| } | ||
|
|
||
| u32 PlayerInfo::getMaxHeartValue() const { | ||
| // Return type is unsigned, but the conversion is signed | ||
| return static_cast<s32>(mMaxHeartValue); | ||
| } | ||
|
|
||
| void PlayerInfo::updateMaxHeartValueFromGameData() { | ||
| mMaxHeartValue = static_cast<f32>(gdt::getFlag_MaxHartValue()); | ||
| } | ||
|
|
||
| void PlayerInfo::setLifeForPlayerActor(s32 life) { | ||
| if (mPlayerActor) { | ||
| *mPlayerActor->getLife() = life; | ||
| } | ||
| } | ||
|
|
||
| s32 PlayerInfo::getLifeFromPlayerActor() const { | ||
| if (!mPlayerActor) { | ||
| return 0; | ||
| } | ||
| auto* life = mPlayerActor->getLife(); | ||
| return life ? *life : 1; | ||
| } | ||
|
|
||
| void PlayerInfo::recoverLife() { | ||
| setLifeForPlayerActor(getMaxLifeFromPlayerActor()); | ||
| } | ||
|
|
||
| void PlayerInfo::setStaminaCurrentMax(f32 max_stamina) { | ||
| gdt::setFlag_StaminaCurrentMax(max_stamina); | ||
| mStaminaCurrentMax = max_stamina; | ||
| } | ||
|
|
||
| f32 PlayerInfo::getStaminaCurrentMax() const { | ||
| return mStaminaCurrentMax; | ||
| } | ||
|
|
||
| void PlayerInfo::updateStaminaCurrentMaxFromGameData() { | ||
| mStaminaCurrentMax = gdt::getFlag_StaminaCurrentMax(); | ||
| } | ||
|
|
||
| void PlayerInfo::setStaminaMax(f32 max_stamina) { | ||
| gdt::setFlag_StaminaMax(max_stamina); | ||
| mStaminaMax = max_stamina; | ||
| } | ||
|
|
||
| f32 PlayerInfo::getStaminaMax() const { | ||
| return mStaminaMax; | ||
| } | ||
|
|
||
| void PlayerInfo::updateStaminaMaxFromGameData() { | ||
| mStaminaMax = gdt::getFlag_StaminaMax(); | ||
| } | ||
|
|
||
| PlayerBase* PlayerInfo::getPlayerUnchecked() { | ||
| return mPlayerActor; | ||
| } | ||
|
|
||
| sead::Vector3f& PlayerInfo::getPlayerPos() { | ||
| ActorConstDataAccess accessor; | ||
|
|
||
| acquireActor(&mPlayerLink, &accessor); | ||
| accessor.debugLog(1, "getPlayerPos"); | ||
| return mPlayerPos; | ||
| } | ||
|
|
||
| sead::Vector3f& PlayerInfo::getPlayerPosForPostCalc() { | ||
| ActorConstDataAccess accessor; | ||
|
|
||
| acquireActor(&mPlayerLink, &accessor); | ||
| accessor.debugLog(0, "getPlayerPosForPostCalc"); | ||
| return mPlayerPosForPostCalc; | ||
| } | ||
|
|
||
| } // namespace ksys::act |
Oops, something went wrong.