From 11f2f1e3e17915e141c84aebdedec16d10474c4c Mon Sep 17 00:00:00 2001 From: kervala Date: Thu, 21 Jan 2016 10:08:56 +0100 Subject: [PATCH] Merge with develop --- code/nel/include/nel/misc/string_common.h | 2 +- code/nel/tools/misc/crash_report/crash_report.cpp | 2 ++ code/ryzom/client/data/gamedev/interfaces_v3/interaction.lua | 3 +-- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/code/nel/include/nel/misc/string_common.h b/code/nel/include/nel/misc/string_common.h index 9ac55101f..e6d08bdeb 100644 --- a/code/nel/include/nel/misc/string_common.h +++ b/code/nel/include/nel/misc/string_common.h @@ -215,7 +215,7 @@ inline std::string toString(const size_t &val) { return toString("%u", val); } inline std::string toString(const float &val) { return toString("%f", val); } inline std::string toString(const double &val) { return toString("%lf", val); } -inline std::string toString(const bool &val) { return toString("%u", val?1:0); } +inline std::string toString(const bool &val) { return val ? "1":"0"; } inline std::string toString(const std::string &val) { return val; } // stl vectors of bool use bit reference and not real bools, so define the operator for bit reference diff --git a/code/nel/tools/misc/crash_report/crash_report.cpp b/code/nel/tools/misc/crash_report/crash_report.cpp index 08063d78e..030a623c6 100644 --- a/code/nel/tools/misc/crash_report/crash_report.cpp +++ b/code/nel/tools/misc/crash_report/crash_report.cpp @@ -90,6 +90,8 @@ public: Q_IMPORT_PLUGIN(QXcbIntegrationPlugin) #endif + Q_IMPORT_PLUGIN(QIcoPlugin) + #endif int main(int argc, char **argv) diff --git a/code/ryzom/client/data/gamedev/interfaces_v3/interaction.lua b/code/ryzom/client/data/gamedev/interfaces_v3/interaction.lua index d36486e99..e10ad2f6f 100644 --- a/code/ryzom/client/data/gamedev/interfaces_v3/interaction.lua +++ b/code/ryzom/client/data/gamedev/interfaces_v3/interaction.lua @@ -219,7 +219,6 @@ end function game:updateTargetConsiderUI() --debugInfo("Updating consider widget") - local targetWindow = getUI("ui:interface:target") -- local wgTargetSlotForce = targetWindow:find("slot_force") @@ -229,7 +228,7 @@ function game:updateTargetConsiderUI() local wgToolTip = targetWindow:find("target_tooltip") local wgPvPTag = targetWindow:find("pvp_tags") local wgHeader = targetWindow:find("header_opened") - + wgTargetSlotForce.active = true wgImpossible.active = true