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

Fixed typoe (isclient vs isClient).

Browse Source
This commit is contained in:
hiker
2015-12-08 17:24:10 +11:00
parent 7fa062881d
commit 786f9eb693
3 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/network_config.hpp
View File

@@ -116,7 +116,7 @@ public:
bool isServer() const { return m_is_server; }
// --------------------------------------------------------------------
/** Returns if this instance is a client. */
bool isclient() const { return !m_is_server; }
bool isClient() const { return !m_is_server; }
// --------------------------------------------------------------------
/** Sets the name of this server. */
void setServerName(const irr::core::stringw &name)

4
src/network/network_console.cpp
View File

@@ -88,7 +88,7 @@ void* NetworkConsole::mainLoop(void* data)
assert(protocol);
protocol->startSelection();
}
else if (str == "select" && NetworkConfig::get()->isclient())
else if (str == "select" && NetworkConfig::get()->isClient())
{
std::string str2;
getline(std::cin, str2);
@@ -97,7 +97,7 @@ void* NetworkConsole::mainLoop(void* data)
ClientLobbyRoomProtocol* clrp = static_cast<ClientLobbyRoomProtocol*>(protocol);
clrp->requestKartSelection(str2);
}
else if (str == "vote" && NetworkConfig::get()->isclient())
else if (str == "vote" && NetworkConfig::get()->isClient())
{
std::cout << "Vote for ? (track/laps/reversed/major/minor/race#) :";
std::string str2;

5
src/network/protocols/start_game_protocol.cpp
View File

@@ -30,8 +30,7 @@ StartGameProtocol::StartGameProtocol(GameSetup* game_setup)
m_game_setup->getPlayers();
for (unsigned int i = 0; i < players.size(); i++)
{
std::pair<NetworkPlayerProfile*, STATE> player_state(players[i], LOADING);
m_player_states.insert(player_state);
m_player_states[ players[i] ] = LOADING;
}
m_ready_count = 0;
} // StartGameProtocol
@@ -236,7 +235,7 @@ void StartGameProtocol::update()
void StartGameProtocol::ready()
{
// On clients this means the loading is finished
if (NetworkConfig::get()->isclient())
if (NetworkConfig::get()->isClient())
{
assert(STKHost::get()->getPeerCount() == 1);
NetworkString ns(5);