From 2972ebbd46e41d3068b8ee7b1fbe1fe1eb9b75cd Mon Sep 17 00:00:00 2001 From: danij Date: Sun, 20 Jan 2013 17:58:58 +0000 Subject: [PATCH] Post merge fixes and cleanup --- doomsday/client/include/map/r_world.h | 1 + doomsday/client/include/resource/material.h | 4 ++-- doomsday/client/include/resource/materialarchive.h | 5 +++-- doomsday/client/include/resource/materialmanifest.h | 2 +- doomsday/client/include/resource/materials.h | 4 ++-- doomsday/client/include/resource/materialscheme.h | 2 +- doomsday/client/include/resource/materialsnapshot.h | 2 +- doomsday/client/include/resource/materialvariantspec.h | 2 +- doomsday/client/include/resource/texture.h | 4 ++-- doomsday/client/include/resource/texturemanifest.h | 5 +++-- doomsday/client/include/resource/textures.h | 7 ++++--- doomsday/client/include/resource/texturescheme.h | 7 +++---- doomsday/client/include/resource/texturevariantspec.h | 2 +- doomsday/client/src/resource/materialarchive.cpp | 4 ++-- doomsday/client/src/resource/materialmanifest.cpp | 2 +- doomsday/client/src/resource/materials.cpp | 4 ++-- doomsday/client/src/resource/materialscheme.cpp | 2 +- doomsday/client/src/resource/materialsnapshot.cpp | 2 +- doomsday/client/src/resource/materialvariant.cpp | 2 +- doomsday/client/src/resource/texture.cpp | 4 ++-- doomsday/client/src/resource/texturemanifest.cpp | 2 +- doomsday/client/src/resource/textures.cpp | 2 +- doomsday/client/src/resource/texturescheme.cpp | 2 +- doomsday/client/src/ui/finaleinterpreter.cpp | 1 - 24 files changed, 38 insertions(+), 36 deletions(-) diff --git a/doomsday/client/include/map/r_world.h b/doomsday/client/include/map/r_world.h index 64cdcdadd3..d5eeb32895 100644 --- a/doomsday/client/include/map/r_world.h +++ b/doomsday/client/include/map/r_world.h @@ -27,6 +27,7 @@ #include "resource/r_data.h" #include "map/vertex.h" #include "map/sector.h" +#include "map/sidedef.h" #include "map/plane.h" // Used for vertex sector owners, side line owners and reverb BSP leafs. diff --git a/doomsday/client/include/resource/material.h b/doomsday/client/include/resource/material.h index ab782a60ee..8b8501f006 100644 --- a/doomsday/client/include/resource/material.h +++ b/doomsday/client/include/resource/material.h @@ -1,7 +1,7 @@ /** @file material.h Logical material. * - * @author Copyright © 2003-2013 Jaakko Keränen - * @author Copyright © 2005-2013 Daniel Swanson + * @authors Copyright © 2003-2013 Jaakko Keränen + * @authors Copyright © 2005-2013 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html diff --git a/doomsday/client/include/resource/materialarchive.h b/doomsday/client/include/resource/materialarchive.h index 8993f887a0..e0b659f5ed 100644 --- a/doomsday/client/include/resource/materialarchive.h +++ b/doomsday/client/include/resource/materialarchive.h @@ -1,10 +1,11 @@ /** @file materialarchive.h Material Archive. + * * Collection of identifier-material pairs. * * Used when saving map state (savegames) or sharing world changes with clients. * - * @author Copyright © 2003-2013 Jaakko Keränen - * @author Copyright © 2005-2013 Daniel Swanson + * @authors Copyright © 2003-2013 Jaakko Keränen + * @authors Copyright © 2005-2013 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html diff --git a/doomsday/client/include/resource/materialmanifest.h b/doomsday/client/include/resource/materialmanifest.h index 6327ba7b38..5899d5dedb 100644 --- a/doomsday/client/include/resource/materialmanifest.h +++ b/doomsday/client/include/resource/materialmanifest.h @@ -1,6 +1,6 @@ /** @file materialmanifest.h Material Manifest. * - * @author Copyright © 2011-2013 Daniel Swanson + * @authors Copyright © 2011-2013 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html diff --git a/doomsday/client/include/resource/materials.h b/doomsday/client/include/resource/materials.h index f4700b1627..ae383e1efd 100644 --- a/doomsday/client/include/resource/materials.h +++ b/doomsday/client/include/resource/materials.h @@ -1,7 +1,7 @@ /** @file materials.h Material Collection. * - * @author Copyright © 2003-2013 Jaakko Keränen - * @author Copyright © 2005-2013 Daniel Swanson + * @authors Copyright © 2003-2013 Jaakko Keränen + * @authors Copyright © 2005-2013 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html diff --git a/doomsday/client/include/resource/materialscheme.h b/doomsday/client/include/resource/materialscheme.h index 973ae1b02b..1a16cdeaf0 100644 --- a/doomsday/client/include/resource/materialscheme.h +++ b/doomsday/client/include/resource/materialscheme.h @@ -1,6 +1,6 @@ /** @file materialscheme.h Material Scheme. * - * @author Copyright © 2010-2013 Daniel Swanson + * @authors Copyright © 2010-2013 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html diff --git a/doomsday/client/include/resource/materialsnapshot.h b/doomsday/client/include/resource/materialsnapshot.h index eca9e12f11..b4d06d331a 100644 --- a/doomsday/client/include/resource/materialsnapshot.h +++ b/doomsday/client/include/resource/materialsnapshot.h @@ -1,6 +1,6 @@ /** @file materialsnapshot.h Material Snapshot. * - * @author Copyright © 2011-2013 Daniel Swanson + * @authors Copyright © 2011-2013 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html diff --git a/doomsday/client/include/resource/materialvariantspec.h b/doomsday/client/include/resource/materialvariantspec.h index 704a188a58..6205e38f25 100644 --- a/doomsday/client/include/resource/materialvariantspec.h +++ b/doomsday/client/include/resource/materialvariantspec.h @@ -1,6 +1,6 @@ /** @file materialvariantspec.h Material Variant Specification. * - * @author Copyright © 2011-2013 Daniel Swanson + * @authors Copyright © 2011-2013 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html diff --git a/doomsday/client/include/resource/texture.h b/doomsday/client/include/resource/texture.h index fa85db0b75..a5b4c947d1 100644 --- a/doomsday/client/include/resource/texture.h +++ b/doomsday/client/include/resource/texture.h @@ -1,7 +1,7 @@ /** @file texture.h Logical Texture. * - * @author Copyright © 2003-2013 Jaakko Keränen - * @author Copyright © 2005-2013 Daniel Swanson + * @authors Copyright © 2003-2013 Jaakko Keränen + * @authors Copyright © 2005-2013 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html diff --git a/doomsday/client/include/resource/texturemanifest.h b/doomsday/client/include/resource/texturemanifest.h index abc87ca995..017d9a16e0 100644 --- a/doomsday/client/include/resource/texturemanifest.h +++ b/doomsday/client/include/resource/texturemanifest.h @@ -1,6 +1,6 @@ /** @file texturemanifest.h Texture Manifest. * - * @author Copyright © 2010-2013 Daniel Swanson + * @authors Copyright © 2010-2013 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html @@ -32,10 +32,11 @@ class TextureScheme; /** * Metadata for a would-be logical Texture resource. - * @ingroup resource * * Models a reference to and the associated metadata for a logical texture * in the texture resource collection. + * + * @ingroup resource */ class TextureManifest : public PathTree::Node { diff --git a/doomsday/client/include/resource/textures.h b/doomsday/client/include/resource/textures.h index f599e047cd..817d29daed 100644 --- a/doomsday/client/include/resource/textures.h +++ b/doomsday/client/include/resource/textures.h @@ -1,7 +1,7 @@ /** @file textures.h Texture Resource Collection. * - * @author Copyright © 2010-2013 Daniel Swanson - * @author Copyright © 2010-2013 Jaakko Keränen + * @authors Copyright © 2010-2013 Daniel Swanson + * @authors Copyright © 2010-2013 Jaakko Keränen * * @par License * GPL: http://www.gnu.org/licenses/gpl.html @@ -39,7 +39,6 @@ namespace de { /** * Specialized resource collection for a set of logical textures. - * @ingroup resource * * @em Clearing a texture is to 'undefine' it - any names bound to it will be * deleted and any GL textures acquired for it are 'released'. The logical @@ -53,6 +52,8 @@ namespace de { * * A) Declared but not defined. * B) Declared and defined. + * + * @ingroup resource */ class Textures { diff --git a/doomsday/client/include/resource/texturescheme.h b/doomsday/client/include/resource/texturescheme.h index e30c5c2a3f..3334b01326 100644 --- a/doomsday/client/include/resource/texturescheme.h +++ b/doomsday/client/include/resource/texturescheme.h @@ -1,8 +1,6 @@ -/** - * @file texturescheme.h - * @ingroup resource +/** @file texturescheme.h * - * @author Copyright © 2010-2013 Daniel Swanson + * @authors Copyright © 2010-2013 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html @@ -30,6 +28,7 @@ namespace de { /** * TextureScheme defines a texture system subspace. + * @ingroup resource */ class TextureScheme { diff --git a/doomsday/client/include/resource/texturevariantspec.h b/doomsday/client/include/resource/texturevariantspec.h index 5a8c55ea65..de096a1798 100644 --- a/doomsday/client/include/resource/texturevariantspec.h +++ b/doomsday/client/include/resource/texturevariantspec.h @@ -1,6 +1,6 @@ /** @file texturevariantspec.h Texture Variant Specification. * - * @author Copyright © 2011-2013 Daniel Swanson + * @authors Copyright © 2011-2013 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html diff --git a/doomsday/client/src/resource/materialarchive.cpp b/doomsday/client/src/resource/materialarchive.cpp index 235fe61ff8..6ace2fe24a 100644 --- a/doomsday/client/src/resource/materialarchive.cpp +++ b/doomsday/client/src/resource/materialarchive.cpp @@ -1,7 +1,7 @@ /** @file materialarchive.cpp Material Archive. * - * @authors Copyright © 2003-2013 Jaakko Keränen - * @authors Copyright © 2005-2013 Daniel Swanson + * @authors Copyright © 2003-2013 Jaakko Keränen + * @authors Copyright © 2005-2013 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html diff --git a/doomsday/client/src/resource/materialmanifest.cpp b/doomsday/client/src/resource/materialmanifest.cpp index 89ac2d76e8..3373af7602 100644 --- a/doomsday/client/src/resource/materialmanifest.cpp +++ b/doomsday/client/src/resource/materialmanifest.cpp @@ -1,6 +1,6 @@ /** @file materialmanifest.cpp Material Manifest. * - * @author Copyright © 2011-2013 Daniel Swanson + * @authors Copyright © 2011-2013 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html diff --git a/doomsday/client/src/resource/materials.cpp b/doomsday/client/src/resource/materials.cpp index 637942ecf1..38b98efb3c 100644 --- a/doomsday/client/src/resource/materials.cpp +++ b/doomsday/client/src/resource/materials.cpp @@ -1,7 +1,7 @@ /** @file materials.cpp Material Resource Collection. * - * @authors Copyright © 2003-2013 Jaakko Keränen - * @authors Copyright © 2005-2013 Daniel Swanson + * @authors Copyright © 2003-2013 Jaakko Keränen + * @authors Copyright © 2005-2013 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html diff --git a/doomsday/client/src/resource/materialscheme.cpp b/doomsday/client/src/resource/materialscheme.cpp index 234bbb3847..923571d3f2 100644 --- a/doomsday/client/src/resource/materialscheme.cpp +++ b/doomsday/client/src/resource/materialscheme.cpp @@ -1,6 +1,6 @@ /** @file materialscheme.cpp Material system subspace scheme. * - * @authors Copyright © 2010-2013 Daniel Swanson + * @authors Copyright © 2010-2013 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html diff --git a/doomsday/client/src/resource/materialsnapshot.cpp b/doomsday/client/src/resource/materialsnapshot.cpp index ad340e9937..7109cd57d9 100644 --- a/doomsday/client/src/resource/materialsnapshot.cpp +++ b/doomsday/client/src/resource/materialsnapshot.cpp @@ -1,6 +1,6 @@ /** @file materialsnapshot.cpp Material Snapshot. * - * @authors Copyright © 2011-2013 Daniel Swanson + * @authors Copyright © 2011-2013 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html diff --git a/doomsday/client/src/resource/materialvariant.cpp b/doomsday/client/src/resource/materialvariant.cpp index 2e8f325b6c..329ff7687e 100644 --- a/doomsday/client/src/resource/materialvariant.cpp +++ b/doomsday/client/src/resource/materialvariant.cpp @@ -1,6 +1,6 @@ /** @file materialvariant.cpp Logical Material Variant. * - * @authors Copyright © 2011-2013 Daniel Swanson + * @authors Copyright © 2011-2013 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html diff --git a/doomsday/client/src/resource/texture.cpp b/doomsday/client/src/resource/texture.cpp index b3c7996263..bcabc1415b 100644 --- a/doomsday/client/src/resource/texture.cpp +++ b/doomsday/client/src/resource/texture.cpp @@ -1,7 +1,7 @@ /** @file texture.cpp Logical Texture. * - * @authors Copyright © 2003-2013 Jaakko Keränen - * @authors Copyright © 2005-2013 Daniel Swanson + * @authors Copyright © 2003-2013 Jaakko Keränen + * @authors Copyright © 2005-2013 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html diff --git a/doomsday/client/src/resource/texturemanifest.cpp b/doomsday/client/src/resource/texturemanifest.cpp index c92939d13a..ac43402bfd 100644 --- a/doomsday/client/src/resource/texturemanifest.cpp +++ b/doomsday/client/src/resource/texturemanifest.cpp @@ -1,6 +1,6 @@ /** @file texturemanifest.cpp Texture Manifest. * - * @authors Copyright © 2010-2013 Daniel Swanson + * @authors Copyright © 2010-2013 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html diff --git a/doomsday/client/src/resource/textures.cpp b/doomsday/client/src/resource/textures.cpp index 08715b0da6..5e9d738802 100644 --- a/doomsday/client/src/resource/textures.cpp +++ b/doomsday/client/src/resource/textures.cpp @@ -1,6 +1,6 @@ /** @file textures.cpp Texture Resource Collection. * - * @authors Copyright © 2010-2013 Daniel Swanson + * @authors Copyright © 2010-2013 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html diff --git a/doomsday/client/src/resource/texturescheme.cpp b/doomsday/client/src/resource/texturescheme.cpp index 31050ffec0..8a5b0f2d20 100644 --- a/doomsday/client/src/resource/texturescheme.cpp +++ b/doomsday/client/src/resource/texturescheme.cpp @@ -1,6 +1,6 @@ /** @file texturescheme.cpp Texture system subspace scheme. * - * @authors Copyright © 2010-2013 Daniel Swanson + * @authors Copyright © 2010-2013 Daniel Swanson * * @par License * GPL: http://www.gnu.org/licenses/gpl.html diff --git a/doomsday/client/src/ui/finaleinterpreter.cpp b/doomsday/client/src/ui/finaleinterpreter.cpp index ab8812818f..b5555caf0e 100644 --- a/doomsday/client/src/ui/finaleinterpreter.cpp +++ b/doomsday/client/src/ui/finaleinterpreter.cpp @@ -1350,7 +1350,6 @@ DEFFC(BGMaterial) Material *material = 0; try { - de::Materials::Manifest *manifest = 0; if(ded_value_t* value = Def_GetValueByUri(OP_URI(0))) { material = &App_Materials().find(de::Uri(value->text, RC_NULL)).material();