Fixed warnings from linux and Android compilers

Cleaned up network code on Linux, it still does not work correctly
This commit is contained in:
Xawotihs@gmail.com
2013-01-26 22:17:43 +00:00
parent 5b0f5bd90f
commit eec9bb44a8
20 changed files with 25 additions and 27 deletions

View File

@@ -102,11 +102,6 @@ GameState(parent, "duel")
#endif
credits = NULL;
#ifdef NETWORK_SUPPORT
RegisterNetworkPlayers();
#endif //NETWORK_SUPPORT
}
GameStateDuel::~GameStateDuel()
@@ -907,7 +902,7 @@ void GameStateDuel::ButtonPressed(int controllerId, int controlId)
game->loadPlayer(0, mParent->players[0], deckNumber, premadeDeck);
deckmenu->Close();
#ifdef NETWORK_SUPPORT
if(mParent->players[1] == PLAYER_TYPE_REMOTE)
if(mParent->mpNetwork)
{ // no need to choose an opponent deck in network mode
setGamePhase(DUEL_STATE_OPPONENT_WAIT);
}