license: Update copyright notices.

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

diff --git a/src/engine/texture.c b/src/engine/texture.c
index 2ac18a652d0fb626e224e9426aba6bfa0a593733..b072eb1bc2b706de143fef61cde3ba96bf9f9c0a 100644 (file)
--- a/src/engine/texture.c
+++ b/src/engine/texture.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
@@ -50,12 +50,12 @@ void exportable_init(UObjectExportable *e)
 
 G_DEFINE_DYNAMIC_TYPE(EngineTexture, engine_texture, U_OBJECT_TYPE);
 
-static int deserialize(UObject *o, struct upkg_file *f)
+static int deserialize(UObject *uo)
 {
-       struct texture_priv *priv = TEXTURE_GET_PRIV(o);
-       EngineTexture *t = ENGINE_TEXTURE(o);
+       struct texture_priv *priv = TEXTURE_GET_PRIV(uo);
+       EngineTexture *t = ENGINE_TEXTURE(uo);
 
-       U_OBJECT_CLASS(engine_texture_parent_class)->deserialize(o, f);
+       U_OBJECT_CLASS(engine_texture_parent_class)->deserialize(uo);
 
        printf("Texture size: %ux%u\n", t->usize, t->vsize);