mirror-games/glest-source
1
0
Fork 0
mirror of https://github.com/glest/glest-source.git synced 2025-08-11 19:04:00 +02:00
Code Issues Projects Releases Wiki Activity

- more bugfixes for ftp painting

Browse Source
This commit is contained in:
Mark Vejvoda
2011-01-09 09:05:34 +00:00
parent 5a8f05e8af
commit 26cdb8ccad
4 changed files with 13 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1657,7 +1657,7 @@ void Renderer::renderMessageBox(const GraphicMessageBox *messageBox) {
glPopAttrib(); glPopAttrib();
glDisable(GL_BLEND);
//buttons //buttons
renderButton(messageBox->getButton1()); renderButton(messageBox->getButton1());
if(messageBox->getButtonCount()==2){ if(messageBox->getButtonCount()==2){

24
source/glest_game/menu/menu_state_connected_game.cpp
View File

@@ -412,6 +412,7 @@ MenuStateConnectedGame::MenuStateConnectedGame(Program *program, MainMenu *mainM
ftpClientThread->start(); ftpClientThread->start();
} }
//showFTPMessageBox("test", lang.get("Question"), false);
SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__); SystemFlags::OutputDebug(SystemFlags::debugSystem,"In [%s::%s Line %d]\n",__FILE__,__FUNCTION__,__LINE__);
} }
@@ -631,13 +632,6 @@ void MenuStateConnectedGame::render() {
if(mainMessageBox.getEnabled()) { if(mainMessageBox.getEnabled()) {
renderer.renderMessageBox(&mainMessageBox); renderer.renderMessageBox(&mainMessageBox);
} }
if(ftpMessageBox.getEnabled()) {
renderer.renderMessageBox(&ftpMessageBox);
}
//if(ftpMessageBox.getEnabled()) {
// renderer.renderMessageBox(&ftpMessageBox);
//}
if (!initialSettingsReceivedFromServer) return; if (!initialSettingsReceivedFromServer) return;
@@ -770,8 +764,6 @@ void MenuStateConnectedGame::render() {
renderer.renderLabel(&labelNetworkPauseGameForLaggedClients); renderer.renderLabel(&labelNetworkPauseGameForLaggedClients);
renderer.renderListBox(&listBoxNetworkPauseGameForLaggedClients); renderer.renderListBox(&listBoxNetworkPauseGameForLaggedClients);
if(program != NULL) program->renderProgramMsgBox();
MutexSafeWrapper safeMutexFTPProgress((ftpClientThread != NULL ? ftpClientThread->getProgressMutex() : NULL),string(__FILE__) + "_" + intToStr(__LINE__)); MutexSafeWrapper safeMutexFTPProgress((ftpClientThread != NULL ? ftpClientThread->getProgressMutex() : NULL),string(__FILE__) + "_" + intToStr(__LINE__));
if(fileFTPProgressList.size() > 0) { if(fileFTPProgressList.size() > 0) {
int yLocation = buttonDisconnect.getY(); int yLocation = buttonDisconnect.getY();
@@ -793,6 +785,15 @@ void MenuStateConnectedGame::render() {
} }
safeMutexFTPProgress.ReleaseLock(); safeMutexFTPProgress.ReleaseLock();
if(mainMessageBox.getEnabled()) {
renderer.renderMessageBox(&mainMessageBox);
}
if(ftpMessageBox.getEnabled()) {
renderer.renderMessageBox(&ftpMessageBox);
}
if(program != NULL) program->renderProgramMsgBox();
if(enableMapPreview && (mapPreview.hasFileLoaded() == true)) { if(enableMapPreview && (mapPreview.hasFileLoaded() == true)) {
int mouseX = mainMenu->getMouseX(); int mouseX = mainMenu->getMouseX();
@@ -805,11 +806,6 @@ void MenuStateConnectedGame::render() {
} }
renderer.renderChatManager(&chatManager); renderer.renderChatManager(&chatManager);
renderer.renderConsole(&console,showFullConsole,true); renderer.renderConsole(&console,showFullConsole,true);
if(mainMessageBox.getEnabled()) {
renderer.renderMessageBox(&mainMessageBox);
}
} }
catch(const std::exception &ex) { catch(const std::exception &ex) {
char szBuf[1024]=""; char szBuf[1024]="";

2
source/shared_lib/sources/feathery_ftp/ftpTargetPosix.c
View File

@@ -421,7 +421,7 @@ int ftpSelect(int poll)
if(poll) if(poll)
{ {
struct timeval t = {0}; struct timeval t = {0};
t.tv_usec = 10000; t.tv_usec = 100;
return select(maxSockNr+1, &signaledSockets, NULL, NULL, &t); return select(maxSockNr+1, &signaledSockets, NULL, NULL, &t);
} }
else else

2
source/shared_lib/sources/feathery_ftp/ftpTargetWin32.c
View File

@@ -454,7 +454,7 @@ int ftpSelect(int poll)
if(poll) if(poll)
{ {
struct timeval t = {0}; struct timeval t = {0};
t.tv_usec = 10000; t.tv_usec = 100;
return select(maxSockNr+1, &signaledSockets, NULL, NULL, &t); return select(maxSockNr+1, &signaledSockets, NULL, NULL, &t);
} }
else else