Mac Carbon updates

src/allmain.c

@@ -456,14 +456,12 @@ display_gamewindows()
     WIN_INVEN = create_nhwindow(NHW_MENU);
 
 #ifdef MAC
-    /*
-     * This _is_ the right place for this - maybe we will
+    /* This _is_ the right place for this - maybe we will
      * have to split display_gamewindows into create_gamewindows
      * and show_gamewindows to get rid of this ifdef...
      */
-	if ( ! strcmp ( windowprocs . name , "mac" ) ) {
-	    SanePositions ( ) ;
-	}
+	if (!strcmp(windowprocs. name, "mac"))
+	    SanePositions();
 #endif
 
     /*

sys/mac/macfile.c

@@ -219,7 +219,7 @@ macopen (const char *name, int flags, long fileType)
 			TEXT_CREATOR, fileType) && (flags & O_EXCL)) {
 			return -1;
 		}
-
+#if 0	/* Fails during makedefs */
 		if (fileType == SAVE_TYPE) {
 			short resRef;
 			HCreateResFile(theDirs.dataRefNum, theDirs.dataDirID, s);
@@ -246,6 +246,7 @@ macopen (const char *name, int flags, long fileType)
 				CloseResFile(resRef);
 			}
 		}
+#endif
 
 	}
 	/*

sys/mac/macmain.c

@@ -135,7 +135,7 @@ main (void)
 
 	if (discover)
 		You("are in non-scoring discovery mode.");
-	flags.move = 0;
+	context.move = 0;
 
 	UndimMenuBar (); /* Yes, this is the place for it (!) */