Post merge fixes and cleanup

skyjake · Jan 20, 2013 · 2972ebb · 2972ebb
1 parent 61779a3
commit 2972ebb
Show file tree

Hide file tree

Showing 24 changed files with 38 additions and 36 deletions.
diff --git 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
@@ -1,7 +1,7 @@
 /** @file material.h Logical material.
  *
- * @author Copyright &copy; 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
- * @author Copyright &copy; 2005-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2003-2013 Jaakko KerÃ¤nen <jaakko.keranen@iki.fi>
+ * @authors Copyright © 2005-2013 Daniel Swanson <danij@dengine.net>
  *
  * @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
@@ -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 &copy; 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
- * @author Copyright &copy; 2005-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2003-2013 Jaakko KerÃ¤nen <jaakko.keranen@iki.fi>
+ * @authors Copyright © 2005-2013 Daniel Swanson <danij@dengine.net>
  *
  * @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
@@ -1,6 +1,6 @@
 /** @file materialmanifest.h Material Manifest.
  *
- * @author Copyright &copy; 2011-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2011-2013 Daniel Swanson <danij@dengine.net>
  *
  * @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
@@ -1,7 +1,7 @@
 /** @file materials.h Material Collection.
  *
- * @author Copyright &copy; 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
- * @author Copyright &copy; 2005-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2003-2013 Jaakko KerÃ¤nen <jaakko.keranen@iki.fi>
+ * @authors Copyright © 2005-2013 Daniel Swanson <danij@dengine.net>
  *
  * @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
@@ -1,6 +1,6 @@
 /** @file materialscheme.h Material Scheme.
  *
- * @author Copyright &copy; 2010-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2010-2013 Daniel Swanson <danij@dengine.net>
  *
  * @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
@@ -1,6 +1,6 @@
 /** @file materialsnapshot.h Material Snapshot.
  *
- * @author Copyright &copy; 2011-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2011-2013 Daniel Swanson <danij@dengine.net>
  *
  * @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
@@ -1,6 +1,6 @@
 /** @file materialvariantspec.h Material Variant Specification.
  *
- * @author Copyright &copy; 2011-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2011-2013 Daniel Swanson <danij@dengine.net>
  *
  * @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
@@ -1,7 +1,7 @@
 /** @file texture.h Logical Texture.
  *
- * @author Copyright &copy; 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
- * @author Copyright &copy; 2005-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2003-2013 Jaakko KerÃ¤nen <jaakko.keranen@iki.fi>
+ * @authors Copyright © 2005-2013 Daniel Swanson <danij@dengine.net>
  *
  * @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
@@ -1,6 +1,6 @@
 /** @file texturemanifest.h Texture Manifest.
  *
- * @author Copyright &copy; 2010-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2010-2013 Daniel Swanson <danij@dengine.net>
  *
  * @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
@@ -1,7 +1,7 @@
 /** @file textures.h Texture Resource Collection.
  *
- * @author Copyright &copy; 2010-2013 Daniel Swanson <danij@dengine.net>
- * @author Copyright &copy; 2010-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
+ * @authors Copyright © 2010-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2010-2013 Jaakko KerÃ¤nen <jaakko.keranen@iki.fi>
  *
  * @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
@@ -1,8 +1,6 @@
-/**
- * @file texturescheme.h
- * @ingroup resource
+/** @file texturescheme.h
  *
- * @author Copyright &copy; 2010-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2010-2013 Daniel Swanson <danij@dengine.net>
  *
  * @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
@@ -1,6 +1,6 @@
 /** @file texturevariantspec.h Texture Variant Specification.
  *
- * @author Copyright &copy; 2011-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2011-2013 Daniel Swanson <danij@dengine.net>
  *
  * @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
@@ -1,7 +1,7 @@
 /** @file materialarchive.cpp Material Archive.
  *
- * @authors Copyright &copy; 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
- * @authors Copyright &copy; 2005-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2003-2013 Jaakko KerÃ¤nen <jaakko.keranen@iki.fi>
+ * @authors Copyright © 2005-2013 Daniel Swanson <danij@dengine.net>
  *
  * @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
@@ -1,6 +1,6 @@
 /** @file materialmanifest.cpp Material Manifest.
  *
- * @author Copyright &copy; 2011-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2011-2013 Daniel Swanson <danij@dengine.net>
  *
  * @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
@@ -1,7 +1,7 @@
 /** @file materials.cpp Material Resource Collection.
  *
- * @authors Copyright © 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
- * @authors Copyright © 2005-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2003-2013 Jaakko KerÃ¤nen <jaakko.keranen@iki.fi>
+ * @authors Copyright © 2005-2013 Daniel Swanson <danij@dengine.net>
  *
  * @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
@@ -1,6 +1,6 @@
 /** @file materialscheme.cpp Material system subspace scheme.
  *
- * @authors Copyright &copy; 2010-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2010-2013 Daniel Swanson <danij@dengine.net>
  *
  * @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
@@ -1,6 +1,6 @@
 /** @file materialsnapshot.cpp Material Snapshot.
  *
- * @authors Copyright &copy; 2011-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2011-2013 Daniel Swanson <danij@dengine.net>
  *
  * @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
@@ -1,6 +1,6 @@
 /** @file materialvariant.cpp Logical Material Variant.
  *
- * @authors Copyright &copy; 2011-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2011-2013 Daniel Swanson <danij@dengine.net>
  *
  * @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
@@ -1,7 +1,7 @@
 /** @file texture.cpp Logical Texture.
  *
- * @authors Copyright &copy; 2003-2013 Jaakko Keränen <jaakko.keranen@iki.fi>
- * @authors Copyright &copy; 2005-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2003-2013 Jaakko KerÃ¤nen <jaakko.keranen@iki.fi>
+ * @authors Copyright © 2005-2013 Daniel Swanson <danij@dengine.net>
  *
  * @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
@@ -1,6 +1,6 @@
 /** @file texturemanifest.cpp Texture Manifest.
  *
- * @authors Copyright &copy; 2010-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2010-2013 Daniel Swanson <danij@dengine.net>
  *
  * @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
@@ -1,6 +1,6 @@
 /** @file textures.cpp Texture Resource Collection.
  *
- * @authors Copyright &copy; 2010-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2010-2013 Daniel Swanson <danij@dengine.net>
  *
  * @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
@@ -1,6 +1,6 @@
 /** @file texturescheme.cpp Texture system subspace scheme.
  *
- * @authors Copyright &copy; 2010-2013 Daniel Swanson <danij@dengine.net>
+ * @authors Copyright © 2010-2013 Daniel Swanson <danij@dengine.net>
  *
  * @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
@@ -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();