X-Git-Url: http://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/6c10bbbd8c3e1605cb02343e689f884cda738315..c336603df0c87a23fa41c0bd5c342d53ca2e396c:/src/engine/texture.c

diff --git a/src/engine/texture.c b/src/engine/texture.c
index bc82855..0364664 100644
--- a/src/engine/texture.c
+++ b/src/engine/texture.c
@@ -1,9 +1,27 @@
+/*
+ *  upkg: tool for manipulating Unreal Tournament packages.
+ *  Copyright © 2009-2011 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 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/>.
+ */
+
 #include <stdio.h>
 #include <string.h>
 #include <glib-object.h>
 
-#include "exportable.h"
-#include "uobject.h"
+#include <uobject/uobject.h>
+#include <uobject/exportable.h>
 #include "texture.h"
 #include "upkg.h"
 
@@ -32,12 +50,12 @@ void exportable_init(UObjectExportable *e)
 
 G_DEFINE_DYNAMIC_TYPE(EngineTexture, engine_texture, U_OBJECT_TYPE);
 
-static int deserialize(UObject *o, struct upkg_file *f)
+static int deserialize(UObject *uo)
 {
-	struct texture_priv *priv = TEXTURE_GET_PRIV(o);
-	EngineTexture *t = ENGINE_TEXTURE(o);
+	struct texture_priv *priv = TEXTURE_GET_PRIV(uo);
+	EngineTexture *t = ENGINE_TEXTURE(uo);
 
-	U_OBJECT_CLASS(engine_texture_parent_class)->deserialize(o, f);
+	U_OBJECT_CLASS(engine_texture_parent_class)->deserialize(uo);
 
 	printf("Texture size: %ux%u\n", t->usize, t->vsize);
 
@@ -73,10 +91,10 @@ get_property(GObject *o, guint id, GValue *val, GParamSpec *spec)
 
 	switch (id) {
 	case PROP_USIZE:
-		g_value_set_boolean(val, t->usize);
+		g_value_set_uint(val, t->usize);
 		break;
 	case PROP_VSIZE:
-		g_value_set_boolean(val, t->vsize);
+		g_value_set_uint(val, t->vsize);
 		break;
 	default:
 		G_OBJECT_WARN_INVALID_PROPERTY_ID(o, id, spec);