Fixed a bunch of compiler warnings (mingw compiler).
This commit is contained in:
@@ -96,8 +96,8 @@ protected:
|
||||
void SetGameData(const GameData &gameData);
|
||||
const StartData &GetStartData() const;
|
||||
void SetStartData(const StartData &startData);
|
||||
int GetGuiPlayerId() const;
|
||||
void SetGuiPlayerId(int guiPlayerId);
|
||||
unsigned GetGuiPlayerId() const;
|
||||
void SetGuiPlayerId(unsigned guiPlayerId);
|
||||
|
||||
boost::shared_ptr<Game> GetGame();
|
||||
|
||||
|
||||
@@ -282,7 +282,7 @@ ClientThread::Main()
|
||||
boost::shared_ptr<EngineFactory> factory(new ClientEngineFactory); // LocalEngine erstellen
|
||||
|
||||
MapPlayerDataList();
|
||||
if (GetPlayerDataList().size() != GetStartData().numberOfPlayers)
|
||||
if (GetPlayerDataList().size() != (unsigned)GetStartData().numberOfPlayers)
|
||||
throw NetException(ERR_NET_INVALID_PLAYER_COUNT, 0);
|
||||
m_game.reset(new Game(&m_gui, factory, GetPlayerDataList(), GetGameData(), GetStartData(), m_curGameId++));
|
||||
// Initialize GUI speed.
|
||||
@@ -441,14 +441,14 @@ ClientThread::SetStartData(const StartData &startData)
|
||||
m_startData = startData;
|
||||
}
|
||||
|
||||
int
|
||||
unsigned
|
||||
ClientThread::GetGuiPlayerId() const
|
||||
{
|
||||
return m_guiPlayerId;
|
||||
}
|
||||
|
||||
void
|
||||
ClientThread::SetGuiPlayerId(int guiPlayerId)
|
||||
ClientThread::SetGuiPlayerId(unsigned guiPlayerId)
|
||||
{
|
||||
m_guiPlayerId = guiPlayerId;
|
||||
}
|
||||
|
||||
@@ -47,7 +47,7 @@ utf8ToWchar(const char *str)
|
||||
{
|
||||
wchar_t *wstr = new wchar_t[reqLen];
|
||||
wstr[0] = L'\0';
|
||||
if (::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str, len, wstr, reqLen) == reqLen)
|
||||
if (::MultiByteToWideChar(CP_UTF8, MB_ERR_INVALID_CHARS, str, len, wstr, reqLen) == (int)reqLen)
|
||||
retStr = wstr;
|
||||
delete[] wstr;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user