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.
		
			
				
	
	
		
			27 lines
		
	
	
		
			684 B
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			27 lines
		
	
	
		
			684 B
		
	
	
	
		
			C
		
	
	
	
	
	
/* $Id$ */
 | 
						|
 | 
						|
#ifndef NETWORK_GUI_H
 | 
						|
#define NETWORK_GUI_H
 | 
						|
 | 
						|
#ifdef ENABLE_NETWORK
 | 
						|
 | 
						|
#include "network_data.h"
 | 
						|
 | 
						|
void ShowNetworkNeedPassword(NetworkPasswordType npt);
 | 
						|
void ShowNetworkGiveMoneyWindow(byte player); // PlayerID
 | 
						|
void ShowNetworkChatQueryWindow(DestType type, byte dest);
 | 
						|
void ShowJoinStatusWindow(void);
 | 
						|
void ShowNetworkGameWindow(void);
 | 
						|
void ShowClientList(void);
 | 
						|
 | 
						|
#else /* ENABLE_NETWORK */
 | 
						|
/* Network function stubs when networking is disabled */
 | 
						|
 | 
						|
static inline void ShowNetworkChatQueryWindow(byte desttype, byte dest) {}
 | 
						|
static inline void ShowClientList(void) {}
 | 
						|
static inline void ShowNetworkGameWindow(void) {}
 | 
						|
 | 
						|
#endif /* ENABLE_NETWORK */
 | 
						|
 | 
						|
#endif /* NETWORK_GUI_H */
 |