From 22dbe02e8d2016c4796a0c858a61b3d21e5673ee Mon Sep 17 00:00:00 2001 From: Ludovic Marechal Date: Tue, 16 Aug 2022 13:38:13 +0200 Subject: [PATCH] core: Some changes --- archipelago-client/ArchipelagoInterface.cpp | 2 +- archipelago-client/Core.cpp | 6 +++--- archipelago-client/Core.h | 2 -- 3 files changed, 4 insertions(+), 6 deletions(-) diff --git a/archipelago-client/ArchipelagoInterface.cpp b/archipelago-client/ArchipelagoInterface.cpp index 738a534..0bfa6aa 100644 --- a/archipelago-client/ArchipelagoInterface.cpp +++ b/archipelago-client/ArchipelagoInterface.cpp @@ -27,7 +27,7 @@ BOOL CArchipelago::Initialise(std::string URI) { ap->set_socket_disconnected_handler([]() { }); ap->set_slot_connected_handler([](const json& data) { - std::cout << data.dump() << std::endl; + //std::cout << data.dump() << std::endl; //The slot_data feature is not ready yet }); ap->set_slot_disconnected_handler([]() { }); diff --git a/archipelago-client/Core.cpp b/archipelago-client/Core.cpp index 3b693ef..be4b123 100644 --- a/archipelago-client/Core.cpp +++ b/archipelago-client/Core.cpp @@ -110,10 +110,10 @@ VOID CCore::Panic(const char* pMessage, const char* pSort, DWORD dError, DWORD d printf("%s\n", pOutput); if (dIsFatalError) { - sprintf_s(pTitle, "[Item Randomiser - Fatal Error]"); + sprintf_s(pTitle, "[Archipelago client - Fatal Error]"); } else { - sprintf_s(pTitle, "[Item Randomiser - Error]"); + sprintf_s(pTitle, "[Archipelago client - Error]"); }; MessageBoxA(NULL, pOutput, pTitle, MB_ICONERROR); @@ -194,7 +194,7 @@ VOID CCore::ReadConfigFiles() { //Mandatory values if (!j.contains("locationsId") || !j.contains("locationsAddress") || !j.contains("locationsTarget") || !j.contains("itemsId") || !j.contains("itemsAddress") || !j.contains("base_id") || !j.contains("seed") || !j.contains("slot")) { - Core->Panic("One of the mandatory value is missing in the `AP.json` file", "Missing configuration values", AP_MissingValue, 1); + Core->Panic("Please check the following values : [locationsId], [locationsAddress], [locationsTarget], [itemsId], [itemsAddress], [base_id], [seed] and [slot]", "One of the mandatory values is missing in the `AP.json` file", AP_MissingValue, 1); } j.at("locationsId").get_to(ItemRandomiser->pLocationsId); diff --git a/archipelago-client/Core.h b/archipelago-client/Core.h index 5cd64a7..779207b 100644 --- a/archipelago-client/Core.h +++ b/archipelago-client/Core.h @@ -3,8 +3,6 @@ #define _WEBSOCKETPP_CPP11_INTERNAL_ #define _CRT_SECURE_NO_WARNINGS -#define DEBUG - #include "subprojects/apclientpp/apclient.hpp" #include #include