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

Changed: #825 Remove all warning when compiling Ryzom

Browse source
This commit is contained in:
kervala 2010-10-23 19:49:03 +02:00
parent 842d959e3e
commit 15e4f8f187
8 changed files with 11 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
code/ryzom/server/src/admin_modules/aes_module.cpp
View file

@ -1418,16 +1418,7 @@ retry_pending_command_loop:
} }
// add redirection // add redirection
#ifdef NL_OS_UNIX string logFile = CPath::getTemporaryDirectory() + "aes_command_output.log";
string logFile = "/tmp/aes_command_output.log";
#else
char *tempDir = getenv("TEMP");
if (tempDir == NULL)
tempDir = getenv("TMP");
if (tempDir == NULL)
tempDir = ".";
string logFile = string(tempDir)+"\\aes_command_output.log";
#endif
cmdLine += " > "+logFile; cmdLine += " > "+logFile;

2
code/ryzom/server/src/ai_service/ai_entity_physical.h
View file

@ -305,7 +305,7 @@ public:
//@{ //@{
virtual void addHealer(IAIEntityPhysicalHealer* healer) { _Healers.insert(healer); if (healer) healer->healerAdded(this); } virtual void addHealer(IAIEntityPhysicalHealer* healer) { _Healers.insert(healer); if (healer) healer->healerAdded(this); }
virtual void delHealer(IAIEntityPhysicalHealer* healer) { _Healers.erase(healer); if (healer) healer->healerRemoved(this); } virtual void delHealer(IAIEntityPhysicalHealer* healer) { _Healers.erase(healer); if (healer) healer->healerRemoved(this); }
virtual int getHealerCount() { return (int)_Healers.size(); } virtual sint getHealerCount() { return (sint)_Healers.size(); }
//@} //@}
static int _PlayerVisibilityDistance; static int _PlayerVisibilityDistance;

6
code/ryzom/server/src/ai_service/commands.cpp
View file

