diff --git a/src/CRE/auth_3d.cpp b/src/CRE/auth_3d.cpp index 80a38c5a..62a97831 100644 --- a/src/CRE/auth_3d.cpp +++ b/src/CRE/auth_3d.cpp @@ -388,7 +388,7 @@ void auth_3d::ctrl(render_context* rctx) { if (field_C && v40 != field_C) for (a3d::EventAdapter*& i : event_adapter) { auth_3d_id id = get_id(); - i->Field_10(id); + i->OnCtrl(id); } if (set || !repeat || last_frame > frame) @@ -396,7 +396,7 @@ void auth_3d::ctrl(render_context* rctx) { for (a3d::EventAdapter*& i : event_adapter) { auth_3d_id id = get_id(); - i->Field_28(id); + i->OnRepeat(id); } req_frame = frame - last_frame + frame_offset; @@ -406,7 +406,7 @@ void auth_3d::ctrl(render_context* rctx) { for (a3d::EventAdapter*& i : event_adapter) { auth_3d_id id = get_id(); - i->Field_20(id); + i->OnPostCtrl(id); } bool ended = play_control.size <= frame; @@ -417,7 +417,7 @@ void auth_3d::ctrl(render_context* rctx) { for (a3d::EventAdapter*& i : event_adapter) { auth_3d_id id = get_id(); - i->Field_18(id); + i->OnEnded(id); } } this->ended = ended; @@ -745,7 +745,7 @@ void auth_3d::parse() { for (a3d::EventAdapter*& i : event_adapter) { auth_3d_id id = get_id(); - i->Field_8(id); + i->OnLoad(id); } frame = 0.0f; @@ -786,7 +786,7 @@ void auth_3d::parse() { for (a3d::EventAdapter*& i : event_adapter) { auth_3d_id id = get_id(); - i->Field_8(id); + i->OnLoad(id); } frame = 0.0f; @@ -1053,23 +1053,23 @@ namespace a3d { } - void EventAdapter::Field_8(::auth_3d_id& id) { + void EventAdapter::OnLoad(::auth_3d_id& id) { } - void EventAdapter::Field_10(::auth_3d_id& id) { + void EventAdapter::OnCtrl(::auth_3d_id& id) { } - void EventAdapter::Field_18(::auth_3d_id& id) { + void EventAdapter::OnEnded(::auth_3d_id& id) { } - void EventAdapter::Field_20(::auth_3d_id& id) { + void EventAdapter::OnPostCtrl(::auth_3d_id& id) { } - void EventAdapter::Field_28(::auth_3d_id& id) { + void EventAdapter::OnRepeat(::auth_3d_id& id) { } } diff --git a/src/CRE/auth_3d.hpp b/src/CRE/auth_3d.hpp index 90ebf9d3..e673f6a6 100644 --- a/src/CRE/auth_3d.hpp +++ b/src/CRE/auth_3d.hpp @@ -179,11 +179,11 @@ namespace a3d { EventListener(); virtual ~EventListener(); - virtual void Field_8(auth_3d_id& id) = 0; - virtual void Field_10(auth_3d_id& id) = 0; - virtual void Field_18(auth_3d_id& id) = 0; - virtual void Field_20(auth_3d_id& id) = 0; - virtual void Field_28(auth_3d_id& id) = 0; + virtual void OnLoad(auth_3d_id& id) = 0; + virtual void OnCtrl(auth_3d_id& id) = 0; + virtual void OnEnded(auth_3d_id& id) = 0; + virtual void OnPostCtrl(auth_3d_id& id) = 0; + virtual void OnRepeat(auth_3d_id& id) = 0; }; class EventAdapter : public EventListener { @@ -191,11 +191,11 @@ namespace a3d { EventAdapter(); virtual ~EventAdapter() override; - virtual void Field_8(auth_3d_id& id) override; - virtual void Field_10(auth_3d_id& id) override; - virtual void Field_18(auth_3d_id& id) override; - virtual void Field_20(auth_3d_id& id) override; - virtual void Field_28(auth_3d_id& id) override; + virtual void OnLoad(auth_3d_id& id) override; + virtual void OnCtrl(auth_3d_id& id) override; + virtual void OnEnded(auth_3d_id& id) override; + virtual void OnPostCtrl(auth_3d_id& id) override; + virtual void OnRepeat(auth_3d_id& id) override; }; } diff --git a/src/ReDIVA/data_test/auth_3d_test.cpp b/src/ReDIVA/data_test/auth_3d_test.cpp index 08ffb84e..5dbf3b70 100644 --- a/src/ReDIVA/data_test/auth_3d_test.cpp +++ b/src/ReDIVA/data_test/auth_3d_test.cpp @@ -490,7 +490,7 @@ Auth3dTestTask::DataEventListener::~DataEventListener() { } -void Auth3dTestTask::DataEventListener::Field_8(::auth_3d_id& id) { +void Auth3dTestTask::DataEventListener::OnLoad(::auth_3d_id& id) { size_t chara_count = id.get_chara_count(); if (chara_count) { @@ -518,7 +518,7 @@ void Auth3dTestTask::DataEventListener::Field_8(::auth_3d_id& id) { auth_3d_test_window->SetMaxFrame(id.get_play_control_size()); } -void Auth3dTestTask::DataEventListener::Field_20(::auth_3d_id& id) { +void Auth3dTestTask::DataEventListener::OnPostCtrl(::auth_3d_id& id) { if (auth_3d_test_task->aet.id != -1) { auth_3d_test_task->aet.Free(); auth_3d_test_task->aet.Init(); diff --git a/src/ReDIVA/data_test/auth_3d_test.hpp b/src/ReDIVA/data_test/auth_3d_test.hpp index 99f44096..893dc169 100644 --- a/src/ReDIVA/data_test/auth_3d_test.hpp +++ b/src/ReDIVA/data_test/auth_3d_test.hpp @@ -45,8 +45,8 @@ public: DataEventListener(); virtual ~DataEventListener() override; - virtual void Field_8(::auth_3d_id& id) override; - virtual void Field_20(::auth_3d_id& id) override; + virtual void OnLoad(::auth_3d_id& id) override; + virtual void OnPostCtrl(::auth_3d_id& id) override; } data_event_listener; int32_t field_1C0;