mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-09-09 07:20:47 +02:00
Code Issues Projects Releases Wiki Activity

- bugfix network messages

Browse Source
This commit is contained in:
Mark Vejvoda
2012-03-31 00:52:43 +00:00
parent d8ba2443cf
commit 53d0204cb9
2 changed files with 25 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
source/glest_game/game/script_manager.cpp
View File

@@ -375,13 +375,16 @@ void ScriptManager::init(World* world, GameCamera *gameCamera, const XmlNode *ro
// ========================== events =============================================== // ========================== events ===============================================
void ScriptManager::onMessageBoxOk() { void ScriptManager::onMessageBoxOk(bool popFront) {
if(SystemFlags::getSystemSettingType(SystemFlags::debugLUA).enabled) SystemFlags::OutputDebug(SystemFlags::debugLUA,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__); if(SystemFlags::getSystemSettingType(SystemFlags::debugLUA).enabled) SystemFlags::OutputDebug(SystemFlags::debugLUA,"In [%s::%s Line: %d]\n",__FILE__,__FUNCTION__,__LINE__);
Lang &lang= Lang::getInstance(); Lang &lang= Lang::getInstance();
for(;messageQueue.empty() == false;) { for(int i = 0;messageQueue.empty() == false;++i) {
messageQueue.pop_front(); //printf("i = %d messageQueue.size() = %d popFront = %d\n",i,messageQueue.size(),popFront);
if(popFront == true) {
messageQueue.pop_front();
}
if(messageQueue.empty() == false) { if(messageQueue.empty() == false) {
// printf("onMessageBoxOk [%s] factionIndex = %d [%d] teamIndex = %d [%d][%d]\n", // printf("onMessageBoxOk [%s] factionIndex = %d [%d] teamIndex = %d [%d][%d]\n",
// wrapString(lang.getScenarioString(messageQueue.front().getText()), messageWrapCount).c_str(), // wrapString(lang.getScenarioString(messageQueue.front().getText()), messageWrapCount).c_str(),
@@ -391,10 +394,12 @@ void ScriptManager::onMessageBoxOk() {
if((messageQueue.front().getFactionIndex() < 0 && messageQueue.front().getTeamIndex() < 0) || if((messageQueue.front().getFactionIndex() < 0 && messageQueue.front().getTeamIndex() < 0) ||
messageQueue.front().getFactionIndex() == this->world->getThisFactionIndex() || messageQueue.front().getFactionIndex() == this->world->getThisFactionIndex() ||
messageQueue.front().getTeamIndex() == this->world->getThisTeamIndex()) { messageQueue.front().getTeamIndex() == this->world->getThisTeamIndex()) {
messageBox.setEnabled(true);
messageBox.setText(wrapString(lang.getScenarioString(messageQueue.front().getText()), messageWrapCount)); messageBox.setText(wrapString(lang.getScenarioString(messageQueue.front().getText()), messageWrapCount));
messageBox.setHeader(lang.getScenarioString(messageQueue.front().getHeader())); messageBox.setHeader(lang.getScenarioString(messageQueue.front().getHeader()));
break; break;
} }
popFront = true;
} }
} }
} }
@@ -672,14 +677,13 @@ void ScriptManager::networkShowMessageForFaction(const string &text, const strin
ScriptManager_STREFLOP_Wrapper streflopWrapper; ScriptManager_STREFLOP_Wrapper streflopWrapper;
Lang &lang= Lang::getInstance(); Lang &lang= Lang::getInstance();
messageQueue.push_back(ScriptManagerMessage(text, header, factionIndex)); messageQueue.push_back(ScriptManagerMessage(text, header, factionIndex));
onMessageBoxOk(false);
if(factionIndex == this->world->getThisFactionIndex()) { // if(factionIndex == this->world->getThisFactionIndex()) {
messageBox.setEnabled(true); // messageBox.setEnabled(true);
messageBox.setText(wrapString(lang.getScenarioString(messageQueue.front().getText()), messageWrapCount)); // messageBox.setText(wrapString(lang.getScenarioString(messageQueue.front().getText()), messageWrapCount));
messageBox.setHeader(lang.getScenarioString(messageQueue.front().getHeader())); // messageBox.setHeader(lang.getScenarioString(messageQueue.front().getHeader()));
} // }
} }
void ScriptManager::networkShowMessageForTeam(const string &text, const string &header,int teamIndex) { void ScriptManager::networkShowMessageForTeam(const string &text, const string &header,int teamIndex) {
ScriptManager_STREFLOP_Wrapper streflopWrapper; ScriptManager_STREFLOP_Wrapper streflopWrapper;
@@ -689,11 +693,12 @@ void ScriptManager::networkShowMessageForTeam(const string &text, const string &
// Team indexes are 0 based internally (but 1 based in the lua script) so convert // Team indexes are 0 based internally (but 1 based in the lua script) so convert
teamIndex--; teamIndex--;
messageQueue.push_back(ScriptManagerMessage(text, header, -1, teamIndex)); messageQueue.push_back(ScriptManagerMessage(text, header, -1, teamIndex));
if(teamIndex == this->world->getThisTeamIndex()) { onMessageBoxOk(false);
messageBox.setEnabled(true); // if(teamIndex == this->world->getThisTeamIndex()) {
messageBox.setText(wrapString(lang.getScenarioString(messageQueue.front().getText()), messageWrapCount)); // messageBox.setEnabled(true);
messageBox.setHeader(lang.getScenarioString(messageQueue.front().getHeader())); // messageBox.setText(wrapString(lang.getScenarioString(messageQueue.front().getText()), messageWrapCount));
} // messageBox.setHeader(lang.getScenarioString(messageQueue.front().getHeader()));
// }
} }
void ScriptManager::showMessage(const string &text, const string &header){ void ScriptManager::showMessage(const string &text, const string &header){
@@ -702,9 +707,10 @@ void ScriptManager::showMessage(const string &text, const string &header){
Lang &lang= Lang::getInstance(); Lang &lang= Lang::getInstance();
messageQueue.push_back(ScriptManagerMessage(text, header)); messageQueue.push_back(ScriptManagerMessage(text, header));
messageBox.setEnabled(true); onMessageBoxOk(false);
messageBox.setText(wrapString(lang.getScenarioString(messageQueue.front().getText()), messageWrapCount)); // messageBox.setEnabled(true);
messageBox.setHeader(lang.getScenarioString(messageQueue.front().getHeader())); // messageBox.setText(wrapString(lang.getScenarioString(messageQueue.front().getText()), messageWrapCount));
// messageBox.setHeader(lang.getScenarioString(messageQueue.front().getHeader()));
} }
void ScriptManager::clearDisplayText(){ void ScriptManager::clearDisplayText(){

2
source/glest_game/game/script_manager.h
View File

@@ -205,7 +205,7 @@ public:
const PlayerModifiers *getPlayerModifiers(int factionIndex) const {return &playerModifiers[factionIndex];} const PlayerModifiers *getPlayerModifiers(int factionIndex) const {return &playerModifiers[factionIndex];}
//events //events
void onMessageBoxOk(); void onMessageBoxOk(bool popFront=true);
void onResourceHarvested(); void onResourceHarvested();
void onUnitCreated(const Unit* unit); void onUnitCreated(const Unit* unit);
void onUnitDied(const Unit* unit); void onUnitDied(const Unit* unit);