--- trunk/src/io/RestReader.hpp	2005/03/10 15:10:24	417
+++ trunk/src/io/RestReader.hpp	2006/06/28 14:35:14	996
@@ -1,4 +1,4 @@
- /*
+/*
  * Copyright (c) 2005 The University of Notre Dame. All Rights Reserved.
  *
  * The University of Notre Dame grants you ("Licensee") a
@@ -76,17 +76,14 @@ namespace oopse {
     
   private:
     char* parseIdealLine(char* readLine, StuntDouble* sd);
-    char *idealName;
-    FILE *inAngFile;
-    FILE *inIdealFile;
-    std::string inAngFileName;
-    std::string inIdealFileName;
-    bool isScanned;
-    
-    double angleTransfer;
-    std::vector<fpos_t*> framePos;
+    std::string angFile;
+    std::string idealName;
+    std::istream* inIdealFile;
+    std::istream* inAngFile;
+
+    RealType angleTransfer;
     SimInfo *info_;
   };
 
 } //end namespace oopse
-#endif
\ No newline at end of file
+#endif