mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 14:57:44 +00:00
Code Activity

signed/unsigned mismatch issues

Browse source 
- Move for...loop int to size_t
- Move int32_t to uint32_t
This commit is contained in:
ShelbyZ 2017-10-19 07:12:09 -07:00
parent 72ebf7542e
commit 32a9d976f7
5 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/servers/Server_Lobby/GameConnection.cpp
View file

@ -152,7 +152,7 @@ void Core::Network::GameConnection::getCharList( FFXIVARR_PACKET_RAW& packet, ui
auto charList = g_restConnector.getCharList( ( char * )m_pSession->getSessionId() ); auto charList = g_restConnector.getCharList( ( char * )m_pSession->getSessionId() );
int32_t charIndex = 0; uint32_t charIndex = 0;
for( uint8_t i = 0; i < 4; i++ ) for( uint8_t i = 0; i < 4; i++ )
{ {

2
src/servers/Server_Lobby/ServerLobby.cpp
View file

@ -89,7 +89,7 @@ namespace Core {
return false; return false;
} }
std::vector<std::string> args( argv + 1, argv + argc ); std::vector<std::string> args( argv + 1, argv + argc );
for( auto i = 0; i + 1 < args.size(); i += 2 ) for( size_t i = 0; i + 1 < args.size(); i += 2 )
{ {
std::string arg( "" ); std::string arg( "" );
std::string val( "" ); std::string val( "" );

2
src/servers/Server_REST/PlayerMinimal.cpp
View file

@ -185,7 +185,7 @@ namespace Core {
uint16_t size = static_cast< uint16_t >( m_lookMap.size() ); uint16_t size = static_cast< uint16_t >( m_lookMap.size() );
for( int32_t i = 0; i < m_lookMap.size(); i++ ) for( uint32_t i = 0; i < m_lookMap.size(); i++ )
{ {
customize[i] = m_lookMap[i]; customize[i] = m_lookMap[i];
} }

2
src/servers/Server_REST/main.cpp
View file

@ -71,7 +71,7 @@ bool loadSettings( int32_t argc, char* argv[] )
} }
std::vector<std::string> args( argv + 1, argv + argc ); std::vector<std::string> args( argv + 1, argv + argc );
for( auto i = 0; i + 1 < args.size(); i += 2 ) for( size_t i = 0; i + 1 < args.size(); i += 2 )
{ {
std::string arg( "" ); std::string arg( "" );
std::string val( "" ); std::string val( "" );

10
src/tools/quest_parser/main.cpp
View file

@ -91,7 +91,7 @@ void createScript( boost::shared_ptr< Core::Data::QuestInfo > pQuestData, std::s
if( pQuestData->reward_item.size() > 0 ) if( pQuestData->reward_item.size() > 0 )
{ {
rewards += " this.RewardItem = ["; rewards += " this.RewardItem = [";
for( int ca = 0; ca < pQuestData->reward_item.size(); ca++ ) for( size_t ca = 0; ca < pQuestData->reward_item.size(); ca++ )
{ {
rewards += std::to_string( pQuestData->reward_item.at( ca ) ); rewards += std::to_string( pQuestData->reward_item.at( ca ) );
if( ca != pQuestData->reward_item.size() - 1 ) if( ca != pQuestData->reward_item.size() - 1 )
@ -105,7 +105,7 @@ void createScript( boost::shared_ptr< Core::Data::QuestInfo > pQuestData, std::s
if( pQuestData->reward_item.size() > 0 ) if( pQuestData->reward_item.size() > 0 )
{ {
rewards += " this.RewardItemCount = ["; rewards += " this.RewardItemCount = [";
for( int ca = 0; ca < pQuestData->reward_item_count.size(); ca++ ) for( size_t ca = 0; ca < pQuestData->reward_item_count.size(); ca++ )
{ {
rewards += std::to_string( pQuestData->reward_item_count.at( ca ) ); rewards += std::to_string( pQuestData->reward_item_count.at( ca ) );
if( ca != pQuestData->reward_item_count.size() - 1 ) if( ca != pQuestData->reward_item_count.size() - 1 )
@ -119,7 +119,7 @@ void createScript( boost::shared_ptr< Core::Data::QuestInfo > pQuestData, std::s
if( pQuestData->reward_item_optional.size() > 0 ) if( pQuestData->reward_item_optional.size() > 0 )
{ {
rewards += " this.RewardItemOptional = ["; rewards += " this.RewardItemOptional = [";
for( int ca = 0; ca < pQuestData->reward_item_optional.size(); ca++ ) for( size_t ca = 0; ca < pQuestData->reward_item_optional.size(); ca++ )
{ {
rewards += std::to_string( pQuestData->reward_item_optional.at( ca ) ); rewards += std::to_string( pQuestData->reward_item_optional.at( ca ) );
if( ca != pQuestData->reward_item_optional.size() - 1 ) if( ca != pQuestData->reward_item_optional.size() - 1 )
@ -133,7 +133,7 @@ void createScript( boost::shared_ptr< Core::Data::QuestInfo > pQuestData, std::s
if( pQuestData->reward_item_optional_count.size() > 0 ) if( pQuestData->reward_item_optional_count.size() > 0 )
{ {
rewards += " this.RewardItemOptionalCount = ["; rewards += " this.RewardItemOptionalCount = [";
for( int ca = 0; ca < pQuestData->reward_item_optional_count.size(); ca++ ) for( size_t ca = 0; ca < pQuestData->reward_item_optional_count.size(); ca++ )
{ {
rewards += std::to_string( pQuestData->reward_item_optional_count.at( ca ) ); rewards += std::to_string( pQuestData->reward_item_optional_count.at( ca ) );
if( ca != pQuestData->reward_item_optional_count.size() - 1 ) if( ca != pQuestData->reward_item_optional_count.size() - 1 )
@ -151,7 +151,7 @@ void createScript( boost::shared_ptr< Core::Data::QuestInfo > pQuestData, std::s
std::vector< std::string > script_entities; std::vector< std::string > script_entities;
std::string sentities = " // Entities found in the script data of the quest\n"; std::string sentities = " // Entities found in the script data of the quest\n";
for( int ca = 0; ca < pQuestData->script_entity.size(); ca ++ ) for( size_t ca = 0; ca < pQuestData->script_entity.size(); ca ++ )
{ {
if( ( pQuestData->script_entity.at( ca ).find( "HOWTO" ) != std::string::npos ) || ( pQuestData->script_entity.at( ca ).find( "HOW_TO" ) != std::string::npos ) ) if( ( pQuestData->script_entity.at( ca ).find( "HOWTO" ) != std::string::npos ) || ( pQuestData->script_entity.at( ca ).find( "HOW_TO" ) != std::string::npos ) )
continue; continue;