From 492a879044daf008fe29194b972ec8facf41f5c6 Mon Sep 17 00:00:00 2001 From: Jessica James Date: Thu, 19 Jan 2017 04:08:54 -0500 Subject: [PATCH] Minor bug fixes Updated Jupiter RenX_ModSystem: Adjusted for Jupiter --- Bot/Jupiter_Bot.h | 7 +++---- Bot/Main.cpp | 6 +++--- Configs/IRC.Core.ini | 5 +++-- Jupiter | 2 +- RenX.ModSystem/RenX_ModSystem.cpp | 6 +++--- 5 files changed, 13 insertions(+), 13 deletions(-) diff --git a/Bot/Jupiter_Bot.h b/Bot/Jupiter_Bot.h index a8385ad..7063a72 100644 --- a/Bot/Jupiter_Bot.h +++ b/Bot/Jupiter_Bot.h @@ -1,5 +1,5 @@ /** - * Copyright (C) 2013-2016 Jessica James. + * Copyright (C) 2013-2017 Jessica James. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -45,12 +45,11 @@ namespace Jupiter { class Config; } namespace Jupiter { - /** Application config file */ - extern Jupiter::Config *g_config; + JUPITER_BOT_API extern Jupiter::Config *g_config; /** Application start time */ - extern std::chrono::steady_clock::time_point g_start_time; + JUPITER_BOT_API extern std::chrono::steady_clock::time_point g_start_time; } #endif // __cplusplus diff --git a/Bot/Main.cpp b/Bot/Main.cpp index 51bc785..0aa645a 100644 --- a/Bot/Main.cpp +++ b/Bot/Main.cpp @@ -1,5 +1,5 @@ /** - * Copyright (C) 2013-2016 Jessica James. + * Copyright (C) 2013-2017 Jessica James. * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted, provided that the above @@ -192,9 +192,9 @@ int main(int argc, const char **args) printf("Initialization completed in %f milliseconds." ENDL, static_cast(std::chrono::duration_cast(std::chrono::steady_clock::now() - Jupiter::g_start_time).count()) / 1000.0 ); if (consoleCommands->size() > 0) - printf("%u Console Commands have been initialized%s" ENDL, consoleCommands->size(), getConsoleCommand("help"_jrs) == nullptr ? "." : "; type \"help\" for more information."); + printf("%zu Console Commands have been initialized%s" ENDL, consoleCommands->size(), getConsoleCommand("help"_jrs) == nullptr ? "." : "; type \"help\" for more information."); if (IRCMasterCommandList->size() > 0) - printf("%u IRC Commands have been loaded into the master list." ENDL, IRCMasterCommandList->size()); + printf("%zu IRC Commands have been loaded into the master list." ENDL, IRCMasterCommandList->size()); while (1) { diff --git a/Configs/IRC.Core.ini b/Configs/IRC.Core.ini index 8cd5029..80596c6 100644 --- a/Configs/IRC.Core.ini +++ b/Configs/IRC.Core.ini @@ -102,11 +102,12 @@ SASL.Password=your_NickServ_Password [[Channels]] - [[[#RenX-IRC]]] + ; Temporary: all channel names must be lowercase + [[[#renx-irc]]] AutoJoin=True Type=1 - [[[#RenX-IRC.Admin]]] + [[[#renx-irc.admin]]] AutoJoin=True Type=2 diff --git a/Jupiter b/Jupiter index b71200a..a144631 160000 --- a/Jupiter +++ b/Jupiter @@ -1 +1 @@ -Subproject commit b71200a2cf02a4f0efa040940c32a1faa46ebdea +Subproject commit a1446315ad928005825d4746ef66e57b759ebe4d diff --git a/RenX.ModSystem/RenX_ModSystem.cpp b/RenX.ModSystem/RenX_ModSystem.cpp index ef7d0d9..6100cc7 100644 --- a/RenX.ModSystem/RenX_ModSystem.cpp +++ b/RenX.ModSystem/RenX_ModSystem.cpp @@ -770,11 +770,11 @@ void DelIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &chan while (bucket_itr != bucket_end) { - for (auto entry_itr = bucket_itr->m_entries.getHead(); entry_itr != nullptr; entry_itr = entry_itr->next) + for (auto entry_itr = bucket_itr->m_entries.begin(); entry_itr != bucket_itr->m_entries.end(); ++entry_itr) { - if (entry_itr->data->value.get("Name"_jrs).equalsi(parameters)) + if (entry_itr->value.get("Name"_jrs).equalsi(parameters)) { - if (pluginInstance.modsFile.remove(entry_itr->data->key)) + if (pluginInstance.modsFile.remove(entry_itr->key)) source->sendNotice(nick, "Player has been removed from the moderator list."_jrs); else source->sendNotice(nick, "Error: Unknown error occurred."_jrs);