From 707a26feb227fcca26466cb88545c975b2861603 Mon Sep 17 00:00:00 2001 From: Mark Vejvoda Date: Fri, 22 Oct 2010 16:35:16 +0000 Subject: [PATCH] - bugfix for server side player color index being wrong --- source/glest_game/network/server_interface.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/glest_game/network/server_interface.cpp b/source/glest_game/network/server_interface.cpp index 4abcc323..e619a6d3 100644 --- a/source/glest_game/network/server_interface.cpp +++ b/source/glest_game/network/server_interface.cpp @@ -974,7 +974,7 @@ void ServerInterface::waitUntilReady(Checksum* checksum){ void ServerInterface::sendTextMessage(const string &text, int teamIndex, bool echoLocal) { SystemFlags::OutputDebug(SystemFlags::debugNetwork,"In [%s::%s Line: %d] text [%s] teamIndex = %d, echoLocal = %d\n",__FILE__,__FUNCTION__,__LINE__,text.c_str(),teamIndex,echoLocal); - NetworkMessageText networkMessageText(text, getHumanPlayerName().c_str(), teamIndex, gameSettings.getThisFactionIndex()); + NetworkMessageText networkMessageText(text, getHumanPlayerName().c_str(), teamIndex, getHumanPlayerIndex()); broadcastMessage(&networkMessageText); if(echoLocal == true) { @@ -1373,7 +1373,7 @@ string ServerInterface::getHumanPlayerName(int index) { } int ServerInterface::getHumanPlayerIndex() const { - return gameSettings.getThisFactionIndex(); + return gameSettings.getStartLocationIndex(gameSettings.getThisFactionIndex()); } }}//end namespace