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

Fixed linux compilation problems.

Browse Source 
git-svn-id: svn+ssh://svn.code.sf.net/p/supertuxkart/code/trunk/supertuxkart@2227 178a84e3-b1eb-0310-8ba1-8eac791a3b58
This commit is contained in:
hikerstk
2008-09-07 13:44:10 +00:00
parent 44f5691bab
commit 15c834e849
4 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main.cpp
View File

@@ -67,7 +67,7 @@
#include "translation.hpp"
#include "highscore_manager.hpp"
#include "grand_prix_manager.hpp"
#include "network_manager.hpp"
#include "network/network_manager.hpp"
#include "gui/menu_manager.hpp"
#include "scene.hpp"

2
src/network/network_manager.cpp
View File

@@ -219,7 +219,7 @@ void NetworkManager::sendKartsInformationToServer()
for(int i=0; i<(int)race_manager->getNumLocalPlayers(); i++)
{
fprintf(stderr, "Sending name '%s', ",user_config->m_player[i].getName().c_str());
fprintf(stderr, "kart name '%s'\n", race_manager->getLocalPlayerKart(i));
fprintf(stderr, "kart name '%s'\n", race_manager->getLocalPlayerKart(i).getKartName().c_str());
} // for i<getNumLocalPlayers
fprintf(stderr, "Client sending kart information to server\n");
} // sendKartsInformationToServer

3
src/network/remote_kart_info.hpp
View File

@@ -36,8 +36,9 @@ public:
RemoteKartInfo() {m_kart_name=""; m_user_name=""; m_client_id=-1; m_player_id=-1;}
void setKartName(const std::string& n) { m_kart_name = n; }
void setUserName(const std::string& u) { m_user_name = u; }
void setHostId(int id) { m_client_id = id; }
void setClientId(int id) { m_client_id = id; }
void setPlayerId(int id) { m_player_id = id; }
const std::string& getKartName() const {return m_kart_name; }
}; // RemoteKartInfo
#endif

4
src/race_manager.cpp
View File

@@ -29,7 +29,7 @@
#include "scene.hpp"
#include "user_config.hpp"
#include "stk_config.hpp"
#include "network_manager.hpp"
#include "network/network_manager.hpp"
RaceManager* race_manager= NULL;
@@ -69,7 +69,7 @@ void RaceManager::setLocalPlayerKart(unsigned int player, const std::string& kar
setNumLocalPlayers(player+1);
m_local_player_karts[player].setPlayerId(player);
m_local_player_karts[player].setKartName(kart);
m_local_player_karts[player].setHostId(network_manager->getHostId());
m_local_player_karts[player].setClientId(network_manager->getClientId());
}
else
{