[Slashem-checkins] CVS: slashem/win/gtk2 gtk.c,1.26,1.27

[J. A. H. <j_...@us...>]

Update of /cvsroot/slashem/slashem/win/gtk2
In directory sc8-pr-cvs1:/tmp/cvs-serv27698/win/gtk2

Modified Files:
	gtk.c 
Log Message:
Proxy: optimize player selection query to reduce start-up delay.


Index: gtk.c
===================================================================
RCS file: /cvsroot/slashem/slashem/win/gtk2/gtk.c,v
retrieving revision 1.26
retrieving revision 1.27
diff -C2 -r1.26 -r1.27
*** gtk.c	29 Dec 2002 21:34:52 -0000	1.26
--- gtk.c	31 Dec 2002 21:30:43 -0000	1.27
***************
*** 1203,1212 ****
  
  #ifdef GTK_PROXY
! #define valid_race(role, race)	proxy_cb_is_valid_selection(role, race, -1, -1)
  
  static boolean
  valid_gend(int role, int race, int gend)
  {
!     return proxy_cb_is_valid_selection(role, race, gend, -1);
  }
  
--- 1203,1212 ----
  
  #ifdef GTK_PROXY
! #define valid_race(role, race)	proxy_cb_valid_selection_check(role, race, -1, -1)
  
  static boolean
  valid_gend(int role, int race, int gend)
  {
!     return proxy_cb_valid_selection_check(role, race, gend, -1);
  }
  
***************
*** 1214,1218 ****
  valid_align(int role, int race, int align)
  {
!     return proxy_cb_is_valid_selection(role, race, -1, align);
  }
  #define number_roles		(player_choices->n_roles)
--- 1214,1218 ----
  valid_align(int role, int race, int align)
  {
!     return proxy_cb_valid_selection_check(role, race, -1, align);
  }
  #define number_roles		(player_choices->n_roles)
***************
*** 1670,1673 ****
--- 1670,1674 ----
  	menu_items = NULL;
  #ifdef GTK_PROXY
+ 	proxy_cb_valid_selection_close();
  	proxy_cb_free_player_choices(player_choices);
  	player_choices = NULL;
***************
*** 1677,1680 ****
--- 1678,1682 ----
  #ifdef GTK_PROXY
      player_choices = proxy_cb_get_player_choices();
+     proxy_cb_valid_selection_open();
  #else
      for(number_roles = 0; roles[number_roles].name.m; number_roles++)
***************
*** 1959,1963 ****
  #endif
  #if defined(GTK_PROXY)
!     exit(0);
  #endif
  }
--- 1961,1965 ----
  #endif
  #if defined(GTK_PROXY)
!     proxy_exit_server();
  #endif
  }