Merge branch 'master' of ssh://github.com/skyjake/Doomsday-Engine

Conflicts:
	doomsday/engine/portable/src/dd_main.cpp

Note appropriate Doxygen formatting of the 'pre' tag (checked using
the final HTML output).

doomsday/engine/engine.pro

@@ -205,7 +205,6 @@ DENG_HEADERS += \
     portable/include/edit_map.h \
     portable/include/fi_main.h \
     portable/include/file.h \
-    portable/include/filedirectory.h \
     portable/include/filehandlebuilder.h \
     portable/include/fileinfo.h \
     portable/include/finaleinterpreter.h \
@@ -436,7 +435,7 @@ deng_nodisplaymode {
 
 # Platform-independent sources.
 SOURCES += \
-    portable/src/abstractresource.c \
+    portable/src/abstractresource.cpp \
     portable/src/animator.c \
     portable/src/audiodriver.cpp \
     portable/src/audiodriver_music.c \
@@ -495,11 +494,10 @@ SOURCES += \
     portable/src/edit_map.c \
     portable/src/fi_main.c \
     portable/src/file.cpp \
-    portable/src/filedirectory.cpp \
     portable/src/filehandle.cpp \
     portable/src/fileid.cpp \
     portable/src/finaleinterpreter.c \
-    portable/src/fonts.c \
+    portable/src/fonts.cpp \
     portable/src/fs_main.cpp \
     portable/src/fs_util.cpp \
     portable/src/game.cpp \

doomsday/engine/portable/include/bitmapfont.h

@@ -27,6 +27,10 @@
 
 #include "font.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 struct texturevariant_s;
 
 // Data for a character.
@@ -114,4 +118,8 @@ uint8_t BitmapCompositeFont_CharBorder(font_t* font, unsigned char chr);
 
 void BitmapCompositeFont_CharCoords(font_t* font, unsigned char chr, Point2Raw coords[4]);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif /* LIBDENG_BITMAPFONT_H */

doomsday/engine/portable/include/font.h

@@ -27,6 +27,10 @@
 
 #include "dd_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 // Font types.
 typedef enum {
     FT_FIRST = 0,
@@ -93,4 +97,8 @@ int Font_Leading(font_t* font);
 
 boolean Font_IsPrepared(font_t* font);
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif /* LIBDENG_FONT_H */

doomsday/engine/portable/include/fonts.h

@@ -162,7 +162,7 @@ fontid_t Fonts_ResolveUri(const Uri* uri); /*quiet=!(verbose >= 1)*/
 
 /**
  * @copydoc Fonts_ResolveUri()
- * @param queit  Suppresses the console message that is printed if the Uri cannot be found.
+ * @param quiet  Suppresses the console message that is printed if the Uri cannot be found.
  */
 fontid_t Fonts_ResolveUri2(const Uri* uri, boolean quiet);
 

doomsday/engine/portable/include/fs_util.h

@@ -181,13 +181,15 @@ int F_MatchFileName(const char* filePath, const char* pattern);
 /**
  * Write the data associated with the specified lump index to @a fileName.
  *
- * @param absolutelumpNum   Absolute index of the lump to open.
+ * @param lumpNum           Absolute index of the lump to open.
  * @param fileName          If not @c NULL write the associated data to this path.
  *                          Can be @c NULL in which case the fileName will be chosen automatically.
  *
  * @return  @c true iff successful.
  */
 boolean F_DumpLump2(lumpnum_t lumpNum, char const* fileName);
+
+/// @copydoc F_DumpLump2
 boolean F_DumpLump(lumpnum_t lumpNum/*, fileName = 0*/);
 
 /**

doomsday/engine/portable/include/gamemap.h

@@ -467,16 +467,16 @@ Polyobj* GameMap_PolyobjByBase(GameMap* map, void* ddMobjBase);
 
 /**
  * Have the thinker lists been initialized yet?
- * @param map           GameMap instance.
+ * @param map       GameMap instance.
  */
 boolean GameMap_ThinkerListInited(GameMap* map);
 
 /**
  * Init the thinker lists.
  *
- * @param map  GameMap instance.
- * @params flags  0x1 = Init public thinkers.
- *                0x2 = Init private (engine-internal) thinkers.
+ * @param map       GameMap instance.
+ * @param flags     @c 0x1 = Init public thinkers.
+ *                  @c 0x2 = Init private (engine-internal) thinkers.
  */
 void GameMap_InitThinkerLists(GameMap* map, byte flags);
 
@@ -506,25 +506,30 @@ void GameMap_ThinkerAdd(GameMap* map, thinker_t* thinker, boolean makePublic);
  * Deallocation is lazy -- it will not actually be freed until its
  * thinking turn comes up.
  *
- * @param map  GameMap instance.
+ * @param map   GameMap instance.
  */
 void GameMap_ThinkerRemove(GameMap* map, thinker_t* thinker);
 
 /**
  * Locates a mobj by it's unique identifier in the map.
- * @param map  GameMap instance.
+ *
+ * @param map   GameMap instance.
+ * @param id    Unique id of the mobj to lookup.
  */
 struct mobj_s* GameMap_MobjByID(GameMap* map, int id);
 
 /**
- * @param map  GameMap instance.
+ * @param map   GameMap instance.
+ * @param id    Thinker id to test.
  */
 boolean GameMap_IsUsedMobjID(GameMap* map, thid_t id);
 
 /**
- * @param map  GameMap instance.
+ * @param map   GameMap instance.
+ * @param id    New thinker id.
+ * @param inUse In-use state of @a id. @c true = the id is in use.
  */
-void GameMap_SetMobjID(GameMap* map, thid_t id, boolean state);
+void GameMap_SetMobjID(GameMap* map, thid_t id, boolean inUse);
 
 /**
  * @param map  GameMap instance.
@@ -555,7 +560,10 @@ void GameMap_ClMobjReset(GameMap* map);
  * Iterate the client mobj hash, exec the callback on each. Abort if callback
  * returns @c false.
  *
- * @param map  GameMap instance.
+ * @param map       GameMap instance.
+ * @param callback  Function to callback for each client mobj.
+ * @param context   Data pointer passed to the callback.
+ *
  * @return  If the callback returns @c false.
  */
 boolean GameMap_ClMobjIterator(GameMap* map, boolean (*callback) (struct mobj_s*, void*), void* context);
@@ -767,6 +775,7 @@ BspLeaf* GameMap_BspLeafAtPoint(GameMap* map, coord_t const point[2]);
 /**
  * Construct an initial (empty) Mobj Blockmap for this map.
  *
+ * @param map  GameMap instance.
  * @param min  Minimal coordinates for the map.
  * @param max  Maximal coordinates for the map.
  */
@@ -775,6 +784,7 @@ void GameMap_InitMobjBlockmap(GameMap* map, const_pvec2d_t min, const_pvec2d_t m
 /**
  * Construct an initial (empty) LineDef Blockmap for this map.
  *
+ * @param map  GameMap instance.
  * @param min  Minimal coordinates for the map.
  * @param max  Maximal coordinates for the map.
  */
@@ -783,6 +793,7 @@ void GameMap_InitLineDefBlockmap(GameMap* map, const_pvec2d_t min, const_pvec2d_
 /**
  * Construct an initial (empty) BspLeaf Blockmap for this map.
  *
+ * @param map  GameMap instance.
  * @param min  Minimal coordinates for the map.
  * @param max  Maximal coordinates for the map.
  */
@@ -791,6 +802,7 @@ void GameMap_InitBspLeafBlockmap(GameMap* map, const_pvec2d_t min, const_pvec2d_
 /**
  * Construct an initial (empty) Polyobj Blockmap for this map.
  *
+ * @param map  GameMap instance.
  * @param min  Minimal coordinates for the map.
  * @param max  Maximal coordinates for the map.
  */

doomsday/engine/portable/include/pathtree.h

@@ -375,6 +375,7 @@ typedef int (*pathtree_searchcallback_t) (PathTreeNode* node, int flags, PathMap
  * hierarchy can be performed using nodes pre-selected by the caller or using
  * @see PathTree_Iterate().
  *
+ * @param pt                PathTree instance.
  * @param flags             @ref pathComparisonFlags
  * @param mappedSearchPath  Fragment mapped search path.
  * @param callback          Callback function ptr. The callback should only return
@@ -393,10 +394,13 @@ PathTreeNode* PathTree_Find(PathTree* pt, int flags, char const* path/*, delimit
  * Iterate over nodes in the hierarchy making a callback for each. Iteration ends
  * when all nodes have been visited or a callback returns non-zero.
  *
+ * @param pt            PathTree instance.
  * @param flags         @ref pathComparisonFlags
  * @param parent        Parent node reference, used when restricting processing
  *                      to the child nodes of this node. Only used when the flag
  *                      PCF_MATCH_PARENT is set in @a flags.
+ * @param hash          If not @c PATHTREE_NOHASH only consider nodes whose hashed
+ *                      name matches this.
  * @param callback      Callback function ptr.
  * @param parameters    Passed to the callback.
  *

doomsday/engine/portable/include/sys_reslocator.h

@@ -31,9 +31,7 @@
 
 #include "dd_types.h"
 
-//#include "resourcenamespace.h"
 #include "abstractresource.h"
-#include "filedirectory.h"
 #include "uri.h"
 
 #ifdef __cplusplus
@@ -247,9 +245,6 @@ boolean F_MapGameResourcePath(resourcenamespaceid_t rni, ddstring_t* path);
  */
 boolean F_ApplyGamePathMapping(ddstring_t* path);
 
-char const* F_ParseSearchPath2(struct uri_s* dst, char const* src, char delim, resourceclass_t defaultResourceClass);
-char const* F_ParseSearchPath(struct uri_s* dst, char const* src, char delim);
-
 /**
  * Convert a resourceclass_t constant into a string for error/debug messages.
  */