1 files changed, 16 insertions, 15 deletions
diff --git a/lib/skin_parser/skin_parser.h b/lib/skin_parser/skin_parser.h
index 6f1af25a05..3e0634976c 100644
--- a/lib/skin_parser/skin_parser.h
+++ b/lib/skin_parser/skin_parser.h
@@ -86,15 +86,15 @@ struct skin_tag_parameter
            
 };
-/* Defines an element of a SKIN file */
+/* Defines an element of a SKIN file,
+ *
+ * This is allocated a lot, so it's optimized for size */
 struct skin_element
 {
-    /* Defines what type of element it is */
+    /* Link to the next element */
-    enum skin_element_type type;
+    struct skin_element* next;
+    /* Pointer to an array of children */
-    /* The line on which it's defined in the source file */
+    struct skin_element** children;
-    int line;
    /* Placeholder for element data
     * TEXT and COMMENT uses it for the text string
     * TAG, VIEWPORT, LINE, etc may use it for post parse extra storage
@@ -104,16 +104,17 @@ struct skin_element
    /* The tag or conditional name */
    const struct tag_info *tag;
-    /* Pointer to and size of an array of parameters */
+    /* Pointer to an array of parameters */
-    int params_count;
    struct skin_tag_parameter* params;
-    /* Pointer to and size of an array of children */
+    /* Number of elements in the children array */
-    int children_count;
+    short children_count;
-    struct skin_element** children;
+    /* The line on which it's defined in the source file */
+    short line;
-    /* Link to the next element */
+    /* Defines what type of element it is */
-    struct skin_element* next;
+    enum skin_element_type type;
+    /* Number of elements in the params array */
+    char params_count;
 };
 enum skin_cb_returnvalue

diff --git a/lib/skin_parser/skin_parser.h b/lib/skin_parser/skin_parser.h index 6f1af25a05..3e0634976c 100644 --- a/lib/skin_parser/skin_parser.h +++ b/lib/skin_parser/skin_parser.h
@@ -86,15 +86,15 @@ struct skin_tag_parameter
86		86
87	};	87	};
88		88
89	/* Defines an element of a SKIN file */	89	/* Defines an element of a SKIN file,
		90	*
		91	* This is allocated a lot, so it's optimized for size */
90	struct skin_element	92	struct skin_element
91	{	93	{
92	/* Defines what type of element it is */	94	/* Link to the next element */
93	enum skin_element_type type;	95	struct skin_element* next;
94		96	/* Pointer to an array of children */
95	/* The line on which it's defined in the source file */	97	struct skin_element** children;
96	int line;
97
98	/* Placeholder for element data	98	/* Placeholder for element data
99	* TEXT and COMMENT uses it for the text string	99	* TEXT and COMMENT uses it for the text string
100	* TAG, VIEWPORT, LINE, etc may use it for post parse extra storage	100	* TAG, VIEWPORT, LINE, etc may use it for post parse extra storage
@@ -104,16 +104,17 @@ struct skin_element
104	/* The tag or conditional name */	104	/* The tag or conditional name */
105	const struct tag_info *tag;	105	const struct tag_info *tag;
106		106
107	/* Pointer to and size of an array of parameters */	107	/* Pointer to an array of parameters */
108	int params_count;
109	struct skin_tag_parameter* params;	108	struct skin_tag_parameter* params;
110		109
111	/* Pointer to and size of an array of children */	110	/* Number of elements in the children array */
112	int children_count;	111	short children_count;
113	struct skin_element** children;	112	/* The line on which it's defined in the source file */
114		113	short line;
115	/* Link to the next element */	114	/* Defines what type of element it is */
116	struct skin_element* next;	115	enum skin_element_type type;
		116	/* Number of elements in the params array */
		117	char params_count;
117	};	118	};
118		119
119	enum skin_cb_returnvalue	120	enum skin_cb_returnvalue