Changeset 546 for abuse/trunk/src/imlib/specs.hTweet

Timestamp:

Apr 28, 2011, 1:56:23 AM (12 years ago)

Author:

Sam Hocevar

Message:

imlib: implement spec_directory::FullyLoad? to force loading all
assets into memory.

File:

• abuse/trunk/src/imlib/specs.h (modified) (2 diffs)

abuse/trunk/src/imlib/specs.h

@@ -158 +158 @@
 class spec_entry
 {
+public:
+    spec_entry(uint8_t spec_type, char const *object_name,
+               char const *link_filename,
+               unsigned long data_size, unsigned long data_offset);
+    ~spec_entry();
+
+    void Print();
+
+    char *name;
+    void *data;
+    unsigned long size, offset;
+    uint8_t type;
+};
+
+
+class spec_directory
+{
 public :
-  char *name;
-  unsigned long size,offset;
-  unsigned char type;
-
-  spec_entry(unsigned char spec_type,
-             char const *object_name,
-             char const *link_filename,
-             unsigned long data_size,
-             unsigned long data_offset)
-  { type = spec_type;
-    name = strdup(object_name);
-    size = data_size;
-    offset = data_offset;
-  }
-  void print();
-  ~spec_entry() { if (name) free(name); }
-} ;
-
-
-class spec_directory
-{
-public :
-  void startup(bFILE *fp);
-
-  int total;
-  spec_entry **entries;
-  void *data;
-  long size;
+    spec_directory(FILE *fp);
+    spec_directory(bFILE *fp);
+    spec_directory();
+    ~spec_directory();
+
+    void startup(bFILE *fp);
+    void FullyLoad(bFILE *fp);
+
 //  spec_directory(char *filename);  ; ; not allowed anymore, user must construct file first!
-  spec_directory(FILE *fp);
-  spec_directory(bFILE *fp);
-  spec_directory();
   spec_entry *find(char const *name);
   spec_entry *find(char const *name, int type);
@@ -206 +200 @@
   void print();
   void delete_entries();   // if the directory was created by hand instead of by file
-  ~spec_directory();
-} ;
+
+    int total;
+    spec_entry **entries;
+    void *data;
+    size_t size;
+};
 
 /*jFILE *add_directory_entry(char *filename,