AxiosEngine-old Commit Details

Date:

2012-05-21 21:53:00 (13 years 5 months ago)

Author:

Natalie Adams

Branch:

default

Commit:

6d8bf265d2ec

Parents:

078e3406f0a6

Message:

+ * - Changing AxiosTitleFile.GetStream() to return Stream instead of FileStream

+ * - Changing IAxiosFile.GetStream() to return Stream instead of FileStream

Changes:

M	axios/Axios_settings.cs (1 diff)
M	axios/Engine/File/AxiosFile.cs (1 diff)
M	axios/Engine/File/AxiosIsolatedFile.cs (2 diffs)
M	axios/Engine/File/AxiosRegularFile.cs (1 diff)
M	axios/Engine/File/AxiosTitleFile.cs (1 diff)
M	axios/Engine/Gleed2D/Level.cs (1 diff)
M	axios/Engine/Interfaces/IAxiosFile.cs (1 diff)

File differences

-89
90 90
91 91
92
93
92 94
93 95
94 96
+ * - Changing location of GetTexture to extensions␍␊
 * - Enabling commented log messages␍␊
 * - Fixing bug where loadrecentangleitem wouldn't be called by Gleed2D library␍␊
 * - Changing AxiosTitleFile.GetStream() to return Stream instead of FileStream␍␊
 * - Changing IAxiosFile.GetStream() to return Stream instead of FileStream␍␊
 * ␍␊
 */␍␊
#endregion␍␊
  * - Changing location of GetTexture to extensions␍␊
  * - Enabling commented log messages␍␊
  * - Fixing bug where loadrecentangleitem wouldn't be called by Gleed2D library␍␊
+ * - Changing AxiosTitleFile.GetStream() to return Stream instead of FileStream␍␊
+ * - Changing IAxiosFile.GetStream() to return Stream instead of FileStream␍␊
  * ␍␊
  */␍␊
 #endregion␍␊

-29
30 30
31 31
32 
32
33 33
34 34
35 35
+            throw new NotImplementedException();␍␊
        }␍␊
␍␊
        public virtual FileStream GetStream(FileMode mode)␍␊
        public virtual Stream GetStream(FileMode mode)␍␊
        {␍␊
            throw new NotImplementedException();␍␊
        }␍␊
             throw new NotImplementedException();␍␊
         }␍␊
 ␍␊
-        public virtual FileStream GetStream(FileMode mode)␍␊
+        public virtual Stream GetStream(FileMode mode)␍␊
         {␍␊
             throw new NotImplementedException();␍␊
         }␍␊

-51
52 52
53 53
54 
54
55 55
56 56
57 57
... ...
60 60
61 61
62 62
63 
63
64 64
65 65
66 66
+            return ret;␍␊
        }␍␊
␍␊
        public override FileStream GetStream(FileMode mode)␍␊
        public override Stream GetStream(FileMode mode)␍␊
        {␍␊
#if WINDOWS␍␊
            IsolatedStorageFile savegameStorage = IsolatedStorageFile.GetUserStoreForDomain();␍␊

#endif   ␍␊
            IsolatedStorageFileStream fs = null;␍␊
            fs = savegameStorage.OpenFile(_filename, mode);␍␊
            return fs;␍␊
            return (Stream)fs;␍␊
        }␍␊
␍␊
    }␍␊
 ...
             return ret;␍␊
         }␍␊
 ␍␊
-        public override FileStream GetStream(FileMode mode)␍␊
+        public override Stream GetStream(FileMode mode)␍␊
         {␍␊
 #if WINDOWS␍␊
             IsolatedStorageFile savegameStorage = IsolatedStorageFile.GetUserStoreForDomain();␍␊
 #endif   ␍␊
             IsolatedStorageFileStream fs = null;␍␊
             fs = savegameStorage.OpenFile(_filename, mode);␍␊
-            return fs;␍␊
+            return (Stream)fs;␍␊
         }␍␊
 ␍␊
     }␍␊

-37
38 38
39 39
40 
40
41 41
42 42
43 
43
44 44
45 45
46 46
+            return ret;␍␊
        }␍␊
␍␊
        public override FileStream GetStream(FileMode mode)␍␊
        public override Stream GetStream(FileMode mode)␍␊
        {␍␊
            FileStream fs = new FileStream(_filename, mode);␍␊
            return fs;␍␊
            return (Stream)fs;␍␊
        }␍␊
    }␍␊
}␍␊
             return ret;␍␊
         }␍␊
 ␍␊
-        public override FileStream GetStream(FileMode mode)␍␊
+        public override Stream GetStream(FileMode mode)␍␊
         {␍␊
             FileStream fs = new FileStream(_filename, mode);␍␊
-            return fs;␍␊
+            return (Stream)fs;␍␊
         }␍␊
     }␍␊
 }␍␊

-28
29 29
30 30
31 
31
32 32
33 
34 
33
35 34
36 35
37 36
+            return this.Content;␍␊
        }␍␊
␍␊
        public override FileStream GetStream(FileMode mode)␍␊
        public override Stream GetStream(FileMode mode)␍␊
        {␍␊
            FileStream fs = (FileStream)TitleContainer.OpenStream(_filename);␍␊
            return fs;␍␊
            return (Stream)TitleContainer.OpenStream(_filename);;␍␊
        }␍␊
    }␍␊
}␍␊
             return this.Content;␍␊
         }␍␊
 ␍␊
-        public override FileStream GetStream(FileMode mode)␍␊
+        public override Stream GetStream(FileMode mode)␍␊
         {␍␊
-            FileStream fs = (FileStream)TitleContainer.OpenStream(_filename);␍␊
-            return fs;␍␊
+            return (Stream)TitleContainer.OpenStream(_filename);;␍␊
         }␍␊
     }␍␊
 }␍␊

-74
75 75
76 76
77 
77
78 78
79 79
80 80
+            return level;␍␊
        }␍␊
␍␊
        public static Level FromStream(FileStream stream, AxiosGameScreen gameScreen)␍␊
        public static Level FromStream(Stream stream, AxiosGameScreen gameScreen)␍␊
        {␍␊
            Dictionary<string, Texture2D> cache = new Dictionary<string, Texture2D>();␍␊
            XmlSerializer serializer = new XmlSerializer(typeof(Level));␍␊
             return level;␍␊
         }␍␊
 ␍␊
-        public static Level FromStream(FileStream stream, AxiosGameScreen gameScreen)␍␊
+        public static Level FromStream(Stream stream, AxiosGameScreen gameScreen)␍␊
         {␍␊
             Dictionary<string, Texture2D> cache = new Dictionary<string, Texture2D>();␍␊
             XmlSerializer serializer = new XmlSerializer(typeof(Level));␍␊

-6
7 7
8 8
9 
9
10 10
11 11
+    {␍␊
        void WriteData(string data, FileMode mode);␍␊
        string ReadData();␍␊
        FileStream GetStream(FileMode mode);␍␊
        Stream GetStream(FileMode mode);␍␊
    }␍␊
}␍␊
     {␍␊
         void WriteData(string data, FileMode mode);␍␊
         string ReadData();␍␊
-        FileStream GetStream(FileMode mode);␍␊
+        Stream GetStream(FileMode mode);␍␊
     }␍␊
 }␍␊

Download the corresponding diff file

AxiosEngine-old

File differences

Branches

Tags