@ -2894,8 +2894,8 @@ NLMISC_COMMAND(unloadPrimitiveFile,"unload a primitive file","<file name>")
static int const MULTI_LINE_FORMATER_maxn = 78; static int const MULTI_LINE_FORMATER_maxn = 78;
void MULTI_LINE_FORMATER::pushTitle(std::vector<std::string>& container, std::string const& text) void MULTI_LINE_FORMATER::pushTitle(std::vector<std::string>& container, std::string const& text)
{ {
int const maxn = MULTI_LINE_FORMATER_maxn; const sint maxn = MULTI_LINE_FORMATER_maxn;
int n = maxn - (int)text.length() - 4; sint n = maxn - (sint)text.length() - 4;
container.push_back(" _/"); container.push_back(" _/");
container.back() += text; container.back() += text;
container.back() += "\\" + std::string(n, '_'); container.back() += "\\" + std::string(n, '_');
@ -3030,7 +3030,7 @@ NLMISC_COMMAND(simulateBug, "simulate an old AIS bug; command is one of 'list',
initBugSimulations(); initBugSimulations();
if (args[1]=="all") if (args[1]=="all")
{ {
for (int i=0; i<bugSimulationCount; ++i) for (sint i=0; i<bugSimulationCount; ++i)
simulateBugs[i] = false; simulateBugs[i] = false;
} }
else else

15
code/ryzom/server/src/ai_share/ai_wrapper_server.cpp
View file

@ -184,8 +184,6 @@ void CAiWrapperServer::startAct(TSessionId sessionId, uint32 aiInstanceId, CPers
} }
} }
void CAiWrapperServer::setAggroRange(NLMISC::CEntityId entityId, float range) void CAiWrapperServer::setAggroRange(NLMISC::CEntityId entityId, float range)
{ {
CMessage msgout("EXEC_COMMAND"); CMessage msgout("EXEC_COMMAND");
@ -210,10 +208,8 @@ void CAiWrapperServer::despawnEntity(NLMISC::CEntityId entityId, uint32 alias)
uint32 nbString=2; uint32 nbString=2;
std::string eid = entityId.toString(); std::string eid = entityId.toString();
std::string str = NLMISC::toString("()despawnBotByAlias(\"%s\");", aliasToString(alias).c_str()); std::string str = NLMISC::toString("()despawnBotByAlias(\"%s\");", aliasToString(alias).c_str());
CMessage msgout("R2_NPC_BOT_SCRIPT_BY_ID"); CMessage msgout("R2_NPC_BOT_SCRIPT_BY_ID");
msgout.serial(messageVersion); msgout.serial(messageVersion);
msgout.serial(nbString); msgout.serial(nbString);
@ -229,10 +225,8 @@ void CAiWrapperServer::setGrpHPLevel(NLMISC::CEntityId entityId, uint32 alias,
uint32 nbString=2; uint32 nbString=2;
std::string eid = entityId.toString(); std::string eid = entityId.toString();
std::string hpstr = NLMISC::toString("()setHPScale(%f);", hp); std::string hpstr = NLMISC::toString("()setHPScale(%f);", hp);
//CMessage msgout("EVENT_NPC_GROUP_SCRIPT"); //CMessage msgout("EVENT_NPC_GROUP_SCRIPT");
CMessage msgout("R2_NPC_BOT_SCRIPT_BY_ID"); CMessage msgout("R2_NPC_BOT_SCRIPT_BY_ID");
msgout.serial(messageVersion); msgout.serial(messageVersion);
@ -241,8 +235,6 @@ void CAiWrapperServer::setGrpHPLevel(NLMISC::CEntityId entityId, uint32 alias,
msgout.serial(hpstr); msgout.serial(hpstr);
CUnifiedNetwork::getInstance()->send("AIS",msgout); CUnifiedNetwork::getInstance()->send("AIS",msgout);
} }
void CAiWrapperServer::setHPLevel(NLMISC::CEntityId entityId, uint32 alias, float hp) void CAiWrapperServer::setHPLevel(NLMISC::CEntityId entityId, uint32 alias, float hp)
@ -252,10 +244,8 @@ void CAiWrapperServer::setHPLevel(NLMISC::CEntityId entityId, uint32 alias, floa
uint32 nbString=2; uint32 nbString=2;
std::string eid = entityId.toString(); std::string eid = entityId.toString();
std::string hpstr = NLMISC::toString("()setBotHPScaleByAlias(%f, \"%s\");", hp, aliasToString(alias).c_str()); std::string hpstr = NLMISC::toString("()setBotHPScaleByAlias(%f, \"%s\");", hp, aliasToString(alias).c_str());
//CMessage msgout("EVENT_NPC_GROUP_SCRIPT"); //CMessage msgout("EVENT_NPC_GROUP_SCRIPT");
CMessage msgout("R2_NPC_BOT_SCRIPT_BY_ID"); CMessage msgout("R2_NPC_BOT_SCRIPT_BY_ID");
msgout.serial(messageVersion); msgout.serial(messageVersion);
@ -264,9 +254,6 @@ void CAiWrapperServer::setHPLevel(NLMISC::CEntityId entityId, uint32 alias, floa
msgout.serial(hpstr); msgout.serial(hpstr);
CUnifiedNetwork::getInstance()->send("AIS",msgout); CUnifiedNetwork::getInstance()->send("AIS",msgout);
} }
@ -378,7 +365,6 @@ void CAiWrapperServer::setPioneerRight(NLMISC::CEntityId entityId, const R2::TPi
msgout.serial(command); msgout.serial(command);
CUnifiedNetwork::getInstance()->send("EGS",msgout); CUnifiedNetwork::getInstance()->send("EGS",msgout);
} }
} }
else if (right == R2::TPioneerRight::Tester) else if (right == R2::TPioneerRight::Tester)
{ {
@ -400,7 +386,6 @@ void CAiWrapperServer::setPioneerRight(NLMISC::CEntityId entityId, const R2::TPi
msgout.serial(command); msgout.serial(command);
CUnifiedNetwork::getInstance()->send("EGS",msgout); CUnifiedNetwork::getInstance()->send("EGS",msgout);
} }
} }
else else
{ {

2
code/ryzom/server/src/ai_share/primitive_parser.cpp
View file

@ -3333,6 +3333,8 @@ static void parsePrimOutpost(const IPrimitive *prim, const std::string &mapName,
case AITypeManager: case AITypeManager:
parsePrimMgr(child, mapName, filename); parsePrimMgr(child, mapName, filename);
break; break;
default:
break;
} }
} }
} }

6
code/ryzom/server/src/entities_game_service/entity_manager/entity_callbacks.cpp
View file

