diff options
| author | Brian Savage <savage13@gmail.com> | 2026-11-11 15:11:56 -0500 |
|---|---|---|
| committer | Brian Savage <savage13@gmail.com> | 2026-11-11 15:11:56 -0500 |
| commit | 0849f620f7c0079e1237487fba289f5a8315c63f (patch) | |
| tree | 27cfbb3749008edb5d0f7061ebba639a3dfe867f /src/KingSystem/Resource | |
| parent | 6902c15350e49acbb8646ec1038c2f0eefbaea53 (diff) | |
Add getRoutePoint related functions
Diffstat (limited to 'src/KingSystem/Resource')
3 files changed, 144 insertions, 0 deletions
diff --git a/src/KingSystem/Resource/CMakeLists.txt b/src/KingSystem/Resource/CMakeLists.txt index 825fe47a..c0220374 100644 --- a/src/KingSystem/Resource/CMakeLists.txt +++ b/src/KingSystem/Resource/CMakeLists.txt @@ -73,6 +73,7 @@ target_sources(uking PRIVATE GeneralParamList/resGParamListObjectSwarm.h GeneralParamList/resGParamListObjectSystem.h GeneralParamList/resGParamListObjectTraveler.cpp + GeneralParamList/resGParamListObjectTravelerFriends.cpp GeneralParamList/resGParamListObjectTraveler.h GeneralParamList/resGParamListObjectWeaponCommon.h GeneralParamList/resGParamListObjectWeaponOption.h diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.h b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.h index 5af115cf..73fcd5fd 100644 --- a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.h +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.h @@ -4,6 +4,40 @@ #include "KingSystem/Resource/GeneralParamList/resGParamListObject.h" #include "KingSystem/Utils/Types.h" +#define STR5_HELP(A, B, C, D, E) A##B##C##D##E +#define STR5(a, b, c, d, e) STR5_HELP(a, b, c, d, e) + +#define ROUTE_POINT(PT) \ + PT(0, 1) \ + PT(1, 2) \ + PT(2, 3) \ + PT(3, 4) \ + PT(4, 5) \ + PT(5, 6) \ + PT(6, 7) \ + PT(7, 8) \ + PT(8, 9) \ + PT(9, 10) \ + PT(10, 11) \ + PT(11, 12) \ + PT(12, 13) \ + PT(13, 14) \ + PT(14, 15) \ + PT(15, 16) \ + PT(16, 17) \ + PT(17, 18) \ + PT(18, 19) \ + PT(19, 20) \ + PT(20, 21) \ + PT(21, 22) \ + PT(22, 23) \ + PT(23, 24) \ + PT(24, 25) \ + PT(25, 26) \ + PT(26, 27) \ + PT(27, 28) \ + PT(28, 29) + namespace ksys::res { class GParamListObjectTraveler : public GParamListObject { @@ -36,6 +70,30 @@ public: GParamListObjectTraveler(); const char* getName() const override { return "Traveler"; } +#define ROUTE_POINT_FUNCTION_DECL(FROM, TO) \ + friend const float& STR5(getRoutePoint, FROM, to, TO, \ + WaitFrame(const GParamListObjectTraveler& t)); \ + friend const float& STR5(getRoutePoint, TO, to, FROM, \ + WaitFrame(const GParamListObjectTraveler& t)); \ + friend const sead::SafeString& STR5(getRoutePoint, FROM, to, TO, \ + WaitAS(const GParamListObjectTraveler& t)); \ + friend const sead::SafeString& STR5(getRoutePoint, TO, to, FROM, \ + WaitAS(const GParamListObjectTraveler& t)); \ + friend const sead::SafeString& STR5(getRoutePoint, FROM, to, TO, \ + MoveAS(const GParamListObjectTraveler& t)); \ + friend const sead::SafeString& STR5(getRoutePoint, TO, to, FROM, \ + MoveAS(const GParamListObjectTraveler& t)); \ + friend const sead::SafeString& STR5(getRoutePoint, FROM, to, TO, \ + EntryPoint(const GParamListObjectTraveler& t)); \ + friend const sead::SafeString& STR5(getRoutePoint, TO, to, FROM, \ + EntryPoint(const GParamListObjectTraveler& t)); \ + friend const sead::SafeString& STR5(getRoutePoint, FROM, to, TO, \ + Schedule(const GParamListObjectTraveler& t)); \ + friend const sead::SafeString& STR5(getRoutePoint, TO, to, FROM, \ + Schedule(const GParamListObjectTraveler& t)); + ROUTE_POINT(ROUTE_POINT_FUNCTION_DECL) +#undef ROUTE_POINT_FUNCTION_DECL + agl::utl::Parameter<sead::SafeString> mAppearGameDataName; agl::utl::Parameter<sead::SafeString> mDeleteGameDataName; agl::utl::Parameter<sead::SafeString> mRouteType; diff --git a/src/KingSystem/Resource/GeneralParamList/resGParamListObjectTravelerFriends.cpp b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectTravelerFriends.cpp new file mode 100644 index 00000000..20895712 --- /dev/null +++ b/src/KingSystem/Resource/GeneralParamList/resGParamListObjectTravelerFriends.cpp @@ -0,0 +1,85 @@ +#include "KingSystem/Resource/GeneralParamList/resGParamListObjectTraveler.h" +#include "KingSystem/Utils/FixedString.h" + +// FIXME: Figure out where these go based on link order + +namespace ksys::res { + +#define ROUTE_POINT_FUNCTION(FROM, TO) \ + const float& STR5(getRoutePoint, FROM, to, TO, WaitFrame(const GParamListObjectTraveler& t)) { \ + return *t.mRoutePoints[FROM].mForward.mWaitFrame; \ + } +ROUTE_POINT(ROUTE_POINT_FUNCTION) +#undef ROUTE_POINT_FUNCTION + +#define ROUTE_POINT_FUNCTION(FROM, TO) \ + const float& STR5(getRoutePoint, TO, to, FROM, WaitFrame(const GParamListObjectTraveler& t)) { \ + return *t.mRoutePoints[FROM].mBackward.mWaitFrame; \ + } +ROUTE_POINT(ROUTE_POINT_FUNCTION) +#undef ROUTE_POINT_FUNCTION + +#define ROUTE_POINT_FUNCTION(FROM, TO) \ + const sead::SafeString& STR5(getRoutePoint, FROM, to, TO, \ + WaitAS(const GParamListObjectTraveler& t)) { \ + return *t.mRoutePoints[FROM].mForward.mWaitAS; \ + } +ROUTE_POINT(ROUTE_POINT_FUNCTION) +#undef ROUTE_POINT_FUNCTION + +#define ROUTE_POINT_FUNCTION(FROM, TO) \ + const sead::SafeString& STR5(getRoutePoint, TO, to, FROM, \ + WaitAS(const GParamListObjectTraveler& t)) { \ + return *t.mRoutePoints[FROM].mBackward.mWaitAS; \ + } +ROUTE_POINT(ROUTE_POINT_FUNCTION) +#undef ROUTE_POINT_FUNCTION + +#define ROUTE_POINT_FUNCTION(FROM, TO) \ + const sead::SafeString& STR5(getRoutePoint, FROM, to, TO, \ + MoveAS(const GParamListObjectTraveler& t)) { \ + return *t.mRoutePoints[FROM].mForward.mMoveAS; \ + } +ROUTE_POINT(ROUTE_POINT_FUNCTION) +#undef ROUTE_POINT_FUNCTION + +#define ROUTE_POINT_FUNCTION(FROM, TO) \ + const sead::SafeString& STR5(getRoutePoint, TO, to, FROM, \ + MoveAS(const GParamListObjectTraveler& t)) { \ + return *t.mRoutePoints[FROM].mBackward.mMoveAS; \ + } +ROUTE_POINT(ROUTE_POINT_FUNCTION) +#undef ROUTE_POINT_FUNCTION + +#define ROUTE_POINT_FUNCTION(FROM, TO) \ + const sead::SafeString& STR5(getRoutePoint, FROM, to, TO, \ + EntryPoint(const GParamListObjectTraveler& t)) { \ + return *t.mRoutePoints[FROM].mForward.mEntryPoint; \ + } +ROUTE_POINT(ROUTE_POINT_FUNCTION) +#undef ROUTE_POINT_FUNCTION + +#define ROUTE_POINT_FUNCTION(FROM, TO) \ + const sead::SafeString& STR5(getRoutePoint, TO, to, FROM, \ + EntryPoint(const GParamListObjectTraveler& t)) { \ + return *t.mRoutePoints[FROM].mBackward.mEntryPoint; \ + } +ROUTE_POINT(ROUTE_POINT_FUNCTION) +#undef ROUTE_POINT_FUNCTION + +#define ROUTE_POINT_FUNCTION(FROM, TO) \ + const sead::SafeString& STR5(getRoutePoint, FROM, to, TO, \ + Schedule(const GParamListObjectTraveler& t)) { \ + return *t.mRoutePoints[FROM].mForward.mSchedule; \ + } +ROUTE_POINT(ROUTE_POINT_FUNCTION) +#undef ROUTE_POINT_FUNCTION + +#define ROUTE_POINT_FUNCTION(FROM, TO) \ + const sead::SafeString& STR5(getRoutePoint, TO, to, FROM, \ + Schedule(const GParamListObjectTraveler& t)) { \ + return *t.mRoutePoints[FROM].mBackward.mSchedule; \ + } +ROUTE_POINT(ROUTE_POINT_FUNCTION) +#undef ROUTE_POINT_FUNCTION +} // namespace ksys::res |
