Changes to make containers behave like a first-class object.

[architektonas] / src / fileio.h

diff --git a/src/fileio.h b/src/fileio.h
index a30ad48c6955e7423e8185c1fd9364a3dcb24f5b..29a9afe09abd56b269a56d034c6518a3325e2a60 100644 (file)
--- a/src/fileio.h
+++ b/src/fileio.h
@@ -2,9 +2,7 @@
 #define __FILEIO_H__
 
 #include <stdio.h>
-
-class Container;
-class Object;
+#include "structs.h"
 
 // NB: The methods in this class are all static, so there's no need to
 //     instantiate an object of this type to use its functions.
@@ -14,9 +12,17 @@ class FileIO
        public:
                static bool SaveAtnsFile(FILE *, Container *);
                static bool LoadAtnsFile(FILE *, Container *);
+               static void ResetLayerVectors(void);
 
        private:
-               static bool GetObjectFromFile(FILE *, Object *, Object **, int *);
+               static bool LoadVersion1_0(FILE *, Container *);
+               static bool LoadVersion1_1(FILE *, Container *);
+               static bool LoadVersion1_2(FILE *, Container *);
+//             static bool GetObjectFromFile(FILE *, Object *, Object **, int *);
+               static Object * GetObjectFromFile(FILE *, bool extended = false);
+               static bool WriteObjectToFile(FILE *, Object *);
+
+               static int objectFileType;
 };
 
 #endif // __FILEIO_H__