*** ../old/src/Makefile.emx	Sat Apr 13 15:30:24 1996
--- Makefile.emx	Fri Apr 19 19:32:38 1996
***************
*** 25,31 ****
  #		  Needs 4OS2.
  #
  
! VERSION         = 279v5
  EXPORT          = angband-$(VERSION).os2.zip
  
  CC 		= gcc
--- 25,31 ----
  #		  Needs 4OS2.
  #
  
! VERSION         = 279v6
  EXPORT          = angband-$(VERSION).os2.zip
  
  CC 		= gcc
e /* BEN_HACK */
  
      /* Attempt to open the file */
+ #if 1
+     x = creat(buf, mode);
+     setmode(x,O_BINARY);
+     return(x);
+ #else
      return (creat(buf, mode));
+ #endif
  
  #endif /* BEN_HACK */
  
pe term_screen_main,
                  term_screen_recall,
                  term_screen_choice,
!                 term_screen_mirror,
!                 term_screen_map;
  
  /*
   * Check for events -- called by "Term_scan_emx()"
--- 277,287 ----
  static termPipe term_screen_main,
                  term_screen_recall,
                  term_screen_choice,
!                 term_screen_mirror
! #ifdef MAPWINDOW
!                 ,term_screen_map
! #endif
! ;
  
  /*
   * Check for events -- called by "Term_scan_emx()"
***************
*** 528,534 ****
--- 536,544 ----
      initPipeTerm(&term_screen_recall,"recall",&term_recall);
      initPipeTerm(&term_screen_choice,"choice",&term_choice);
      initPipeTerm(&term_screen_mirror,"mirror",&term_mirror);
+ #ifdef MAPWINDOW
      initPipeTerm(&term_screen_map,   "map",   &term_map);
+ #endif
  
      /* Initialize main window */
      t = (term*)(&term_screen_main);
***************
*** 800,807 ****
  static termWindow term_screen_main,
                    term_screen_recall,
                    term_screen_choice,
!                   term_screen_mirror,
!                   term_screen_map;
  
  /*
   * Check for events -- called by "Term_scan_emx()"
--- 810,820 ----
  static termWindow term_screen_main,
                    term_screen_recall,
                    term_screen_choice,
!                   term_screen_mirror
! #ifdef MAPWINDOW
!                   ,term_screen_map
! #endif
! ;
  
  /*
   * Check for events -- called by "Term_scan_emx()"
***************
*** 893,899 ****
--- 906,914 ----
      emx_init_term(&term_screen_recall,term_screen_main.instance,&term_recall,1);
      emx_init_term(&term_screen_choice,term_screen_main.instance,&term_choice,2);
      emx_init_term(&term_screen_mirror,term_screen_main.instance,&term_mirror,3);
+ #ifdef MAPWINDOW
      emx_init_term(&term_screen_map   ,term_screen_main.instance,&term_map   ,4);
+ #endif
  
      /* Activate main window */
      Term_activate(term_screen);
***************
*** 938,948 ****
--- 953,965 ----
          term_nuke(term_mirror);
          emx_nuke(((termWindow*)term_mirror)->instance);
      }
+ #ifdef MAPWINDOW
      if (term_map)
      {
          term_nuke(term_map);
          emx_nuke(((termWindow*)term_map)->instance);
      }
+ #endif
      if (term_screen)
      {
          term_nuke(term_screen);
a_info.raw' file.");
***************
*** 1284,1290 ****
      strcat(buf, "e_info.raw");
  
      /* Attempt to open the "raw" file */
!     fd = fd_open(buf, O_RDONLY);
  
      /* Process existing "raw" file */
      if (fd >= 0)
--- 1283,1289 ----
      strcat(buf, "e_info.raw");
  
      /* Attempt to open the "raw" file */
!     fd = fd_open(buf, O_RDONLY | O_BINARY);
  
      /* Process existing "raw" file */
      if (fd >= 0)
***************
*** 1412,1418 ****
      strcat(buf, "e_info.raw");
  
      /* Attempt to open the "raw" file */
!     fd = fd_open(buf, O_RDONLY);
  
      /* Process existing "raw" file */
      if (fd < 0) quit("Cannot load 'e_info.raw' file.");
--- 1411,1417 ----
      strcat(buf, "e_info.raw");
  
      /* Attempt to open the "raw" file */
!     fd = fd_open(buf, O_RDONLY | O_BINARY);
  
      /* Process existing "raw" file */
      if (fd < 0) quit("Cannot load 'e_info.raw' file.");
***************
*** 1540,1546 ****
      strcat(buf, "r_info.raw");
  
      /* Attempt to open the "raw" file */
!     fd = fd_open(buf, O_RDONLY);
  
      /* Process existing "raw" file */
      if (fd >= 0)
--- 1539,1545 ----
      strcat(buf, "r_info.raw");
  
      /* Attempt to open the "raw" file */
!     fd = fd_open(buf, O_RDONLY | O_BINARY);
  
      /* Process existing "raw" file */
      if (fd >= 0)
***************
*** 1668,1674 ****
      strcat(buf, "r_info.raw");
  
      /* Attempt to open the "raw" file */
!     fd = fd_open(buf, O_RDONLY);
  
      /* Process existing "raw" file */
      if (fd < 0) quit("Cannot load 'r_info.raw' file.");
--- 1667,1673 ----
      strcat(buf, "r_info.raw");
  
      /* Attempt to open the "raw" file */
!     fd = fd_open(buf, O_RDONLY | O_BINARY);
  
      /* Process existing "raw" file */
      if (fd < 0) quit("Cannot load 'r_info.raw' file.");
***************
*** 1795,1801 ****
      strcat(buf, "v_info.raw");
  
      /* Attempt to open the "raw" file */
!     fd = fd_open(buf, O_RDONLY);
  
      /* Process existing "raw" file */
      if (fd >= 0)
--- 1794,1800 ----
      strcat(buf, "v_info.raw");
  
      /* Attempt to open the "raw" file */
!     fd = fd_open(buf, O_RDONLY | O_BINARY);
  
      /* Process existing "raw" file */
      if (fd >= 0)
***************
*** 1923,1929 ****
      strcat(buf, "v_info.raw");
  
      /* Attempt to open the "raw" file */
!     fd = fd_open(buf, O_RDONLY);
  
      /* Process existing "raw" file */
      if (fd < 0) quit("Cannot load 'v_info.raw' file.");
--- 1922,1928 ----
      strcat(buf, "v_info.raw");
  
      /* Attempt to open the "raw" file */
!     fd = fd_open(buf, O_RDONLY | O_BINARY);
  
      /* Process existing "raw" file */
      if (fd < 0) quit("Cannot load 'v_info.raw' file.");
