uobject: Take a package/index tuple instead of a upkg_file for deserialize.

[upkg.git] / src / uobject.h

diff --git a/src/uobject.h b/src/uobject.h
index 63d8be2b91d6d10b938ce4efd4477b917ab0fff8..efbe28ddf556f37083cbf78ceacabe67fde804cc 100644 (file)
--- a/src/uobject.h
+++ b/src/uobject.h
@@ -1,9 +1,27 @@
+/*
+ *  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
+ */
+
 #ifndef UOBJECT_H_
 #define UOBJECT_H_
 
 #include <glib-object.h>
 #include "upkg.h"
-#include "avl.h"
 
 #define U_OBJECT_TYPE u_object_get_type()
 #define U_OBJECT(obj) \
@@ -22,6 +40,10 @@ typedef struct UObjectClass UObjectClass;
 
 struct UObject {
        GObject parent;
+
+       struct upkg *pkg;
+       struct upkg_file *pkg_file;
+       unsigned long pkg_idx;
 };
 
 struct UObjectClass {
@@ -35,6 +57,6 @@ GType u_object_get_type(void);
 const GValue *u_object_get_property(UObject *obj, const char *name);
 void u_object_set_property(UObject *obj, const char *name, const GValue *val);
 
-int u_object_deserialize(GObject *obj, struct upkg_file *f);
+int u_object_deserialize(GObject *obj, struct upkg *pkg, unsigned long idx);
 
 #endif