uobject: Don't access upkg_file's pkg member.

The same information is already stored in the UObject class.  Use that
instead.

diff --git a/src/engine/music.c b/src/engine/music.c
index 8c17f9ddfa19e8a1d9d6da6b0e3ae4391395a433..4295a6631d97d0e68c2cfb34e1a46c54c0971dea 100644 (file)
--- a/src/engine/music.c
+++ b/src/engine/music.c
@@ -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;

diff --git a/src/uobject/uobject.c b/src/uobject/uobject.c
index 4bc165568f476db0531ed1a249764ecd3d067dcc..6ad6f76ac01cd986e5ee1904b56944c289fee4b2 100644 (file)
--- a/src/uobject/uobject.c
+++ b/src/uobject/uobject.c
@@ -168,7 +168,7 @@ static int deserialize(UObject *uo)
                        return -1;
                len = rc;
 
-               name = upkg_get_name(f->pkg, tmp);
+               name = upkg_get_name(uo->pkg, tmp);
                if (!name) {
                        return -1;
                } else if (strcmp(name, "None") == 0) {