X-Git-Url: https://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/c6537566467e27e40028254b4c7da145417682cf..4a3125b61348969b91b9642bba803fc17135c189:/src/engine/texture.c

diff --git a/src/engine/texture.c b/src/engine/texture.c
index 209409b..2ac18a6 100644
--- a/src/engine/texture.c
+++ b/src/engine/texture.c
@@ -2,9 +2,9 @@
  *  upkg: tool for manipulating Unreal Tournament packages.
  *  Copyright (C) 2009 Nick Bowler
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  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 2 of the License, or
+ *  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,
@@ -13,8 +13,7 @@
  *  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, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
 #include <stdio.h>
@@ -49,14 +48,14 @@ void exportable_init(UObjectExportable *e)
 {
 }
 
-G_DEFINE_DYNAMIC_TYPE(EngineTexture, engine_texture, UOBJECT_TYPE);
+G_DEFINE_DYNAMIC_TYPE(EngineTexture, engine_texture, U_OBJECT_TYPE);
 
 static int deserialize(UObject *o, struct upkg_file *f)
 {
 	struct texture_priv *priv = TEXTURE_GET_PRIV(o);
 	EngineTexture *t = ENGINE_TEXTURE(o);
 
-	UOBJECT_CLASS(engine_texture_parent_class)->deserialize(o, f);
+	U_OBJECT_CLASS(engine_texture_parent_class)->deserialize(o, f);
 
 	printf("Texture size: %ux%u\n", t->usize, t->vsize);
 
@@ -109,7 +108,7 @@ static void engine_texture_init(EngineTexture *t)
 
 static void engine_texture_class_init(EngineTextureClass *class)
 {
-	UObjectClass *uo = UOBJECT_CLASS(class);
+	UObjectClass *uo = U_OBJECT_CLASS(class);
 	GObjectClass *go = G_OBJECT_CLASS(class);
 
 	g_type_class_add_private(class, sizeof (struct texture_priv));