Browse Source

Minor bug fixes

Updated Jupiter
RenX_ModSystem: Adjusted for Jupiter
pull/4/head
Jessica James 8 years ago
parent
commit
492a879044
  1. 7
      Bot/Jupiter_Bot.h
  2. 6
      Bot/Main.cpp
  3. 5
      Configs/IRC.Core.ini
  4. 2
      Jupiter
  5. 6
      RenX.ModSystem/RenX_ModSystem.cpp

7
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 * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * purpose with or without fee is hereby granted, provided that the above
@ -45,12 +45,11 @@ namespace Jupiter { class Config; }
namespace Jupiter namespace Jupiter
{ {
/** Application config file */ /** Application config file */
extern Jupiter::Config *g_config; JUPITER_BOT_API extern Jupiter::Config *g_config;
/** Application start time */ /** 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 #endif // __cplusplus

6
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 * Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above * 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<double>(std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::steady_clock::now() - Jupiter::g_start_time).count()) / 1000.0 ); printf("Initialization completed in %f milliseconds." ENDL, static_cast<double>(std::chrono::duration_cast<std::chrono::microseconds>(std::chrono::steady_clock::now() - Jupiter::g_start_time).count()) / 1000.0 );
if (consoleCommands->size() > 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) 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) while (1)
{ {

5
Configs/IRC.Core.ini

@ -102,11 +102,12 @@ SASL.Password=your_NickServ_Password
[[Channels]] [[Channels]]
[[[#RenX-IRC]]] ; Temporary: all channel names must be lowercase
[[[#renx-irc]]]
AutoJoin=True AutoJoin=True
Type=1 Type=1
[[[#RenX-IRC.Admin]]] [[[#renx-irc.admin]]]
AutoJoin=True AutoJoin=True
Type=2 Type=2

2
Jupiter

@ -1 +1 @@
Subproject commit b71200a2cf02a4f0efa040940c32a1faa46ebdea Subproject commit a1446315ad928005825d4746ef66e57b759ebe4d

6
RenX.ModSystem/RenX_ModSystem.cpp

@ -770,11 +770,11 @@ void DelIRCCommand::trigger(IRC_Bot *source, const Jupiter::ReadableString &chan
while (bucket_itr != bucket_end) 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); source->sendNotice(nick, "Player has been removed from the moderator list."_jrs);
else else
source->sendNotice(nick, "Error: Unknown error occurred."_jrs); source->sendNotice(nick, "Error: Unknown error occurred."_jrs);

Loading…
Cancel
Save