X-Git-Url: http://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/5944f3d64f5675df6eb8bd82ab45cc5ad31504a7..101802f109713394c6c8e0daea8129c6ee3c60d0:/src/engine/texture.c

diff --git a/src/engine/texture.c b/src/engine/texture.c
index e9ea07d..362b0cb 100644
--- a/src/engine/texture.c
+++ b/src/engine/texture.c
@@ -1,9 +1,27 @@
+/*
+ *  upkg: tool for manipulating Unreal Tournament packages.
+ *  Copyright (C) 2009 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,15 +50,14 @@ 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);
-	const GValue *val;
+	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: %lux%lu\n", t->usize, t->vsize);
+	printf("Texture size: %ux%u\n", t->usize, t->vsize);
 
 	return 0;
 }