This commit is contained in:
Green Sky 2024-10-25 12:57:00 +02:00
parent c4608bb3c9
commit 653db9ab9b
No known key found for this signature in database
3 changed files with 9 additions and 6 deletions

View File

@ -6,7 +6,7 @@ if (NOT TARGET imgui)
message("II using FetchContent imgui") message("II using FetchContent imgui")
FetchContent_Declare(imgui FetchContent_Declare(imgui
GIT_REPOSITORY https://github.com/ocornut/imgui.git GIT_REPOSITORY https://github.com/ocornut/imgui.git
GIT_TAG 8199457 # v1.91.0 GIT_TAG cb16568 # v1.91.3
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
) )
@ -32,6 +32,7 @@ if (NOT TARGET imgui)
) )
target_include_directories(imgui PUBLIC ${imgui_SOURCE_DIR}) target_include_directories(imgui PUBLIC ${imgui_SOURCE_DIR})
target_compile_features(imgui PUBLIC cxx_std_11) target_compile_features(imgui PUBLIC cxx_std_11)
target_compile_definitions(imgui PUBLIC IMGUI_USE_WCHAR32)
endif() endif()
endif() endif()

View File

@ -18,7 +18,7 @@ ToxicGames::ToxicGames(
) : ) :
_cr(cr), _cr(cr),
_t(t), _t(t),
_tep(tep), _tep_sr(tep.newSubRef(this)),
_tcm(tcm) _tcm(tcm)
{ {
@ -29,9 +29,11 @@ ToxicGames::ToxicGames(
} }
// register custom packet handlers // register custom packet handlers
_tep.subscribe(this, Tox_Event_Type::TOX_EVENT_FRIEND_LOSSLESS_PACKET); _tep_sr
_tep.subscribe(this, Tox_Event_Type::TOX_EVENT_GROUP_CUSTOM_PACKET); .subscribe(Tox_Event_Type::TOX_EVENT_FRIEND_LOSSLESS_PACKET)
_tep.subscribe(this, Tox_Event_Type::TOX_EVENT_GROUP_CUSTOM_PRIVATE_PACKET); .subscribe(Tox_Event_Type::TOX_EVENT_GROUP_CUSTOM_PACKET)
.subscribe(Tox_Event_Type::TOX_EVENT_GROUP_CUSTOM_PRIVATE_PACKET)
;
} }
//void ToxicGames::addGameInstance(uint8_t game_type, uint32_t game_id, std::unique_ptr<ToxicGameI::InstanceI> instance) { //void ToxicGames::addGameInstance(uint8_t game_type, uint32_t game_id, std::unique_ptr<ToxicGameI::InstanceI> instance) {

View File

@ -16,7 +16,7 @@
class ToxicGames : public ToxEventI { class ToxicGames : public ToxEventI {
Contact3Registry& _cr; Contact3Registry& _cr;
ToxI& _t; ToxI& _t;
ToxEventProviderI& _tep; ToxEventProviderI::SubscriptionReference _tep_sr;
ToxContactModel2& _tcm; ToxContactModel2& _tcm;
std::map<uint8_t, std::unique_ptr<ToxicGameI>> _game_types; std::map<uint8_t, std::unique_ptr<ToxicGameI>> _game_types;