From 62189a69b85a4791009dd5518210e2e5a0d7277d Mon Sep 17 00:00:00 2001 From: kervala Date: Wed, 8 Dec 2010 14:47:17 +0100 Subject: [PATCH] Changed: #878 Fix typos in comments/code --- code/ryzom/client/src/client_chat_manager.cpp | 4 ++-- code/ryzom/client/src/color_slot_manager.h | 2 +- code/ryzom/client/src/connection.cpp | 2 +- code/ryzom/client/src/interface_v3/interface_property.h | 6 +----- code/ryzom/client/src/interface_v3/people_list.cpp | 7 +++---- code/ryzom/client/src/r2/editor.cpp | 2 +- .../src/game_share/time_weather_season/weather_function.h | 2 +- 7 files changed, 10 insertions(+), 15 deletions(-) diff --git a/code/ryzom/client/src/client_chat_manager.cpp b/code/ryzom/client/src/client_chat_manager.cpp index 86a28314d..184c3fac3 100644 --- a/code/ryzom/client/src/client_chat_manager.cpp +++ b/code/ryzom/client/src/client_chat_manager.cpp @@ -1184,12 +1184,12 @@ class CHandlerTell : public IActionHandler prop.readRGBA("UI:SAVE:CHAT:COLORS:SPEAKER"," "); ucstring finalMsg; CChatWindow::encodeColorTag(prop.getRGBA(), finalMsg, false); + ucstring cur_time; CCDBNodeLeaf *pNL = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false); if (pNL && pNL->getValueBool()) - { cur_time = CInterfaceManager::getTimestampHuman(); - } + ucstring csr; if (CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw())) csr += ucstring("(CSR) "); finalMsg += cur_time + csr + CI18N::get("youTell") + ": "; diff --git a/code/ryzom/client/src/color_slot_manager.h b/code/ryzom/client/src/color_slot_manager.h index 480c1e46b..4f9b236ca 100644 --- a/code/ryzom/client/src/color_slot_manager.h +++ b/code/ryzom/client/src/color_slot_manager.h @@ -42,7 +42,7 @@ namespace NLMISC * The manager is initialized from a set of textures files. * The slot color each texture represents is encoded in the texture name * Example: - * amour_red.dds + * armour_red.dds * armour_green.dds * ... * Once the slots description have been filled, we can change model's colors for a given slot diff --git a/code/ryzom/client/src/connection.cpp b/code/ryzom/client/src/connection.cpp index f0694cd47..4fafcdd07 100644 --- a/code/ryzom/client/src/connection.cpp +++ b/code/ryzom/client/src/connection.cpp @@ -183,7 +183,7 @@ bool hasPrivilegeEM() { return (UserPrivileges.find(":EM:") != std::string::npos bool hasPrivilegeEG() { return (UserPrivileges.find(":EG:") != std::string::npos); } -// Restaure the video mode (fullscreen for exemple) after the connection (done in a window) +// Restore the video mode (fullscreen for exemple) after the connection (done in a window) void connectionRestaureVideoMode () { // Setup full screen if we have to diff --git a/code/ryzom/client/src/interface_v3/interface_property.h b/code/ryzom/client/src/interface_v3/interface_property.h index 85cd9e5ab..cec2c2815 100644 --- a/code/ryzom/client/src/interface_v3/interface_property.h +++ b/code/ryzom/client/src/interface_v3/interface_property.h @@ -77,7 +77,7 @@ public: /// sint64 operations void setSInt64 (sint64 value) {_VolatileValue->setValue64(value);} - sint64 getSInt64 () const{return _VolatileValue->getValue64();} + sint64 getSInt64 () const {return _VolatileValue->getValue64();} void readSInt64(const char* value, const std::string& id); /// CRGBA operations @@ -102,10 +102,6 @@ private: CCDBNodeLeaf* _VolatileValue; }; - - - - #endif // NL_INTERFACE_PROPERTY_H /* End of interface_property.h */ diff --git a/code/ryzom/client/src/interface_v3/people_list.cpp b/code/ryzom/client/src/interface_v3/people_list.cpp index 46946ea60..66ce8a2a8 100644 --- a/code/ryzom/client/src/interface_v3/people_list.cpp +++ b/code/ryzom/client/src/interface_v3/people_list.cpp @@ -467,9 +467,8 @@ void CPeopleList::displayLocalPlayerTell(uint index,const ucstring &msg,uint num ucstring cur_time; CCDBNodeLeaf *pNL = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false); if (pNL && pNL->getValueBool()) - { cur_time = CInterfaceManager::getTimestampHuman(); - } + ucstring csr; if (CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw())) csr += ucstring("(CSR) "); ucstring finalMsg = cur_time + csr + CI18N::get("youTell") + ": " + msg; @@ -936,12 +935,12 @@ class CHandlerContactEntry : public IActionHandler prop.readRGBA("UI:SAVE:CHAT:COLORS:SPEAKER"," "); ucstring final; CChatWindow::encodeColorTag(prop.getRGBA(), final, false); + ucstring cur_time; CCDBNodeLeaf *pNL = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false); if (pNL && pNL->getValueBool()) - { cur_time = CInterfaceManager::getTimestampHuman(); - } + ucstring csr; if (CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw())) csr += ucstring("(CSR) "); final += cur_time + csr + CI18N::get("youTell")+": "; diff --git a/code/ryzom/client/src/r2/editor.cpp b/code/ryzom/client/src/r2/editor.cpp index 8d3a314e3..50d54c230 100644 --- a/code/ryzom/client/src/r2/editor.cpp +++ b/code/ryzom/client/src/r2/editor.cpp @@ -1480,7 +1480,7 @@ int CEditor::luaIsValidPosition(CLuaState &ls) CLuaIHM::checkArgType(ls, funcName, 2, LUA_TNUMBER); CLuaIHM::checkArgType(ls, funcName, 3, LUA_TNUMBER); // - /*NLPACS::UGlobalPosition gpos = GR->retrievePosition(CVector((float) ls.toNumber(2), (float) ls.toNumber(3), 2000.f)); + // NLPACS::UGlobalPosition gpos = GR->retrievePosition(CVector((float) ls.toNumber(2), (float) ls.toNumber(3), 2000.f)); if (gpos.InstanceId != -1) { CVector snappedPos = GR->getGlobalPosition(gpos); diff --git a/code/ryzom/common/src/game_share/time_weather_season/weather_function.h b/code/ryzom/common/src/game_share/time_weather_season/weather_function.h index 6dc4115c9..012c22e61 100644 --- a/code/ryzom/common/src/game_share/time_weather_season/weather_function.h +++ b/code/ryzom/common/src/game_share/time_weather_season/weather_function.h @@ -37,7 +37,7 @@ class CWeatherFunctionSheetBase; /** A weather function is a set of weather setup. Depending on the weather function, it blends between 2 setups to get the current state of the weather - * It should be initialized after all whether setup have been loaded, because it builds references on the weather setups. + * It should be initialized after all weather setup have been loaded, because it builds references on the weather setups. * \author Nicolas Vizerie * \author Nevrax France * \date 2002