uobject: Rename U_OBJECT_TYPE to U_TYPE_OBJECT.

[upkg.git] / src / engine / music.c

diff --git a/src/engine/music.c b/src/engine/music.c
index 8c17f9ddfa19e8a1d9d6da6b0e3ae4391395a433..87cbec553d5d14c5a4f66c46b07e98e65cc4fe8d 100644 (file)
--- a/src/engine/music.c
+++ b/src/engine/music.c
@@ -1,6 +1,6 @@
 /*
  *  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
  *  it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@ struct music_priv {
 static void exportable_init(UObjectExportable *);
 static void loadable_init(UObjectLoadable *);
 
-G_DEFINE_DYNAMIC_TYPE_EXTENDED(EngineMusic, engine_music, U_OBJECT_TYPE, 0,
+G_DEFINE_DYNAMIC_TYPE_EXTENDED(EngineMusic, engine_music, U_TYPE_OBJECT, 0,
        G_IMPLEMENT_INTERFACE(U_OBJECT_TYPE_EXPORTABLE, exportable_init)
        G_IMPLEMENT_INTERFACE(U_OBJECT_TYPE_LOADABLE, loadable_init)
 );
@@ -138,7 +138,7 @@ static int deserialize(UObject *uo)
                return -1;
        pos += 1;
 
-       if (f->pkg->version > 61) {
+       if (uo->pkg->version > 61) {
                /* Random field #2 */
                if (buflen - pos < 4)
                        return -1;