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

Fixed waiting screen.

Browse Source
This commit is contained in:
hiker
2016-03-10 09:29:53 +11:00
parent b4d4f770ca
commit fc38acbea4
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/game_setup.hpp
View File

@@ -91,7 +91,7 @@ public:
// ------------------------------------------------------------------------
/** \brief Get the players that are in the game
* \return A vector containing pointers on the players profiles. */
const std::vector<NetworkPlayerProfile*>& getPlayers()
const std::vector<NetworkPlayerProfile*>& getPlayers() const
{
return m_players;
} // getPlayers

12
src/states_screens/waiting_for_others.cpp
View File

@@ -64,16 +64,14 @@ void WaitingForOthersScreen::init()
void WaitingForOthersScreen::onUpdate(float dt)
{
const std::vector<STKPeer*>& peers = STKHost::get()->getPeers();
const GameSetup *setup = STKHost::get()->getGameSetup();
const std::vector<NetworkPlayerProfile*> &all_profiles = setup->getPlayers();
RaceConfig* config = STKHost::get()->getGameSetup()->getRaceConfig();
core::stringw w;
for (unsigned int i = 0; i < peers.size(); i++)
for (unsigned int i = 0; i < all_profiles.size(); i++)
{
//race_manager->get
STKPeer* peer = peers[i];
NetworkPlayerProfile* profile = peer->getPlayerProfile();
const NetworkPlayerProfile* profile = all_profiles[i];
if (profile == NULL)
continue;
core::stringw name = profile->getName();