From 0c2cfe05641e5b1938844139939655f84a47e970 Mon Sep 17 00:00:00 2001 From: boykopovar Date: Sun, 13 Sep 2026 10:35:37 +0300 Subject: [PATCH] feat(NpTrophy2): add user data constants --- core/libs/prx/libSceNpTrophy2/CMakeLists.txt | 1 - .../{src => include}/NpTrophy2.hpp | 3 +- .../include/NpTrophy2Constants.hpp | 42 +++++++++++++++++++ .../{src => include}/NpTrophy2Types.hpp | 0 core/libs/prx/libSceNpTrophy2/src/Context.cpp | 3 +- .../libs/prx/libSceNpTrophy2/src/GameInfo.cpp | 3 +- .../prx/libSceNpTrophy2/src/GroupInfo.cpp | 3 +- core/libs/prx/libSceNpTrophy2/src/Handle.cpp | 3 +- .../prx/libSceNpTrophy2/src/TrophyInfo.cpp | 3 +- 9 files changed, 49 insertions(+), 12 deletions(-) rename core/libs/prx/libSceNpTrophy2/{src => include}/NpTrophy2.hpp (59%) create mode 100644 core/libs/prx/libSceNpTrophy2/include/NpTrophy2Constants.hpp rename core/libs/prx/libSceNpTrophy2/{src => include}/NpTrophy2Types.hpp (100%) diff --git a/core/libs/prx/libSceNpTrophy2/CMakeLists.txt b/core/libs/prx/libSceNpTrophy2/CMakeLists.txt index bd62246c4..97d668921 100644 --- a/core/libs/prx/libSceNpTrophy2/CMakeLists.txt +++ b/core/libs/prx/libSceNpTrophy2/CMakeLists.txt @@ -8,6 +8,5 @@ add_library(libSceNpTrophy2 SHARED EXCLUDE_FROM_ALL target_include_directories(libSceNpTrophy2 PRIVATE ${LIBS_INCLUDE_DIR} - ${CMAKE_CURRENT_SOURCE_DIR}/src ) target_link_libraries(libSceNpTrophy2 PRIVATE libc) diff --git a/core/libs/prx/libSceNpTrophy2/src/NpTrophy2.hpp b/core/libs/prx/libSceNpTrophy2/include/NpTrophy2.hpp similarity index 59% rename from core/libs/prx/libSceNpTrophy2/src/NpTrophy2.hpp rename to core/libs/prx/libSceNpTrophy2/include/NpTrophy2.hpp index 2980e3e1d..883ef2920 100644 --- a/core/libs/prx/libSceNpTrophy2/src/NpTrophy2.hpp +++ b/core/libs/prx/libSceNpTrophy2/include/NpTrophy2.hpp @@ -4,7 +4,8 @@ #include #include -#include "NpTrophy2Types.hpp" +#include "prx/libSceNpTrophy2/include/NpTrophy2Constants.hpp" +#include "prx/libSceNpTrophy2/include/NpTrophy2Types.hpp" #include "SceTypes.hpp" #endif diff --git a/core/libs/prx/libSceNpTrophy2/include/NpTrophy2Constants.hpp b/core/libs/prx/libSceNpTrophy2/include/NpTrophy2Constants.hpp new file mode 100644 index 000000000..8102f3785 --- /dev/null +++ b/core/libs/prx/libSceNpTrophy2/include/NpTrophy2Constants.hpp @@ -0,0 +1,42 @@ +#ifndef CORE_LIBS_PRX_LIBSCENPTROPHY2_NPTROPHY2CONSTANTS_HPP +#define CORE_LIBS_PRX_LIBSCENPTROPHY2_NPTROPHY2CONSTANTS_HPP + +#include + +static constexpr int SCE_NP_TROPHY2_OK = 0; +static constexpr int SCE_NP_TROPHY2_ERROR_ICON_FILE_NOT_FOUND = -2141898479; + +static constexpr int NP_TROPHY2_CONTEXT_DEFAULT = 1; +static constexpr int NP_TROPHY2_HANDLE_DEFAULT = 1; + +static constexpr std::int32_t NP_TROPHY2_GROUP_ID_BASE = 0; +static constexpr std::int32_t NP_TROPHY2_TROPHY_ID_DEFAULT = 0; + +static constexpr std::uint32_t NP_TROPHY2_NUM_GROUPS = 1; +static constexpr std::uint32_t NP_TROPHY2_NUM_TROPHIES = 1; +static constexpr std::uint32_t NP_TROPHY2_NUM_PLATINUM = 0; +static constexpr std::uint32_t NP_TROPHY2_NUM_GOLD = 0; +static constexpr std::uint32_t NP_TROPHY2_NUM_SILVER = 0; +static constexpr std::uint32_t NP_TROPHY2_NUM_BRONZE = 1; + +static constexpr std::uint32_t NP_TROPHY2_UNLOCKED_TROPHIES = 0; +static constexpr std::uint32_t NP_TROPHY2_UNLOCKED_PLATINUM = 0; +static constexpr std::uint32_t NP_TROPHY2_UNLOCKED_GOLD = 0; +static constexpr std::uint32_t NP_TROPHY2_UNLOCKED_SILVER = 0; +static constexpr std::uint32_t NP_TROPHY2_UNLOCKED_BRONZE = 0; +static constexpr std::uint32_t NP_TROPHY2_PROGRESS_PERCENTAGE = 0; + +static constexpr std::int32_t NP_TROPHY2_TROPHY_GRADE_BRONZE = 4; + +static constexpr std::int32_t NP_TROPHY2_PROGRESS_TYPE_NONE = 0; +static constexpr std::uint32_t NP_TROPHY2_PROGRESS_VALUE_NONE = 0; + +static constexpr std::size_t NP_TROPHY2_ICON_SIZE_NONE = 0; + +static constexpr const char NP_TROPHY2_GAME_TITLE[] = "Game"; +static constexpr const char NP_TROPHY2_GROUP_TITLE[] = "Base Game"; +static constexpr const char NP_TROPHY2_TROPHY_NAME[] = "Trophy"; +static constexpr const char NP_TROPHY2_TROPHY_DESCRIPTION[] = "Trophy"; +static constexpr const char NP_TROPHY2_TROPHY_REWARD[] = ""; + +#endif diff --git a/core/libs/prx/libSceNpTrophy2/src/NpTrophy2Types.hpp b/core/libs/prx/libSceNpTrophy2/include/NpTrophy2Types.hpp similarity index 100% rename from core/libs/prx/libSceNpTrophy2/src/NpTrophy2Types.hpp rename to core/libs/prx/libSceNpTrophy2/include/NpTrophy2Types.hpp diff --git a/core/libs/prx/libSceNpTrophy2/src/Context.cpp b/core/libs/prx/libSceNpTrophy2/src/Context.cpp index 2e7ac82c7..b2c31fbea 100644 --- a/core/libs/prx/libSceNpTrophy2/src/Context.cpp +++ b/core/libs/prx/libSceNpTrophy2/src/Context.cpp @@ -1,7 +1,6 @@ #include -#include "NpTrophy2.hpp" -#include "SceTypes.hpp" +#include "prx/libSceNpTrophy2/include/NpTrophy2.hpp" #include "prx/libc/include/General.hpp" extern "C" { diff --git a/core/libs/prx/libSceNpTrophy2/src/GameInfo.cpp b/core/libs/prx/libSceNpTrophy2/src/GameInfo.cpp index 6ac4bb6db..25cbe3976 100644 --- a/core/libs/prx/libSceNpTrophy2/src/GameInfo.cpp +++ b/core/libs/prx/libSceNpTrophy2/src/GameInfo.cpp @@ -1,7 +1,6 @@ #include -#include "NpTrophy2.hpp" -#include "SceTypes.hpp" +#include "prx/libSceNpTrophy2/include/NpTrophy2.hpp" #include "prx/libc/include/General.hpp" extern "C" { diff --git a/core/libs/prx/libSceNpTrophy2/src/GroupInfo.cpp b/core/libs/prx/libSceNpTrophy2/src/GroupInfo.cpp index 01cfc580a..c69e46f1a 100644 --- a/core/libs/prx/libSceNpTrophy2/src/GroupInfo.cpp +++ b/core/libs/prx/libSceNpTrophy2/src/GroupInfo.cpp @@ -1,8 +1,7 @@ #include #include -#include "NpTrophy2.hpp" -#include "SceTypes.hpp" +#include "prx/libSceNpTrophy2/include/NpTrophy2.hpp" #include "prx/libc/include/General.hpp" extern "C" { diff --git a/core/libs/prx/libSceNpTrophy2/src/Handle.cpp b/core/libs/prx/libSceNpTrophy2/src/Handle.cpp index e94bc9978..749365dd7 100644 --- a/core/libs/prx/libSceNpTrophy2/src/Handle.cpp +++ b/core/libs/prx/libSceNpTrophy2/src/Handle.cpp @@ -1,5 +1,4 @@ -#include "NpTrophy2.hpp" -#include "SceTypes.hpp" +#include "prx/libSceNpTrophy2/include/NpTrophy2.hpp" #include "prx/libc/include/General.hpp" extern "C" { diff --git a/core/libs/prx/libSceNpTrophy2/src/TrophyInfo.cpp b/core/libs/prx/libSceNpTrophy2/src/TrophyInfo.cpp index e5c19ce54..eb7e72893 100644 --- a/core/libs/prx/libSceNpTrophy2/src/TrophyInfo.cpp +++ b/core/libs/prx/libSceNpTrophy2/src/TrophyInfo.cpp @@ -1,8 +1,7 @@ #include #include -#include "NpTrophy2.hpp" -#include "SceTypes.hpp" +#include "prx/libSceNpTrophy2/include/NpTrophy2.hpp" #include "prx/libc/include/General.hpp" extern "C" {