From ccdfa7d308d153639fc395b88fed278176061425 Mon Sep 17 00:00:00 2001
From: Martin Schaffner <schaffnerb@gmx.ch>
Date: Tue, 25 Jan 2005 19:31:56 +0000
Subject: [PATCH] use physfs instead of non-existing cflib.h

---
 ChangeLog           |  1 +
 main/editor/macro.c | 33 +++++++++++++++++++++++++--------
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 62ba615e..e16c8d94 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
 	* arch/carbon/conf.h, arch/ogl/gr.c, include/loadgl.h: on Carbon,
 	dynamically find and load the OpenGL library on carbon
+	* main/editor/macro.c: use physfs instead of non-existing cflib.h
 
 2005-01-24  Chris Taylor  <c.taylor@student.curtin.edu.au>
 
diff --git a/main/editor/macro.c b/main/editor/macro.c
index 4f9034df..e18428fb 100644
--- a/main/editor/macro.c
+++ b/main/editor/macro.c
@@ -1,4 +1,4 @@
-/* $Id: macro.c,v 1.5 2005-01-24 22:09:54 schaffner Exp $ */
+/* $Id: macro.c,v 1.6 2005-01-25 19:31:56 schaffner Exp $ */
 /*
 THE COMPUTER CODE CONTAINED HEREIN IS THE SOLE PROPERTY OF PARALLAX
 SOFTWARE CORPORATION ("PARALLAX").  PARALLAX, IN DISTRIBUTING THE CODE TO
@@ -19,7 +19,7 @@ COPYRIGHT 1993-1998 PARALLAX SOFTWARE CORPORATION.  ALL RIGHTS RESERVED.
  */
 
 #ifdef RCS
-static char rcsid[] = "$Id: macro.c,v 1.5 2005-01-24 22:09:54 schaffner Exp $";
+static char rcsid[] = "$Id: macro.c,v 1.6 2005-01-25 19:31:56 schaffner Exp $";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -46,7 +46,6 @@ static char rcsid[] = "$Id: macro.c,v 1.5 2005-01-24 22:09:54 schaffner Exp $";
 #include "bm.h"
 #include "error.h"
 #include "medlisp.h"
-#include "cflib.h"
 
 #include "kdefs.h"
 
@@ -116,20 +115,38 @@ int MacroSave()
 		return 1;
 	}
 
-	if (ui_get_filename( filename, "*.MAC", "SAVE MACRO" ))   {
+	if (ui_get_filename( filename, "*.MAC", "SAVE MACRO" ))
+	{
+		PHYSFS_file *fp = PHYSFS_openWrite(filename);
+
+		if (!fp) return 0;
 		RecordBuffer[0].type = 7;
 		RecordBuffer[0].frame = 0;
 		RecordBuffer[0].data = MacroNumEvents;
-		WriteFile(  filename, RecordBuffer, sizeof(UI_EVENT)*MacroNumEvents );
+		PHYSFS_write(fp, RecordBuffer, sizeof(UI_EVENT), MacroNumEvents);
+		PHYSFS_close(fp);
 	}
 	return 1;
 }
 
 int MacroLoad()
 {
-	if (ui_get_filename( filename, "*.MAC", "LOAD MACRO" ))   {
-		if (RecordBuffer) free( RecordBuffer );
-		RecordBuffer = (UI_EVENT *)ReadFile( filename, &length );
+	if (ui_get_filename( filename, "*.MAC", "LOAD MACRO" ))
+	{
+		PHYSFS_file *fp = PHYSFS_openRead(filename);
+		int length;
+
+		if (!fp)
+			return 0;
+		if (RecordBuffer)
+			free( RecordBuffer );
+		length = PHYSFS_fileLength(fp);
+		RecordBuffer = d_malloc(length);
+		if (!RecordBuffer)
+			return 0;
+
+		PHYSFS_read(fp, RecordBuffer, length, 1);
+		PHYSFS_close(fp);
 		MacroNumEvents = RecordBuffer[0].data;
 	}
 	return 1;
-- 
2.39.2