- bugfix for headless admin to get message in his own language (if possible)
This commit is contained in:
parent
d9b624dbb8
commit
3773736212
|
@ -6809,8 +6809,8 @@ void Renderer::selectUsingSelectionBuffer(Selection::UnitContainer &units,
|
||||||
//glGetIntegerv(GL_VIEWPORT, view);
|
//glGetIntegerv(GL_VIEWPORT, view);
|
||||||
|
|
||||||
gluPickMatrix(x, y, w, h, view);
|
gluPickMatrix(x, y, w, h, view);
|
||||||
//gluPerspective(perspFov, metrics.getAspectRatio(), perspNearPlane, perspFarPlane);
|
gluPerspective(perspFov, metrics.getAspectRatio(), perspNearPlane, perspFarPlane);
|
||||||
gluPerspective(perspFov, metrics.getAspectRatio(), 0.0001, 1000.0);
|
//gluPerspective(perspFov, metrics.getAspectRatio(), 0.0001, 1000.0);
|
||||||
//gluPerspective(perspFov, (float)view[2]/(float)view[3], perspNearPlane, perspFarPlane);
|
//gluPerspective(perspFov, (float)view[2]/(float)view[3], perspNearPlane, perspFarPlane);
|
||||||
loadGameCameraMatrix();
|
loadGameCameraMatrix();
|
||||||
|
|
||||||
|
|
|
@ -839,12 +839,11 @@ void ConnectionSlot::update(bool checkForNewClients,int lockedSlotIndex) {
|
||||||
if(networkMessageLaunch.getMessageType() == nmtLaunch &&
|
if(networkMessageLaunch.getMessageType() == nmtLaunch &&
|
||||||
this->serverInterface->getConnectedSlotCount() < minHeadLessPlayersRequired) {
|
this->serverInterface->getConnectedSlotCount() < minHeadLessPlayersRequired) {
|
||||||
Lang &lang= Lang::getInstance();
|
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) {
|
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!";
|
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]);
|
msgTemplate = lang.get("HeadlessAdminRequiresMorePlayers",languageList[i]);
|
||||||
}
|
}
|
||||||
#ifdef WIN32
|
#ifdef WIN32
|
||||||
|
@ -857,6 +856,8 @@ void ConnectionSlot::update(bool checkForNewClients,int lockedSlotIndex) {
|
||||||
string sMsg = szBuf;
|
string sMsg = szBuf;
|
||||||
bool echoLocal = lang.isLanguageLocal(languageList[i]);
|
bool echoLocal = lang.isLanguageLocal(languageList[i]);
|
||||||
this->serverInterface->sendTextMessage(sMsg,-1, echoLocal, languageList[i], this->getPlayerIndex());
|
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 {
|
else {
|
||||||
|
|
Loading…
Reference in New Issue