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

Changed: #878 Fix typos in comments/code

Browse source
This commit is contained in:
kervala 2010-12-08 14:47:17 +01:00
parent cdf62e674e
commit 157cac7c02
7 changed files with 10 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
code/ryzom/client/src/client_chat_manager.cpp
View file

@ -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") + ": ";

2
code/ryzom/client/src/color_slot_manager.h
View file

@ -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

2
code/ryzom/client/src/connection.cpp
View file

@ -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

6
code/ryzom/client/src/interface_v3/interface_property.h
View file

@ -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 */

7
code/ryzom/client/src/interface_v3/people_list.cpp
View file

@ -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")+": ";

2
code/ryzom/client/src/r2/editor.cpp
View file

@ -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);

2
code/ryzom/common/src/game_share/time_weather_season/weather_function.h
View file

@ -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