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

diff --git a/src/engine/texture.c b/src/engine/texture.c
index db6edd0..7cf05fa 100644
--- a/src/engine/texture.c
+++ b/src/engine/texture.c
@@ -22,8 +22,8 @@
 
 #include <uobject/uobject.h>
 #include <uobject/exportable.h>
-#include "texture.h"
-#include "palette.h"
+#include <engine/texture.h>
+#include <engine/palette.h>
 #include "upkg.h"
 
 #define TEXTURE_GET_PRIV(o) \
@@ -54,7 +54,7 @@ void exportable_init(UObjectExportable *e)
 {
 }
 
-G_DEFINE_DYNAMIC_TYPE(EngineTexture, engine_texture, U_OBJECT_TYPE);
+G_DEFINE_DYNAMIC_TYPE(EngineTexture, engine_texture, U_TYPE_OBJECT);
 
 static int deserialize(UObject *uo)
 {
@@ -191,7 +191,7 @@ static void engine_texture_class_init(EngineTextureClass *class)
 		g_param_spec_object("Palette",
 			"Palette",
 			"Palette reference for the texture.",
-			ENGINE_PALETTE_TYPE,
+			ENGINE_TYPE_PALETTE,
 			G_PARAM_READWRITE));
 }