Rampoina
/
MegaGlest
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

- bugfix for headless admin to get message in his own language (if possible)

This commit is contained in:
Mark Vejvoda 2012-11-15 14:45:22 +00:00
parent d9b624dbb8
commit 3773736212
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
source/glest_game/graphics/renderer.cpp
View File

@ -6809,8 +6809,8 @@ void Renderer::selectUsingSelectionBuffer(Selection::UnitContainer &units,
//glGetIntegerv(GL_VIEWPORT, view);
gluPickMatrix(x, y, w, h, view);
//gluPerspective(perspFov, metrics.getAspectRatio(), perspNearPlane, perspFarPlane);
gluPerspective(perspFov, metrics.getAspectRatio(), 0.0001, 1000.0);
gluPerspective(perspFov, metrics.getAspectRatio(), perspNearPlane, perspFarPlane);
//gluPerspective(perspFov, metrics.getAspectRatio(), 0.0001, 1000.0);
//gluPerspective(perspFov, (float)view[2]/(float)view[3], perspNearPlane, perspFarPlane);
loadGameCameraMatrix();

9
source/glest_game/network/connection_slot.cpp
View File

@ -839,12 +839,11 @@ void ConnectionSlot::update(bool checkForNewClients,int lockedSlotIndex) {
if(networkMessageLaunch.getMessageType() == nmtLaunch &&
this->serverInterface->getConnectedSlotCount() < minHeadLessPlayersRequired) {
Lang &lang= Lang::getInstance();
const vector<string> languageList = this->gameSettings.getUniqueNetworkPlayerLanguages();
const vector<string> languageList = this->serverInterface->getGameSettings()->getUniqueNetworkPlayerLanguages();
for(unsigned int i = 0; i < languageList.size(); ++i) {
char szBuf[4096]="";
char szBuf[4096]="";
string msgTemplate = "You must have have at least %d player(s) connected to start this game!";
if(lang.hasString("HeadlessAdminRequiresMorePlayers") == true) {
if(lang.hasString("HeadlessAdminRequiresMorePlayers",languageList[i]) == true) {
msgTemplate = lang.get("HeadlessAdminRequiresMorePlayers",languageList[i]);
}
#ifdef WIN32
@ -857,6 +856,8 @@ void ConnectionSlot::update(bool checkForNewClients,int lockedSlotIndex) {
string sMsg = szBuf;
bool echoLocal = lang.isLanguageLocal(languageList[i]);
this->serverInterface->sendTextMessage(sMsg,-1, echoLocal, languageList[i], this->getPlayerIndex());
//printf("Lang [%s] msgTemplate [%s] echoLocal = %d\n",languageList[i].c_str(),msgTemplate.c_str(),echoLocal);
}
}
else {