dave/openttd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(svn r7638) -Codechange: Remove special window ShowJoinStatusWindowAfterJoin and shuffle around

Browse Source 
some code for SetupColorsAndInitialWindow. Because we know that after a successful
 load all windows are removed we can setup default windows in this function, and
 show ShowJoinStatusWindow in PACKET_SERVER_MAP.
-Setup the global _network_join_status for ShowJoinStatusWindow in the only two
 places where the function is called, instead of inside it.
-Turn the join status window into a modal window of the network window so it
 stays on top.
This commit is contained in:
Darkvater
2006-12-30 01:52:09 +00:00
parent 990270fda9
commit 6250b90a6b
5 changed files with 26 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
main_gui.c
View File

@@ -2359,7 +2359,6 @@ static void MainWindowWndProc(Window *w, WindowEvent *e)
void ShowSelectGameWindow(void);
extern void ShowJoinStatusWindowAfterJoin(void);
void SetupColorsAndInitialWindow(void)
{
@@ -2377,32 +2376,20 @@ void SetupColorsAndInitialWindow(void)
width = _screen.width;
height = _screen.height;
w = AllocateWindow(0, 0, width, height, MainWindowWndProc, WC_MAIN_WINDOW, NULL);
AssignWindowViewport(w, 0, 0, width, height, TileXY(32, 32), 0);
// XXX: these are not done
switch (_game_mode) {
case GM_MENU:
w = AllocateWindow(0, 0, width, height, MainWindowWndProc, WC_MAIN_WINDOW, NULL);
AssignWindowViewport(w, 0, 0, width, height, TileXY(32, 32), 0);
ShowSelectGameWindow();
break;
case GM_NORMAL:
w = AllocateWindow(0, 0, width, height, MainWindowWndProc, WC_MAIN_WINDOW, NULL);
AssignWindowViewport(w, 0, 0, width, height, TileXY(32, 32), 0);
default: NOT_REACHED();
case GM_MENU:
ShowSelectGameWindow();
break;
ShowVitalWindows();
/* Bring joining GUI to front till the client is really joined */
if (_networking && !_network_server)
ShowJoinStatusWindowAfterJoin();
break;
case GM_EDITOR:
w = AllocateWindow(0, 0, width, height, MainWindowWndProc, WC_MAIN_WINDOW, NULL);
AssignWindowViewport(w, 0, 0, width, height, 0, 0);
ShowVitalWindows();
break;
default:
NOT_REACHED();
case GM_NORMAL:
case GM_EDITOR:
ShowVitalWindows();
break;
}
}