Changed: #878 Fix typos in comments/code
This commit is contained in:
parent
f057b12488
commit
62189a69b8
7 changed files with 10 additions and 15 deletions
|
@ -1184,12 +1184,12 @@ class CHandlerTell : public IActionHandler
|
||||||
prop.readRGBA("UI:SAVE:CHAT:COLORS:SPEAKER"," ");
|
prop.readRGBA("UI:SAVE:CHAT:COLORS:SPEAKER"," ");
|
||||||
ucstring finalMsg;
|
ucstring finalMsg;
|
||||||
CChatWindow::encodeColorTag(prop.getRGBA(), finalMsg, false);
|
CChatWindow::encodeColorTag(prop.getRGBA(), finalMsg, false);
|
||||||
|
|
||||||
ucstring cur_time;
|
ucstring cur_time;
|
||||||
CCDBNodeLeaf *pNL = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false);
|
CCDBNodeLeaf *pNL = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false);
|
||||||
if (pNL && pNL->getValueBool())
|
if (pNL && pNL->getValueBool())
|
||||||
{
|
|
||||||
cur_time = CInterfaceManager::getTimestampHuman();
|
cur_time = CInterfaceManager::getTimestampHuman();
|
||||||
}
|
|
||||||
ucstring csr;
|
ucstring csr;
|
||||||
if (CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw())) csr += ucstring("(CSR) ");
|
if (CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw())) csr += ucstring("(CSR) ");
|
||||||
finalMsg += cur_time + csr + CI18N::get("youTell") + ": ";
|
finalMsg += cur_time + csr + CI18N::get("youTell") + ": ";
|
||||||
|
|
|
@ -42,7 +42,7 @@ namespace NLMISC
|
||||||
* The manager is initialized from a set of textures files.
|
* The manager is initialized from a set of textures files.
|
||||||
* The slot color each texture represents is encoded in the texture name
|
* The slot color each texture represents is encoded in the texture name
|
||||||
* Example:
|
* Example:
|
||||||
* amour_red.dds
|
* armour_red.dds
|
||||||
* armour_green.dds
|
* armour_green.dds
|
||||||
* ...
|
* ...
|
||||||
* Once the slots description have been filled, we can change model's colors for a given slot
|
* Once the slots description have been filled, we can change model's colors for a given slot
|
||||||
|
|
|
@ -183,7 +183,7 @@ bool hasPrivilegeEM() { return (UserPrivileges.find(":EM:") != std::string::npos
|
||||||
bool hasPrivilegeEG() { return (UserPrivileges.find(":EG:") != 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 ()
|
void connectionRestaureVideoMode ()
|
||||||
{
|
{
|
||||||
// Setup full screen if we have to
|
// Setup full screen if we have to
|
||||||
|
|
|
@ -102,10 +102,6 @@ private:
|
||||||
CCDBNodeLeaf* _VolatileValue;
|
CCDBNodeLeaf* _VolatileValue;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#endif // NL_INTERFACE_PROPERTY_H
|
#endif // NL_INTERFACE_PROPERTY_H
|
||||||
|
|
||||||
/* End of interface_property.h */
|
/* End of interface_property.h */
|
||||||
|
|
|
@ -467,9 +467,8 @@ void CPeopleList::displayLocalPlayerTell(uint index,const ucstring &msg,uint num
|
||||||
ucstring cur_time;
|
ucstring cur_time;
|
||||||
CCDBNodeLeaf *pNL = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false);
|
CCDBNodeLeaf *pNL = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false);
|
||||||
if (pNL && pNL->getValueBool())
|
if (pNL && pNL->getValueBool())
|
||||||
{
|
|
||||||
cur_time = CInterfaceManager::getTimestampHuman();
|
cur_time = CInterfaceManager::getTimestampHuman();
|
||||||
}
|
|
||||||
ucstring csr;
|
ucstring csr;
|
||||||
if (CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw())) csr += ucstring("(CSR) ");
|
if (CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw())) csr += ucstring("(CSR) ");
|
||||||
ucstring finalMsg = cur_time + csr + CI18N::get("youTell") + ": " + msg;
|
ucstring finalMsg = cur_time + csr + CI18N::get("youTell") + ": " + msg;
|
||||||
|
@ -936,12 +935,12 @@ class CHandlerContactEntry : public IActionHandler
|
||||||
prop.readRGBA("UI:SAVE:CHAT:COLORS:SPEAKER"," ");
|
prop.readRGBA("UI:SAVE:CHAT:COLORS:SPEAKER"," ");
|
||||||
ucstring final;
|
ucstring final;
|
||||||
CChatWindow::encodeColorTag(prop.getRGBA(), final, false);
|
CChatWindow::encodeColorTag(prop.getRGBA(), final, false);
|
||||||
|
|
||||||
ucstring cur_time;
|
ucstring cur_time;
|
||||||
CCDBNodeLeaf *pNL = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false);
|
CCDBNodeLeaf *pNL = CInterfaceManager::getInstance()->getDbProp("UI:SAVE:CHAT:SHOW_TIMES_IN_CHAT_CB", false);
|
||||||
if (pNL && pNL->getValueBool())
|
if (pNL && pNL->getValueBool())
|
||||||
{
|
|
||||||
cur_time = CInterfaceManager::getTimestampHuman();
|
cur_time = CInterfaceManager::getTimestampHuman();
|
||||||
}
|
|
||||||
ucstring csr;
|
ucstring csr;
|
||||||
if (CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw())) csr += ucstring("(CSR) ");
|
if (CHARACTER_TITLE::isCsrTitle(UserEntity->getTitleRaw())) csr += ucstring("(CSR) ");
|
||||||
final += cur_time + csr + CI18N::get("youTell")+": ";
|
final += cur_time + csr + CI18N::get("youTell")+": ";
|
||||||
|
|
|
@ -1480,7 +1480,7 @@ int CEditor::luaIsValidPosition(CLuaState &ls)
|
||||||
CLuaIHM::checkArgType(ls, funcName, 2, LUA_TNUMBER);
|
CLuaIHM::checkArgType(ls, funcName, 2, LUA_TNUMBER);
|
||||||
CLuaIHM::checkArgType(ls, funcName, 3, 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)
|
if (gpos.InstanceId != -1)
|
||||||
{
|
{
|
||||||
CVector snappedPos = GR->getGlobalPosition(gpos);
|
CVector snappedPos = GR->getGlobalPosition(gpos);
|
||||||
|
|
|
@ -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
|
/** 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 Nicolas Vizerie
|
||||||
* \author Nevrax France
|
* \author Nevrax France
|
||||||
* \date 2002
|
* \date 2002
|
||||||
|
|
Loading…
Reference in a new issue