ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed windows compilation (missing lib), and some compiler warnings.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/main/trunk@14641 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk 2013-12-06 03:54:31 +00:00
parent b074dc5f09
commit 86b1b67c61
4 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CMakeLists.txt
View File

@ -267,6 +267,9 @@ if(USE_WIIUSE)
endif()
if(MSVC)
target_link_libraries(supertuxkart iphlpapi.lib)
endif()
# Optional tools
add_subdirectory(tools/font_tool)

2
src/network/protocol_manager.cpp
View File

@ -150,7 +150,7 @@ void ProtocolManager::notifyEvent(Event* event)
if (protocols_ids.size() != 0)
{
EventProcessingInfo epi;
epi.arrival_time = StkTime::getTimeSinceEpoch();
epi.arrival_time = (double)StkTime::getTimeSinceEpoch();
epi.event = event2;
epi.protocols_ids = protocols_ids;
m_events_to_process.push_back(epi); // add the event to the queue

14
src/network/race_config.cpp
View File

@ -11,7 +11,7 @@ template<typename S>
S getHighestInHistogram(std::map<S,int>* histogram)
{
S best_item;
uint8_t highest_count;
uint8_t highest_count = histogram->begin()->second;
for (typename std::map<S, int>::iterator it = histogram->begin();
it != histogram->end(); it++)
{
@ -260,7 +260,7 @@ void RaceConfig::computeRaceMode()
{
major_histogram.at(m_votes[i].getMajorVote()) ++;
}
catch (const std::out_of_range& oor) // doesn't exist in the map
catch (const std::out_of_range&) // doesn't exist in the map
{
major_histogram[m_votes[i].getMajorVote()] = 1;
}
@ -271,7 +271,7 @@ void RaceConfig::computeRaceMode()
{
races_count_histogram.at(m_votes[i].getRacesCountVote()) ++;
}
catch (const std::out_of_range& oor) // doesn't exist in the map
catch (const std::out_of_range&) // doesn't exist in the map
{
races_count_histogram[m_votes[i].getRacesCountVote()] = 1;
}
@ -282,7 +282,7 @@ void RaceConfig::computeRaceMode()
{
minor_histogram.at(m_votes[i].getMinorVote()) ++;
}
catch (const std::out_of_range& oor) // doesn't exist in the map
catch (const std::out_of_range&) // doesn't exist in the map
{
minor_histogram[m_votes[i].getMinorVote()] = 1;
}
@ -320,7 +320,7 @@ void RaceConfig::computeNextTrack()
{
tracks_histogram.at(m_votes[i].getTrackVote()) ++;
}
catch (const std::out_of_range& oor) // doesn't exist in the map
catch (const std::out_of_range&) // doesn't exist in the map
{
tracks_histogram[m_votes[i].getTrackVote()] = 1;
}
@ -331,7 +331,7 @@ void RaceConfig::computeNextTrack()
{
reversed_histogram.at(m_votes[i].getReversedVote()) ++;
}
catch (const std::out_of_range& oor) // doesn't exist in the map
catch (const std::out_of_range&) // doesn't exist in the map
{
reversed_histogram[m_votes[i].getReversedVote()] = 1;
}
@ -342,7 +342,7 @@ void RaceConfig::computeNextTrack()
{
laps_histogram.at(m_votes[i].getLapsVote()) ++;
}
catch (const std::out_of_range& oor) // doesn't exist in the mapt
catch (const std::out_of_range&) // doesn't exist in the mapt
{
laps_histogram[m_votes[i].getLapsVote()] = 1;
}

2
src/network/race_config.hpp
View File

@ -88,7 +88,7 @@ class RaceConfig
std::vector<TrackInfo> m_tracks;
int m_minor_mode;
int m_major_mode;
int m_races_count;
unsigned int m_races_count;
std::vector<RaceVote> m_votes;
uint8_t m_max_players;