From f40614718d5d58a74e020c62483623782917562d Mon Sep 17 00:00:00 2001 From: JAJames Date: Fri, 25 Mar 2016 20:32:37 -0400 Subject: [PATCH] RenX.Core: * total_gdi_game_time and total_nod_game_time should now be calculated correctly RenX.Logging: * Added some color to vehicle crate log --- Release/Plugins/RenX.Core.lib | Bin 197340 -> 197340 bytes RenX.Core/RenX_LadderDatabase.cpp | 4 ++-- RenX.Logging/RenX_Logging.cpp | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Release/Plugins/RenX.Core.lib b/Release/Plugins/RenX.Core.lib index 7af566cf7dc4a97f3cb281fd00e452100fb56cf7..4581658c3e0d4644c014be4b78c245cbcff97f1d 100644 GIT binary patch delta 13780 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 - entry->total_gdi_game_time += player->kills; + entry->total_gdi_game_time += static_cast(std::chrono::duration_cast(server->getGameTime(player)).count()); entry->total_gdi_score += static_cast(player->score); entry->total_gdi_beacon_placements += player->beaconPlacements; entry->total_gdi_beacon_disarms += player->beaconDisarms; @@ -543,7 +543,7 @@ void RenX::LadderDatabase::updateLadder(RenX::Server *server, const RenX::TeamTy else if (team == RenX::TeamType::None) ++entry->total_nod_ties; - entry->total_nod_game_time += player->kills; + entry->total_nod_game_time += static_cast(std::chrono::duration_cast(server->getGameTime(player)).count()); entry->total_nod_score += static_cast(player->score); entry->total_nod_beacon_placements += player->beaconPlacements; entry->total_nod_beacon_disarms += player->beaconDisarms; diff --git a/RenX.Logging/RenX_Logging.cpp b/RenX.Logging/RenX_Logging.cpp index bfa730e..bcb057d 100644 --- a/RenX.Logging/RenX_Logging.cpp +++ b/RenX.Logging/RenX_Logging.cpp @@ -250,7 +250,7 @@ void RenX_LoggingPlugin::init() Jupiter::StringS::Format(IRCBOLD "%.*s" IRCCOLOR IRCBOLD " online.", RenX::tags->nameTag.size(), RenX::tags->nameTag.ptr())); RenX_LoggingPlugin::vehicleCrateFmt = Jupiter::IRC::Client::Config->get(this->getName(), "VehicleCrateFormat"_jrs, - Jupiter::StringS::Format(IRCBOLD "%.*s" IRCCOLOR IRCBOLD " picked up a %.*s vehicle crate.", RenX::tags->nameTag.size(), RenX::tags->nameTag.ptr(), RenX::tags->objectTag.size(), RenX::tags->objectTag.ptr())); + Jupiter::StringS::Format(IRCBOLD "%.*s" IRCCOLOR IRCBOLD " picked up a " IRCCOLOR "12%.*s" IRCCOLOR " vehicle crate.", RenX::tags->nameTag.size(), RenX::tags->nameTag.ptr(), RenX::tags->objectTag.size(), RenX::tags->objectTag.ptr())); RenX_LoggingPlugin::TSVehicleCrateFmt = Jupiter::IRC::Client::Config->get(this->getName(), "TSVehicleCrateFormat"_jrs, RenX_LoggingPlugin::vehicleCrateFmt);