Fix compiler warnings

This commit is contained in:
Benau 2018-03-16 19:06:20 +08:00
parent 0fef316313
commit 78ac3a922d
5 changed files with 14 additions and 14 deletions

View File

@ -198,8 +198,8 @@ void ClientLobby::addAllPlayers(Event* event)
std::string track_name;
data.decodeString(&track_name);
uint8_t lap = data.getUInt8();
bool reverse = (bool)data.getUInt8();
m_game_setup->setRace(track_name, lap, reverse);
uint8_t reverse = data.getUInt8();
m_game_setup->setRace(track_name, lap, reverse == 1);
std::shared_ptr<STKPeer> peer = event->getPeerSP();
peer->cleanPlayerProfiles();
@ -336,13 +336,13 @@ void ClientLobby::displayPlayerVote(Event* event)
Log::fatal("ClientLobby", "Missing track %s", track_name.c_str());
core::stringw track_readable = track->getName();
int lap = data.getUInt8();
bool reversed = (bool)data.getUInt8();
int rev = data.getUInt8();
int t = data.getUInt8();
core::stringw yes = _("Yes");
core::stringw no = _("No");
//I18N: Vote message in network game from a player
core::stringw vote_msg = _("Track: %s, laps: %d, reversed: %s, "
"remaining time: %ds", track_readable, lap, reversed ? yes : no, t);
"remaining time: %ds", track_readable, lap, rev == 1 ? yes : no, t);
vote_msg = player_name + vote_msg;
MessageQueue::add(MessageQueue::MT_NETWORK_MSG, vote_msg);
} // displayPlayerVote

View File

@ -87,10 +87,10 @@ void LobbyProtocol::configRemoteKart(
const std::vector<std::shared_ptr<NetworkPlayerProfile> >& players) const
{
// The number of karts includes the AI karts, which are not supported atm
race_manager->setNumKarts(players.size());
race_manager->setNumKarts((int)players.size());
// Set number of global and local players.
race_manager->setNumPlayers(players.size(),
race_manager->setNumPlayers((int)players.size(),
m_game_setup->getNumLocalPlayers());
// Create the kart information for the race manager:

View File

@ -1056,9 +1056,9 @@ void ServerLobby::playerVote(Event* event)
std::string track_name;
data.decodeString(&track_name);
uint8_t lap = data.getUInt8();
bool reverse = (bool)data.getUInt8();
uint8_t reverse = data.getUInt8();
m_peers_votes[event->getPeerSP()] =
std::make_tuple(track_name,lap, reverse);
std::make_tuple(track_name, lap, reverse == 1);
other.addUInt8((uint8_t)remaining_time);
sendMessageToPeersChangingToken(&other);
@ -1073,7 +1073,7 @@ std::tuple<std::string, uint8_t, bool> ServerLobby::handleVote()
std::advance(it, rg.get((int)m_available_kts.second.size()));
std::string final_track = *it;
unsigned final_laps = UserConfigParams::m_num_laps;
bool final_reverse = (bool)(final_track.size() % 2);
bool final_reverse = final_track.size() % 2 == 0;
std::map<std::string, unsigned> tracks;
std::map<unsigned, unsigned> laps;

View File

@ -150,7 +150,7 @@ Online::XMLRequest* ServersManager::getLANRefreshRequest() const
double start_time = StkTime::getRealTime();
const double DURATION = 1.0;
const auto& servers = ServersManager::get()->getServers();
int cur_server_id = servers.size();
int cur_server_id = (int)servers.size();
assert(cur_server_id == 0);
std::vector<std::shared_ptr<Server> > servers_now;
while (StkTime::getRealTime() - start_time < DURATION)
@ -178,7 +178,7 @@ Online::XMLRequest* ServersManager::getLANRefreshRequest() const
uint8_t password = s.getUInt8();
servers_now.emplace_back(std::make_shared<Server>
(cur_server_id++, name, max_players, players,
difficulty, mode, sender, password));
difficulty, mode, sender, password == 1));
} // if received_data
} // while still waiting
m_success = true;

View File

@ -86,8 +86,8 @@ private:
/** Let (atm enet_peer_send and enet_peer_disconnect) run in the listening
* thread. */
std::list<std::tuple<ENetPeer*/*peer receive*/,
ENetPacket*/*packet to send*/, uint32_t/*integer data*/,
std::list<std::tuple</*peer receive*/ENetPeer*,
/*packet to send*/ENetPacket*, /*integer data*/uint32_t,
ENetCommandType> > m_enet_cmd;
/** Protect \ref m_enet_cmd from multiple threads usage. */
@ -288,7 +288,7 @@ public:
unsigned int getPeerCount() const
{
std::lock_guard<std::mutex> lock(m_peers_mutex);
return m_peers.size();
return (unsigned)m_peers.size();
}
// ------------------------------------------------------------------------
/** Sets the global host id of this host (client use). */