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-07-28 21:48:57 +02:00
parent 032284affa
commit d35da7cfd8
2 changed files with 10 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
code/ryzom/client/src/client.cpp
View file

@ -370,7 +370,7 @@ int main(int argc, char **argv)
"document settings"..... Force the path to be the path of the exe "document settings"..... Force the path to be the path of the exe
*/ */
{ {
#ifdef NL_FINAL_VERSION #ifdef FINAL_VERSION
char str[4096]; char str[4096];
uint len= GetModuleFileName(NULL, str, 4096); uint len= GetModuleFileName(NULL, str, 4096);
if(len && len<4096) if(len && len<4096)
@ -380,7 +380,7 @@ int main(int argc, char **argv)
// if(!path.empty()) // if(!path.empty())
// CPath::setCurrentPath(path.c_str()); // CPath::setCurrentPath(path.c_str());
} }
#endif // NL_FINAL_VERSION #endif // FINAL_VERSION
} }
string sCmdLine = cmdline; string sCmdLine = cmdline;
@ -389,7 +389,10 @@ int main(int argc, char **argv)
{ {
HANDLE mutex = CreateMutex (NULL, false, "RyzomClient"); HANDLE mutex = CreateMutex (NULL, false, "RyzomClient");
if (mutex && GetLastError() == ERROR_ALREADY_EXISTS) if (mutex && GetLastError() == ERROR_ALREADY_EXISTS)
exit (0); {
delete appContext;
return 0;
}
} }
initCrashReport (); initCrashReport ();

8
code/ryzom/client/src/user_entity.cpp
View file

@ -2194,9 +2194,9 @@ void CUserEntity::setDead() // virtual
// get player's kami fame // get player's kami fame
CInterfaceManager *pIM = CInterfaceManager::getInstance(); CInterfaceManager *pIM = CInterfaceManager::getInstance();
sint8 kamiFame = 0; sint8 kamiFame = 0;
uint kamiFameIndex = CStaticFames::getInstance().getFactionIndex("kami"); uint kamiFameIndex = CStaticFames::getInstance().getFactionIndex("kami");
if (pIM && kamiFameIndex != CStaticFames::INVALID_FACTION_INDEX) if (pIM && kamiFameIndex != CStaticFames::INVALID_FACTION_INDEX)
{ {
CCDBNodeLeaf *pLeafKamiFame = pIM->getDbProp(toString("SERVER:FAME:PLAYER%d:VALUE", kamiFameIndex - 1), false); CCDBNodeLeaf *pLeafKamiFame = pIM->getDbProp(toString("SERVER:FAME:PLAYER%d:VALUE", kamiFameIndex - 1), false);
if (pLeafKamiFame != NULL) if (pLeafKamiFame != NULL)
kamiFame = pLeafKamiFame->getValue8(); kamiFame = pLeafKamiFame->getValue8();
@ -2210,8 +2210,8 @@ void CUserEntity::setDead() // virtual
CCDBNodeLeaf *pLeafKaravanFame = pIM->getDbProp(toString("SERVER:FAME:PLAYER%d:VALUE", karavanFameIndex - 1), false); CCDBNodeLeaf *pLeafKaravanFame = pIM->getDbProp(toString("SERVER:FAME:PLAYER%d:VALUE", karavanFameIndex - 1), false);
if (pLeafKaravanFame != NULL) if (pLeafKaravanFame != NULL)
karavanFame = pLeafKaravanFame->getValue8(); karavanFame = pLeafKaravanFame->getValue8();
} }
// set loading background depending on player's faction fame // set loading background depending on player's faction fame
if (kamiFame > karavanFame) if (kamiFame > karavanFame)
LoadingBackground = ResurectKamiBackground; LoadingBackground = ResurectKamiBackground;