diff --git a/src/ReDIVA/x_pv_game.cpp b/src/ReDIVA/x_pv_game.cpp index 9fd29484..13cbfc64 100644 --- a/src/ReDIVA/x_pv_game.cpp +++ b/src/ReDIVA/x_pv_game.cpp @@ -2153,7 +2153,7 @@ aet_obj_data_comp::~aet_obj_data_comp() { } -aet_layout_data* aet_obj_data_comp::find_layout(const char* name) { +const aet_layout_data* aet_obj_data_comp::find_layout(const char* name) { return comp.Find(name); } @@ -2193,7 +2193,7 @@ bool aet_obj_data::check_disp() { return aet_manager_get_obj_end(id); } -aet_layout_data* aet_obj_data::find_aet_layout(const char* name, +const aet_layout_data* aet_obj_data::find_aet_layout(const char* name, const aet_database* aet_db, const sprite_database* spr_db) { if (!name) return 0; @@ -2263,7 +2263,7 @@ void x_pv_aet_disp_string::ctrl(const char* name, aet_obj_data* aet, const aet_d return; } - aet_layout_data* layout = aet->find_aet_layout(name, aet_db, spr_db); + const aet_layout_data* layout = aet->find_aet_layout(name, aet_db, spr_db); if (!layout) { data.disp = false; return; diff --git a/src/ReDIVA/x_pv_game.hpp b/src/ReDIVA/x_pv_game.hpp index b9cf1f4e..cc18906c 100644 --- a/src/ReDIVA/x_pv_game.hpp +++ b/src/ReDIVA/x_pv_game.hpp @@ -475,7 +475,7 @@ struct aet_obj_data_comp { aet_obj_data_comp(); ~aet_obj_data_comp(); - aet_layout_data* find_layout(const char* name); + const aet_layout_data* find_layout(const char* name); bool init_comp(uint32_t aet_id, const std::string&& layer_name, float_t frame, const aet_database* aet_db, const sprite_database* spr_db); }; @@ -494,7 +494,7 @@ struct aet_obj_data { ~aet_obj_data(); bool check_disp(); - aet_layout_data* find_aet_layout(const char* name, + const aet_layout_data* find_aet_layout(const char* name, const aet_database* aet_db, const sprite_database* spr_db); uint32_t init(AetArgs& args, const aet_database* aet_db); void reset(); @@ -549,6 +549,7 @@ struct x_pv_game_title { void ctrl(); void ctrl_txt_data(); void disp(); + bool get_id(int8_t cloud_index, uint32_t& aet_id); bool get_set_ids(int8_t cloud_index, uint32_t& aet_set_id, uint32_t& spr_set_id); void load(int32_t pv_id, FrameRateControl* frame_rate_control); void load_data();