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

Changed: #825 Remove all warnings when compiling Ryzom

Browse source
This commit is contained in:
kervala 2011-06-03 10:51:03 +02:00
parent cbc41fb73a
commit 900dc9e5da
4 changed files with 13 additions and 13 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

@ -963,7 +963,7 @@ void CClientChatManager::buildTellSentence(const ucstring &sender, const ucstrin
else else
{ {
// Does the char have a CSR title? // Does the char have a CSR title?
csr = CHARACTER_TITLE::isCsrTitle(CEntityCL::getTitleFromName(sender)) ? ucstring("(CSR) ") : ucstring(""); if (CHARACTER_TITLE::isCsrTitle(CEntityCL::getTitleFromName(sender))) csr = ucstring("(CSR) ");
} }
ucstring cur_time; ucstring cur_time;
@ -1018,7 +1018,7 @@ void CClientChatManager::buildChatSentence(TDataSetIndex /* compressedSenderInde
ucstring csr; ucstring csr;
// Does the char have a CSR title? // Does the char have a CSR title?
csr = CHARACTER_TITLE::isCsrTitle(CEntityCL::getTitleFromName(sender)) ? ucstring("(CSR) ") : ucstring(""); if (CHARACTER_TITLE::isCsrTitle(CEntityCL::getTitleFromName(sender))) csr = ucstring("(CSR) ");
if (UserEntity && senderName == UserEntity->getDisplayName()) if (UserEntity && senderName == UserEntity->getDisplayName())
{ {

8
code/ryzom/server/src/entities_game_service/admin.cpp
View file

@ -575,7 +575,7 @@ string getSalt()
// read the file content into a buffer // read the file content into a buffer
uint32 size=NLMISC::CFile::getFileSize(f); uint32 size=NLMISC::CFile::getFileSize(f);
input.resize(size); input.resize(size);
uint32 readSize= fread(&input[0],1,size,f); uint32 readSize= (uint32)fread(&input[0],1,size,f);
fclose(f); fclose(f);
Salt = input; Salt = input;
return Salt; return Salt;
@ -589,7 +589,7 @@ void saveSalt(const string salt)
{ {
Salt = salt; Salt = salt;
CBackupMsgSaveFile msg("salt.txt", CBackupMsgSaveFile::SaveFile, Bsi ); CBackupMsgSaveFile msg("salt.txt", CBackupMsgSaveFile::SaveFile, Bsi );
msg.DataMsg.serialBuffer((uint8*)Salt.c_str(), Salt.size()); msg.DataMsg.serialBuffer((uint8*)Salt.c_str(), (uint)Salt.size());
Bsi.sendFile(msg); Bsi.sendFile(msg);
} }
@ -4948,7 +4948,7 @@ NLMISC_COMMAND (webExecCommand, "Execute a web command", "<user id> <web_app_url
if (command_args.size () < 3) return false; if (command_args.size () < 3) return false;
uint32 instanceNumber = c->getInstanceNumber(); uint32 instanceNumber = c->getInstanceNumber();
uint32 nbString = command_args.size(); uint32 nbString = (uint32)command_args.size();
CMessage msgout("EVENT_NPC_GROUP_SCRIPT"); CMessage msgout("EVENT_NPC_GROUP_SCRIPT");
uint32 messageVersion = 1; uint32 messageVersion = 1;
@ -6414,7 +6414,7 @@ NLMISC_COMMAND(eScript, "executes a script on an event npc group", "<player eid>
uint32 instanceNumber = c->getInstanceNumber(); uint32 instanceNumber = c->getInstanceNumber();
uint32 nbString = args.size(); uint32 nbString = (uint32)args.size();
CMessage msgout("EVENT_NPC_GROUP_SCRIPT"); CMessage msgout("EVENT_NPC_GROUP_SCRIPT");
uint32 messageVersion = 1; uint32 messageVersion = 1;

10
code/ryzom/server/src/entities_game_service/phrase_manager/faber_action.cpp
View file

@ -662,19 +662,19 @@ protected:
for (it=effects.begin(), itEnd=effects.end(); it!=itEnd; ++it) for (it=effects.begin(), itEnd=effects.end(); it!=itEnd; ++it)
{ {
float rnd = RandomGenerator.frand(); float rnd = RandomGenerator.frand();
float effect0 = it->EffectArgFloat[0]; double effect0 = it->EffectArgFloat[0];
float effect1 = it->EffectArgFloat[1]; double effect1 = it->EffectArgFloat[1];
// Clamp boost when player do not have required privs // Clamp boost when player do not have required privs
if (!character->havePriv(":DEV:") && !character->havePriv(":SGM:")) if (!character->havePriv(":DEV:") && !character->havePriv(":SGM:"))
{ {
clamp(effect0, 0.f, 0.25f); clamp(effect0, 0.0, 0.25);
clamp(effect1, 0.f, 0.25f); clamp(effect1, 0.0, 0.25);
} }
if (rnd < effect0) if (rnd < effect0)
{ {
applyProcAddLimit(Params, statBitField, effect1); applyProcAddLimit(Params, statBitField, effect1);
PHRASE_UTILITIES::sendItemSpecialEffectProcMessage(ITEM_SPECIAL_EFFECT::ISE_CRAFT_ADD_LIMIT, character, NULL, (sint32)(effect1*100.f)); PHRASE_UTILITIES::sendItemSpecialEffectProcMessage(ITEM_SPECIAL_EFFECT::ISE_CRAFT_ADD_LIMIT, character, NULL, (sint32)(effect1*100.0));
} }
} }
} }

4
code/ryzom/server/src/entities_game_service/player_manager/character.cpp
View file

@ -13352,7 +13352,7 @@ void CCharacter::sendUrl(const string &url, const string &salt)
if (!salt.empty()) if (!salt.empty())
{ {
string checksum = salt+url; string checksum = salt+url;
control = "&hmac="+getHMacSHA1((uint8*)&url[0], url.size(), (uint8*)&salt[0], salt.size()).toString();; control = "&hmac="+getHMacSHA1((uint8*)&url[0], (uint32)url.size(), (uint8*)&salt[0], (uint32)salt.size()).toString();;
} }
nlinfo(url.c_str()); nlinfo(url.c_str());
@ -13477,7 +13477,7 @@ uint CCharacter::checkWebCommand(const string &url, const string &data, const st
if (slot == INVENTORIES::NbBagSlots) if (slot == INVENTORIES::NbBagSlots)
return slot; return slot;
string checksum = url + data + getId().toString(); string checksum = url + data + getId().toString();
string realhmac = getHMacSHA1((uint8*)&checksum[0], checksum.size(), (uint8*)&salt[0], salt.size()).toString(); string realhmac = getHMacSHA1((uint8*)&checksum[0], (uint32)checksum.size(), (uint8*)&salt[0], (uint32)salt.size()).toString();
if (realhmac == hmac) if (realhmac == hmac)
return slot; return slot;
return INVENTORIES::NbBagSlots; return INVENTORIES::NbBagSlots;