try to make world synch logging not use translated unit names
This commit is contained in:
parent
6cc8f6ac75
commit
4efc2f9cea
|
@ -1347,10 +1347,18 @@ void MenuStateConnectedGame::mouseClick(int x, int y, MouseButton mouseButton){
|
||||||
getMissingTilesetFromFTPServer = "";
|
getMissingTilesetFromFTPServer = "";
|
||||||
getMissingTechtreeFromFTPServer = "";
|
getMissingTechtreeFromFTPServer = "";
|
||||||
|
|
||||||
getInProgressSavedGameFromFTPServer = "";
|
|
||||||
getInProgressSavedGameFromFTPServerInProgress = false;
|
|
||||||
|
|
||||||
ClientInterface *clientInterface = networkManager.getClientInterface();
|
ClientInterface *clientInterface = networkManager.getClientInterface();
|
||||||
|
|
||||||
|
if(getInProgressSavedGameFromFTPServerInProgress == true) {
|
||||||
|
if(clientInterface != NULL) {
|
||||||
|
clientInterface->close();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
getInProgressSavedGameFromFTPServer = "";
|
||||||
|
getInProgressSavedGameFromFTPServerInProgress = false;
|
||||||
|
|
||||||
string serverUrl = clientInterface->getServerIpAddress();
|
string serverUrl = clientInterface->getServerIpAddress();
|
||||||
//int portNumber = config.getInt("FTPServerPort",intToStr(ServerSocket::getFTPServerPort()).c_str());
|
//int portNumber = config.getInt("FTPServerPort",intToStr(ServerSocket::getFTPServerPort()).c_str());
|
||||||
int portNumber = clientInterface->getServerFTPPort();
|
int portNumber = clientInterface->getServerFTPPort();
|
||||||
|
@ -3253,6 +3261,7 @@ void MenuStateConnectedGame::update() {
|
||||||
if(getInProgressSavedGameFromFTPServer == "") {
|
if(getInProgressSavedGameFromFTPServer == "") {
|
||||||
//printf("Requesting saved game file\n");
|
//printf("Requesting saved game file\n");
|
||||||
|
|
||||||
|
getInProgressSavedGameFromFTPServerInProgress = true;
|
||||||
// ftpClientThread->addTempFileToRequests(
|
// ftpClientThread->addTempFileToRequests(
|
||||||
// GameConstants::saveNetworkGameFileClient,
|
// GameConstants::saveNetworkGameFileClient,
|
||||||
// GameConstants::saveNetworkGameFileServer);
|
// GameConstants::saveNetworkGameFileServer);
|
||||||
|
|
|
@ -3691,7 +3691,7 @@ void Unit::logSynchDataCommon(string file,int line,string source,bool threadedMo
|
||||||
getFrameCount(),
|
getFrameCount(),
|
||||||
id,
|
id,
|
||||||
getFullName().c_str(),
|
getFullName().c_str(),
|
||||||
faction->getType()->getName().c_str(),
|
faction->getType()->getName(false).c_str(),
|
||||||
//getDesc().c_str(),
|
//getDesc().c_str(),
|
||||||
pos.getString().c_str(),
|
pos.getString().c_str(),
|
||||||
lastPos.getString().c_str(),
|
lastPos.getString().c_str(),
|
||||||
|
@ -3715,7 +3715,7 @@ void Unit::logSynchDataCommon(string file,int line,string source,bool threadedMo
|
||||||
|
|
||||||
string logDataText = "";
|
string logDataText = "";
|
||||||
char szBufDataText[8096]="";
|
char szBufDataText[8096]="";
|
||||||
snprintf(szBufDataText,8096,"----------------------------------- START [FRAME %d UNIT: %d - %s] ------------------------------------------------\n",getFrameCount(),this->id,this->getType()->getName().c_str());
|
snprintf(szBufDataText,8096,"----------------------------------- START [FRAME %d UNIT: %d - %s] ------------------------------------------------\n",getFrameCount(),this->id,this->getType()->getName(false).c_str());
|
||||||
logDataText = szBufDataText;
|
logDataText = szBufDataText;
|
||||||
|
|
||||||
snprintf(szBufDataText,8096,"[%s::%d]\n",extractFileFromDirectoryPath(file).c_str(),line);
|
snprintf(szBufDataText,8096,"[%s::%d]\n",extractFileFromDirectoryPath(file).c_str(),line);
|
||||||
|
@ -3727,7 +3727,7 @@ void Unit::logSynchDataCommon(string file,int line,string source,bool threadedMo
|
||||||
}
|
}
|
||||||
snprintf(szBufDataText,8096,"%s\n",szBuf);
|
snprintf(szBufDataText,8096,"%s\n",szBuf);
|
||||||
logDataText += szBufDataText;
|
logDataText += szBufDataText;
|
||||||
snprintf(szBufDataText,8096,"------------------------------------ END [FRAME %d UNIT: %d - %s] ------------------------------------------------\n",getFrameCount(),this->id,this->getType()->getName().c_str());
|
snprintf(szBufDataText,8096,"------------------------------------ END [FRAME %d UNIT: %d - %s] ------------------------------------------------\n",getFrameCount(),this->id,this->getType()->getName(false).c_str());
|
||||||
logDataText += szBufDataText;
|
logDataText += szBufDataText;
|
||||||
/*
|
/*
|
||||||
SystemFlags::OutputDebug(SystemFlags::debugWorldSynch,"----------------------------------- START [FRAME %d UNIT: %d - %s] ------------------------------------------------\n",getFrameCount(),this->id,this->getType()->getName().c_str());
|
SystemFlags::OutputDebug(SystemFlags::debugWorldSynch,"----------------------------------- START [FRAME %d UNIT: %d - %s] ------------------------------------------------\n",getFrameCount(),this->id,this->getType()->getName().c_str());
|
||||||
|
|
Loading…
Reference in New Issue
Block a user