+/*
+ * 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 2 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, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ */
+
#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"
{
}
-G_DEFINE_DYNAMIC_TYPE(EngineTexture, engine_texture, U_OBJECT_TYPE);
+G_DEFINE_DYNAMIC_TYPE(EngineTexture, engine_texture, UOBJECT_TYPE);
static int deserialize(UObject *o, struct upkg_file *f)
{
struct texture_priv *priv = TEXTURE_GET_PRIV(o);
EngineTexture *t = ENGINE_TEXTURE(o);
- const GValue *val;
- U_OBJECT_CLASS(engine_texture_parent_class)->deserialize(o, f);
+ UOBJECT_CLASS(engine_texture_parent_class)->deserialize(o, f);
- printf("Texture size: %lux%lu\n", t->usize, t->vsize);
+ printf("Texture size: %ux%u\n", t->usize, t->vsize);
return 0;
}
static void engine_texture_class_init(EngineTextureClass *class)
{
- UObjectClass *uo = U_OBJECT_CLASS(class);
+ UObjectClass *uo = UOBJECT_CLASS(class);
GObjectClass *go = G_OBJECT_CLASS(class);
g_type_class_add_private(class, sizeof (struct texture_priv));