From 55bba79a240ad0b49ed06c1d32d814b5f33916e2 Mon Sep 17 00:00:00 2001 From: Mr-Auto <36127424+Mr-Auto@users.noreply.github.com> Date: Sat, 14 Dec 2024 20:47:21 +0100 Subject: [PATCH] rename get_savegame, fix typo --- src/game_api/game_manager.hpp | 6 +++--- .../script/usertypes/game_manager_lua.cpp | 19 ++++++++++--------- 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/src/game_api/game_manager.hpp b/src/game_api/game_manager.hpp index 9c8808230..de856cd2d 100644 --- a/src/game_api/game_manager.hpp +++ b/src/game_api/game_manager.hpp @@ -59,10 +59,10 @@ class JournalPeopleData : public JournalPageData bool killed_by_NA; bool defeated_NA; // uint16_t padding; - TEXTURE portret_texture; + TEXTURE portrait_texture; }; -// probably same as JournalPeopleData, just not using portret_texture +// probably same as JournalPeopleData, just not using portrait_texture class JournalBestiaryData : public JournalPageData { public: @@ -109,7 +109,7 @@ struct SaveRelated game_unordered_map stickers_data; /// Gets local version of the SaveData - SaveData* get_SaveData() + SaveData* get_savegame() { return savedata.decode_local(); } diff --git a/src/game_api/script/usertypes/game_manager_lua.cpp b/src/game_api/script/usertypes/game_manager_lua.cpp index 2d1ec85e3..54aed50cc 100644 --- a/src/game_api/script/usertypes/game_manager_lua.cpp +++ b/src/game_api/script/usertypes/game_manager_lua.cpp @@ -8,11 +8,12 @@ #include // for move, declval #include // for min, max -#include "game_manager.hpp" // for GameManager, JournalPopupUI, GameProps -#include "memory.hpp" // for memory_read TODO:temp -#include "savedata.hpp" // for SaveData -#include "screen.hpp" // IWYU pragma: keep -#include "script/sol_helper.hpp" // for ZeroIndexArray +#include "containers/game_allocator.hpp" // for game_allocator +#include "game_manager.hpp" // for GameManager, JournalPopupUI, GameProps +#include "memory.hpp" // for memory_read TODO:temp +#include "savedata.hpp" // for SaveData +#include "screen.hpp" // IWYU pragma: keep +#include "script/sol_helper.hpp" // for ZeroIndexArray namespace NGM { @@ -102,8 +103,8 @@ void register_usertypes(sol::state& lua) &SaveRelated::trap_part_to_main, "stickers_data", &SaveRelated::stickers_data, - "get_SaveData", - &SaveRelated::get_SaveData); + "get_savegame", + &SaveRelated::get_savegame); /// Used in SaveRelated lua.new_usertype( @@ -148,8 +149,8 @@ void register_usertypes(sol::state& lua) &JournalPeopleData::killed_by_NA, "defeated_NA", &JournalPeopleData::defeated_NA, - "portret_texture", - &JournalPeopleData::portret_texture, + "portrait_texture", + &JournalPeopleData::portrait_texture, sol::base_classes, sol::bases());