Fix:	SE065

Problem:
	FILE_AREAS support is broken in the GTK interface.

Compatible with:
	Slash'EM 0.0.6E1

Author:	Fred Richardson
	J. Ali Harlow, ali@avrc.city.ac.uk

Date:	20 Apr 2000

diff -Nacrd ../slashem-0.0.6E1/include/winGTK.h ./include/winGTK.h
*** ../slashem-0.0.6E1/include/winGTK.h	Thu Apr 13 20:34:19 2000
--- ./include/winGTK.h	Thu Apr 20 19:10:19 2000
***************
*** 74,80 ****
--- 74,84 ----
  extern void	GTK_destroy_nhwindow(winid);
  extern void	GTK_curs(winid, int, int);
  extern void	GTK_putstr(winid, int, const char *);
+ #ifdef FILE_AREAS
+ extern void	GTK_display_file(const char *, const char *, BOOLEAN_P);
+ #else
  extern void	GTK_display_file(const char *, BOOLEAN_P);
+ #endif
  extern void	GTK_start_menu(winid);
  extern void	GTK_add_menu(winid, int, const ANY_P *, CHAR_P,CHAR_P,int,const char *, BOOLEAN_P);
  extern void	GTK_end_menu(winid, const char *);
diff -Nacrd ../slashem-0.0.6E1/win/gtk/gtk.c ./win/gtk/gtk.c
*** ../slashem-0.0.6E1/win/gtk/gtk.c	Thu Apr 13 20:34:19 2000
--- ./win/gtk/gtk.c	Thu Apr 20 19:19:27 2000
***************
*** 440,446 ****
--- 440,450 ----
  static void
  help_license(GtkWidget *widget, gpointer data)
  {
+ #ifndef FILE_AREAS    
      GTK_display_file(LICENSE, TRUE);
+ #else
+     GTK_display_file(LICENSE_AREA, LICENSE, TRUE);
+ #endif
      keysym = '\0';
  }
  
***************
*** 455,475 ****
--- 459,491 ----
  static void
  help_option(GtkWidget *widget, gpointer data)
  {
+ #ifndef FILE_AREAS    
      GTK_display_file(OPTIONFILE, TRUE);
+ #else
+     GTK_display_file(OPTIONAREA, OPTIONFILE, TRUE);
+ #endif
      keysym = '\0';
  }
  
  static void
  help_shelp(GtkWidget *widget, gpointer data)
  {
+ #ifndef FILE_AREAS    
      GTK_display_file(SHELP, TRUE);
+ #else
+     GTK_display_file(SHELP_AREA, SHELP, TRUE);
+ #endif
      keysym = '\0';
  }
  
  static void
  help_help(GtkWidget *widget, gpointer data)
  {
+ #ifndef FILE_AREAS    
      GTK_display_file(HELP, TRUE);
+ #else
+     GTK_display_file(HELP_AREA, HELP, TRUE);
+ #endif
      keysym = '\0';
  }
  
diff -Nacrd ../slashem-0.0.6E1/win/gtk/gtkmap.c ./win/gtk/gtkmap.c
*** ../slashem-0.0.6E1/win/gtk/gtkmap.c	Thu Apr 13 20:34:19 2000
--- ./win/gtk/gtkmap.c	Thu Apr 20 19:34:35 2000
***************
*** 534,542 ****
  	if(!tileTab[i])
  	    continue;
  #ifdef FILE_AREAS
! 	fp = fopen_area(FILE_AREA_SHARE, tileTab[i]->file, RDTMODE);
  #else
! 	fp = fopen(tileTab[i]->file, RDTMODE);
  #endif
  	if(!fp){
  	    tileTab[i] = NULL;
--- 534,542 ----
  	if(!tileTab[i])
  	    continue;
  #ifdef FILE_AREAS
! 	fp = fopen_datafile_area(FILE_AREA_SHARE, tileTab[i]->file, RDTMODE);
  #else
! 	fp = fopen_datafile(tileTab[i]->file, RDTMODE);
  #endif
  	if(!fp){
  	    tileTab[i] = NULL;