@ -497,7 +497,6 @@ void cbClientReady( CMessage& msgin, const std::string &serviceName, NLNET::TSer
{ {
c->setWhoSeesMe(UINT64_CONSTANT(0xffffffffffffffff)); c->setWhoSeesMe(UINT64_CONSTANT(0xffffffffffffffff));
} }
} }
if (!IsRingShard && player->havePriv(AlwaysInvisiblePriv)) if (!IsRingShard && player->havePriv(AlwaysInvisiblePriv))
@ -1030,7 +1029,6 @@ CreationFailed:
return; return;
} }
void cbCreateChar_part2(uint32 userId, const CCreateCharMsg &createCharMsg, bool ok) void cbCreateChar_part2(uint32 userId, const CCreateCharMsg &createCharMsg, bool ok)
{ {
TLogNoContext_Character noContextCharacter; TLogNoContext_Character noContextCharacter;
@ -1254,7 +1252,6 @@ void sendCharactersSummary( CPlayer *player, bool AllAutorized, uint32 bitfieldO
} }
} }
// Build the message // Build the message
CBitMemStream bms; CBitMemStream bms;
if( chars.size() > 0 ) if( chars.size() > 0 )
@ -1526,8 +1523,6 @@ void cbClientTpAck( NLNET::CMessage& msgin, const std::string &serviceName, NLNE
ch->setWhoSeesMe( IsRingShard? R2_VISION::buildWhoSeesMe(R2_VISION::WHOSEESME_VISIBLE_PLAYER,true): UINT64_CONSTANT(0xffffffffffffffff) ); ch->setWhoSeesMe( IsRingShard? R2_VISION::buildWhoSeesMe(R2_VISION::WHOSEESME_VISIBLE_PLAYER,true): UINT64_CONSTANT(0xffffffffffffffff) );
} }
} }
} }
@ -2520,7 +2515,6 @@ void cbItemSwap( NLNET::CMessage& msgin, const std::string &serviceName, NLNET::
{ {
H_AUTO(cbItemSwap); H_AUTO(cbItemSwap);
CEntityId charId; CEntityId charId;
uint16 slotSrc, slotDst, quantity; uint16 slotSrc, slotDst, quantity;
INVENTORIES::TInventory inventorySrc, inventoryDst; INVENTORIES::TInventory inventorySrc, inventoryDst;

5
code/ryzom/server/src/entities_game_service/guild_manager/guild_manager.cpp
View file

@ -167,7 +167,6 @@ void CGuildManager::release()
#ifndef USE_PDS #ifndef USE_PDS
if(_Instance->_Container) if(_Instance->_Container)
{ {
for ( map<EGSPD::TGuildId, EGSPD::CGuildPD*>::iterator it = _Instance->_Container->getGuildsBegin(); it != _Instance->_Container->getGuildsEnd();++it ) for ( map<EGSPD::TGuildId, EGSPD::CGuildPD*>::iterator it = _Instance->_Container->getGuildsBegin(); it != _Instance->_Container->getGuildsEnd();++it )
{ {
CGuild * guild = EGS_PD_CAST<CGuild*>( (*it).second ); CGuild * guild = EGS_PD_CAST<CGuild*>( (*it).second );
@ -333,7 +332,6 @@ void CGuildManager::saveGuild( CGuild* guild )
} }
else else
{ {
string fileName = NLMISC::toString("guilds/guild_%05u.bin", id & 0x000fffff); string fileName = NLMISC::toString("guilds/guild_%05u.bin", id & 0x000fffff);
if( UseBS ) if( UseBS )
{ {
@ -935,7 +933,6 @@ void CGuildManager::deleteGuild(uint32 id)
// } // }
// else // else
// _FreeGuildIds.insert(id); // _FreeGuildIds.insert(id);
} }
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
@ -992,7 +989,6 @@ void CGuildManager::characterDeleted( CCharacter & user )
} }
} }
// if the guild is still valid, set the successor as leader // if the guild is still valid, set the successor as leader
if ( successor ) if ( successor )
{ {
@ -1669,7 +1665,6 @@ restartMemberLoop:
// A character connect/disconnect on another shard, update the online tags // A character connect/disconnect on another shard, update the online tags
void CGuildManager::characterConnectionEvent(const NLMISC::CEntityId &eid, bool online) void CGuildManager::characterConnectionEvent(const NLMISC::CEntityId &eid, bool online)
{ {
// iterate over all guild, for each look the member list and update online state if it is the concerned character // iterate over all guild, for each look the member list and update online state if it is the concerned character
if (_Container == NULL) if (_Container == NULL)

8
code/ryzom/server/src/entities_game_service/player_manager/character_inventory_manipulation.cpp
View file

@ -1243,8 +1243,8 @@ bool CCharacter::checkItemValidityWithEquipmentSlot( const CSheetId& sheet, uint
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool CCharacter::checkRightLeftHandCompatibility( const std::vector<std::string> itemRight, const std::vector<std::string> itemLeft ) bool CCharacter::checkRightLeftHandCompatibility( const std::vector<std::string> itemRight, const std::vector<std::string> itemLeft )
{ {
const int itemRightSlotSize = (int)itemRight.size(); const sint itemRightSlotSize = (sint)itemRight.size();
const int itemLeftSlotSize = (int)itemLeft.size(); const sint itemLeftSlotSize = (sint)itemLeft.size();
for( int i = 0; i < itemRightSlotSize; ++i ) for( int i = 0; i < itemRightSlotSize; ++i )
{ {
@ -1265,8 +1265,8 @@ bool CCharacter::checkRightLeftHandCompatibility( const std::vector<std::string>
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
bool CCharacter::checkIfItemCompatibleWithSlots( const std::vector<std::string> itemSlot, std::vector< uint16 > slots ) bool CCharacter::checkIfItemCompatibleWithSlots( const std::vector<std::string> itemSlot, std::vector< uint16 > slots )
{ {
const int itemSlotSize = (int)itemSlot.size(); const sint itemSlotSize = (sint)itemSlot.size();
const int typeSlotSize = (int)slots.size(); const sint typeSlotSize = (sint)slots.size();
for( int i = 0; i < itemSlotSize; ++i ) for( int i = 0; i < itemSlotSize; ++i )
{ {
for( int j = 0; j < typeSlotSize; ++j ) for( int j = 0; j < typeSlotSize; ++j )