X-Git-Url: http://git.draconx.ca/gitweb/upkg.git/blobdiff_plain/37a77c2825545435cfb3093eae1995efd35c20ba..c336603df0c87a23fa41c0bd5c342d53ca2e396c:/src/engine/texture.c diff --git a/src/engine/texture.c b/src/engine/texture.c index 0e6e1c3..0364664 100644 --- a/src/engine/texture.c +++ b/src/engine/texture.c @@ -1,10 +1,10 @@ /* * upkg: tool for manipulating Unreal Tournament packages. - * Copyright (C) 2009 Nick Bowler + * Copyright © 2009-2011 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,16 +13,15 @@ * 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 . */ #include #include #include -#include "exportable.h" -#include "uobject.h" +#include +#include #include "texture.h" #include "upkg.h" @@ -51,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); @@ -92,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);