X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/96f81be8f602195ab40e2e1b33129e050dfe5c6a..HEAD:/src/engine/texture.gob

diff --git a/src/engine/texture.gob b/src/engine/texture.gob
index 49af538..cc6b271 100644
--- a/src/engine/texture.gob
+++ b/src/engine/texture.gob
@@ -1,23 +1,27 @@
 %alltop{
 /*
- *  upkg: tool for manipulating Unreal Tournament packages.
- *  Copyright © 2009-2011 Nick Bowler
+ * upkg: tool for manipulating Unreal Tournament packages.
+ * Copyright © 2009-2012, 2020, 2022 Nick Bowler
  *
- *  This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation, either version 3 of the License, or
- *  (at your option) any later version.
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
  *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
  *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
  */
 %}
 
+%ctop{
+#include <config.h>
+%}
+
 %{
 #include <stdio.h>
 #include <stdlib.h>
@@ -25,8 +29,8 @@
 #include <uobject/loadable.h>
 #include <uobject/exportable.h>
 #include <engine/palette.h>
-#include "pack.h"
-#include "pcx.h"
+#include <engine/pcx.h>
+#include <pack.h>
 %}
 
 %h{
@@ -36,7 +40,7 @@ struct engine_texture_data {
 	unsigned long width, height;
 
 	unsigned long datalen;
-	unsigned char data[];
+	unsigned char data[FLEXIBLE_ARRAY_MEMBER];
 };
 
 %}
@@ -119,8 +123,8 @@ class Engine:Texture from U:Object (dynamic)
 
 	private float DrawScale;
 
-	private Engine:Palette *Palette;
-	private Engine:Texture *DetailTexture;
+	private Engine:Palette *Palette = NULL destroywith g_object_unref;
+	private Engine:Texture *DetailTexture = NULL destroywith g_object_unref;
 
 	private struct engine_texture_data **mipmap_data;
 	private unsigned char mipmap_count;