Minor linux bugfixes and ignore of automatically created Makefile.in.
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2231 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
parent
171a051b1b
commit
94a1882435
@ -31,6 +31,7 @@ supertuxkart_SOURCES = main.cpp \
|
||||
actionmap.cpp actionmap.hpp \
|
||||
material.cpp material.hpp \
|
||||
network/network_manager.cpp network/network_manager.hpp \
|
||||
network/network_kart.cpp network/network_kart.hpp \
|
||||
network/remote_kart_info.hpp \
|
||||
material_manager.cpp material_manager.hpp \
|
||||
grand_prix_manager.cpp grand_prix_manager.hpp \
|
||||
|
@ -266,7 +266,7 @@ void NetworkManager::sendRaceInformationToClients()
|
||||
{
|
||||
const RemoteKartInfo& ki=race_manager->getLocalKartInfo(i);
|
||||
fprintf(stderr, "Sending kart '%s' playerid %d host %d\n",
|
||||
ki.getKartName(), ki.getLocalPlayerId(), ki.getHostId());
|
||||
ki.getKartName().c_str(), ki.getLocalPlayerId(), ki.getHostId());
|
||||
} // for i
|
||||
} // sendRaceInformationToClients
|
||||
|
||||
|
@ -26,9 +26,9 @@ class RemoteKartInfo
|
||||
{
|
||||
std::string m_kart_name;
|
||||
std::string m_user_name;
|
||||
int m_host_id;
|
||||
int m_local_player_id;
|
||||
int m_global_player_id;
|
||||
int m_host_id;
|
||||
|
||||
public:
|
||||
RemoteKartInfo(int player_id, const std::string& kart_name,
|
||||
@ -51,7 +51,7 @@ public:
|
||||
int getGlobalPlayerId() const { return m_global_player_id; }
|
||||
const std::string& getKartName() const {return m_kart_name; }
|
||||
const std::string& getPlayerName() const{return m_user_name; }
|
||||
bool operator<(const RemoteKartInfo& other)
|
||||
bool operator<(const RemoteKartInfo& other) const
|
||||
{
|
||||
return (m_host_id<other.m_host_id ||
|
||||
m_host_id==other.m_host_id && m_local_player_id<other.m_local_player_id);
|
||||
|
Loading…
x
Reference in New Issue
Block a user