thstd: fix quad entries with size 36 in pre-th10

Quads in pre-th10 can also be 36 bytes long and contain two additional values.

Author: Nutzer

thstd/thstd.c

@@ -161,13 +161,12 @@ std_read_file(
 
         for(;;) {
             quad_type = (unsigned int*)map;
-            if (*quad_type == 0x0004FFFF) {
+            if (*quad_type == 0x4FFFF) {
                 break;
             }
 
             list_append_new(&entry->quads, (std_object_t*)map);
-
-            map = map + sizeof(std_object_t);
+            map = map + ((std_object_t*)map)->size;
         }
     }
 
@@ -262,6 +261,10 @@ std_dump(
             fprintf(stream, "        Padding: %i\n", object->_padding);
             fprintf(stream, "        Width: %g\n", object->width);
             fprintf(stream, "        Height: %g\n", object->height);
+            if(object->size == 36) {
+                fprintf(stream, "        Unknown_ex1: %g\n", object->unknown_ex1);
+                fprintf(stream, "        Unknown_ex2: %g\n", object->unknown_ex2);
+            }
         }
         fprintf(stream, "\n");
 
@@ -519,6 +522,7 @@ std_create(
         } else if (util_strcmp_ref(line, stringref("QUAD:")) == 0) {
             std->header->nb_faces++;
             quad = malloc(sizeof(*quad));
+            quad->size = 0x1c;
             list_append_new(&entry->quads, quad);
             set_object = 0;
         } else if (util_strcmp_ref(line, stringref("FACE: ")) == 0) {
@@ -613,25 +617,37 @@ std_create(
                     sscanf(line, "Padding: %hu", &quad->_padding);
                     sscanf(line, "Width: %g", &quad->width);
                     sscanf(line, "Height: %g", &quad->height);
+                    if(1 == sscanf(line, "Unknown_ex1: %g", &quad->unknown_ex1)) {
+                        quad->size = 36;
+                    }
+                    if(1 == sscanf(line, "Unknown_ex2: %g", &quad->unknown_ex2)) {
+                        quad->size = 36;
+                    }
                 }
             }
             sscanf(line, "%u", &instr_time);
         }
     }
     fclose(f);
 
+    size_t total_entry_size = 0;
+    list_for_each(&std->entries, entry) {
+      list_for_each(&entry->quads, quad) {
+        total_entry_size += quad->size;
+      }
+    }
     if (option_version == 0)
         std->header_06->faces_offset = (sizeof(std_header_06_t) +
                                         sizeof(int32_t) * std->header->nb_objects +
                                         sizeof(std_entry_header_t) * std->header->nb_objects +
                                         sizeof(int32_t) * std->header->nb_objects +
-                                        sizeof(std_object_t) * std->header->nb_faces);
+                                        total_entry_size);
     else
         std->header_10->faces_offset = (sizeof(std_header_10_t) +
                                         sizeof(int32_t) * std->header->nb_objects +
                                         sizeof(std_entry_header_t) * std->header->nb_objects +
                                         sizeof(int32_t) * std->header->nb_objects +
-                                        sizeof(std_object_t) * std->header->nb_faces);
+                                        total_entry_size);
 
     int inst_test = 0;
     list_for_each(&std->instances, instance) {
@@ -694,9 +710,8 @@ std_write(
         entry_offset += sizeof(std_entry_header_t);
 
         list_for_each(&entry->quads, quad) {
-            quad->size = 0x1c;
-            file_write(stream, quad, sizeof(std_object_t));
-            entry_offset += sizeof(std_object_t);
+            file_write(stream, quad, quad->size);
+            entry_offset += quad->size;
         }
 
         endcode = 0x0004FFFF;

thstd/thstd.h

@@ -107,7 +107,10 @@ PACK_BEGIN
     float z;
     float width;
     float height;
-PACK_END
+
+    float unknown_ex1;
+    float unknown_ex2;
+    PACK_END
 } std_object_t;
 
 typedef struct {