*** fsim/Imakefile.orig	Sun Apr 16 22:29:42 1995
--- fsim/Imakefile	Sun Apr 16 22:55:29 1995
***************
*** 20,27 ****
  XLIB = -lX11
  #endif
  
  #if HasVoidSignalReturn == YES
! DEFINES=	-DSIGVOID
  #endif
  
  SRCS1= 		server.c pm.c flaps.c droneCalc.c init.c aim9m.c\
--- 20,30 ----
  XLIB = -lX11
  #endif
  
+ ACMLIBDIR=	$(LIBDIR)/acm
+ ACMDATFILES=	f16 mig23 aim-9 rwy rwy2 tower mtn bullet
+ 
  #if HasVoidSignalReturn == YES
! DEFINES=	-DSIGVOID -DACM_LIBRARY=\"$(ACMLIBDIR)/\"
  #endif
  
  SRCS1= 		server.c pm.c flaps.c droneCalc.c init.c aim9m.c\
***************
*** 73,77 ****
  
  install:: install.man
  
  tar:
! 	tar cv acm acms f16 mig23 aim-9 rwy rwy2 tower mtn bullet
--- 76,82 ----
  
  install:: install.man
  
+ InstallMultiple($(ACMDATFILES),$(ACMLIBDIR))
+ 
  tar:
! 	tar cv acm acms $(ACMDATFILES)
*** fsim/init.c.orig	Thu Nov  5 01:50:22 1992
--- fsim/init.c	Sun Apr 16 23:02:20 1995
***************
*** 10,17 ****
--- 10,22 ----
   */
   
  #include <string.h>
+ #include <stdio.h>
+ #include <stdlib.h>
  #include "pm.h"
  
+ /* gcc under FreeBSD ain't IEEE compliant; mask exceptions */
+ #include <machine/floatingpoint.h>
+ 
  extern craftType *newCraft();
  extern void initaim9(), initm61a1();
  extern void initf16(), initmig23();
***************
*** 25,33 ****
  	if ((f = fopen (name, access)) == (FILE *) NULL) {
  		strcpy (libname, ACM_LIBRARY);
  		strcat (libname, name);
! 		return fopen (libname, access);
  	}
  
  	return f;
  }
  
--- 30,46 ----
  	if ((f = fopen (name, access)) == (FILE *) NULL) {
  		strcpy (libname, ACM_LIBRARY);
  		strcat (libname, name);
! 		f = fopen (libname, access);
  	}
  
+ 	if(f == (FILE *)NULL) {
+ 		fprintf(stderr,
+ 			"Failed to open data file \"%s\" for %s access: ",
+ 			name, access);
+ 		perror(0);
+ 		exit(1);
+ 	}
+ 	
  	return f;
  }
  
***************
*** 38,44 ****
  	int	i;
  	craft	*p;
  
!         for ((i=0, p=stbl); i<MAXSURFACE; (++i, ++p))
  		p->type = CT_FREE;
  
          for ((i=0, p=ptbl); i<MAXPLAYERS; (++i, ++p)) {
--- 51,59 ----
  	int	i;
  	craft	*p;
  
! 	fpsetmask(0);
! 	
! 	for ((i=0, p=stbl); i<MAXSURFACE; (++i, ++p))
  		p->type = CT_FREE;
  
          for ((i=0, p=ptbl); i<MAXPLAYERS; (++i, ++p)) {
*** fsim/manifest.h.orig	Thu Nov  5 01:49:57 1992
--- fsim/manifest.h	Sun Apr 16 22:48:30 1995
***************
*** 47,53 ****
--- 47,55 ----
   *  Define a library directory to contain the acm files
   */
  
+ #ifndef ACM_LIBRARY
  #define ACM_LIBRARY		"/usr/games/lib/acm/"
+ #endif
  
  /*
   *  a signal handler function type