Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Merge with develop

Browse source 
--HG--
branch : compatibility-develop
This commit is contained in:
kervala 2016-01-21 10:08:56 +01:00
commit 5a6580dc38
3 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
code/nel/include/nel/misc/string_common.h
View file

@ -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 float &val) { return toString("%f", val); }
inline std::string toString(const double &val) { return toString("%lf", 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; } 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 // stl vectors of bool use bit reference and not real bools, so define the operator for bit reference

2
code/nel/tools/misc/crash_report/crash_report.cpp
View file

@ -90,6 +90,8 @@ public:
Q_IMPORT_PLUGIN(QXcbIntegrationPlugin) Q_IMPORT_PLUGIN(QXcbIntegrationPlugin)
#endif #endif
Q_IMPORT_PLUGIN(QIcoPlugin)
#endif #endif
int main(int argc, char **argv) int main(int argc, char **argv)

1
code/ryzom/client/data/gamedev/interfaces_v3/interaction.lua
View file

@ -219,7 +219,6 @@ end
function game:updateTargetConsiderUI() function game:updateTargetConsiderUI()
--debugInfo("Updating consider widget") --debugInfo("Updating consider widget")
local targetWindow = getUI("ui:interface:target") local targetWindow = getUI("ui:interface:target")
-- --
local wgTargetSlotForce = targetWindow:find("slot_force") local wgTargetSlotForce = targetWindow:find("slot_force")