Merge branch 'master' into drop-snowberry

skyjake · Nov 1, 2012 · 7d6ba58 · 7d6ba58
2 parents 0a8e925 + c6ea7b8
commit 7d6ba58
Show file tree

Hide file tree

Showing 71 changed files with 1,341 additions and 1,110 deletions.
diff --git a/doomsday/engine/api/dd_gl.h b/doomsday/engine/api/dd_gl.h
@@ -28,6 +28,10 @@
 
 #include "rect.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup gl Graphics Library
  * @ingroup render
@@ -292,4 +296,8 @@ void            DGL_DeleteTextures(int num, const DGLuint* names);
 
 ///@}
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif /* LIBDENG_DGL_H */
diff --git a/doomsday/engine/api/dd_infine.h b/doomsday/engine/api/dd_infine.h
@@ -25,6 +25,10 @@
 #ifndef LIBDENG_API_INFINE_H
 #define LIBDENG_API_INFINE_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup infine Finale Animations
  * @ingroup gui
@@ -111,4 +115,8 @@ int FI_ScriptResponder(finaleid_t id, const void* ev);
 
 ///@}
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif /* LIBDENG_API_INFINE_H */
diff --git a/doomsday/engine/api/dd_plugin.h b/doomsday/engine/api/dd_plugin.h
@@ -32,6 +32,10 @@
 
 #include "../portable/include/dd_version.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define LIBDENG_PLUGINDESC      "(" DOOMSDAY_NICENAME " Plugin)"
 
 /**
@@ -116,4 +120,8 @@ int Plug_CheckForHook(int hookType);
 
 ///@}
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif /* LIBDENG_PLUGIN_H */
diff --git a/doomsday/engine/api/dd_share.h b/doomsday/engine/api/dd_share.h
@@ -25,10 +25,6 @@
 #ifndef LIBDENG_SHARED_H
 #define LIBDENG_SHARED_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifndef C_DECL
 #  if defined(WIN32)
 /// Defines the calling convention for compare functions. Only used on Windows.
@@ -55,6 +51,10 @@ extern "C" {
 #include "busytask.h"
 #include "thinker.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /** @file
  * @todo dd_version.h is not officially a public header file!
  */
@@ -340,12 +340,6 @@ typedef struct gamedef_s {
     */
     const char* identityKey;
 
-    /// The base directory for all data-class resources.
-    const char* dataPath;
-
-    /// The base directory for all defs-class resources.
-    const char* defsPath;
-
     /// Name of the config directory.
     const char* configDir;
 

diff --git a/doomsday/engine/api/dd_ui.h b/doomsday/engine/api/dd_ui.h
@@ -26,6 +26,14 @@
 #ifndef LIBDENG_API_GUI_H
 #define LIBDENG_API_GUI_H
 
+#include "dd_animator.h"
+#include "dd_fontrenderer.h"
+#include "dd_vectorgraphic.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup gui GUI
  */
@@ -46,10 +54,6 @@ enum {
     NUM_UI_COLORS
 };
 
-#include "dd_animator.h"
-#include "dd_fontrenderer.h"
-#include "dd_vectorgraphic.h"
-
 typedef ident_t fi_objectid_t;
 
 #define FI_NAME_MAX_LENGTH          32
@@ -300,4 +304,8 @@ size_t FIData_TextLength(struct fi_object_s* text);
 
 ///@}
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif /* LIBDENG_API_GUI_H */
diff --git a/doomsday/engine/api/def_share.h b/doomsday/engine/api/def_share.h
@@ -25,6 +25,10 @@
 
 #include "dd_types.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /// @addtogroup defs
 ///@{
 
@@ -203,4 +207,8 @@ typedef struct {
 
 ///@}
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif // LIBDENG_SHARED_GAME_DEFINITIONS_H
diff --git a/doomsday/engine/api/dengproject.h b/doomsday/engine/api/dengproject.h
@@ -23,8 +23,16 @@
 #ifndef DENGPROJECT_H
 #define DENGPROJECT_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 #define DENGPROJECT_HOMEURL     "http://sourceforge.net/projects/deng/"
 #define DENGPROJECT_AUTHOR      "dengteam"
 #define DENGPROJECT_NICEAUTHOR  "Deng Team"
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif /* DENGPROJECT_H */
diff --git a/doomsday/engine/api/doomsday.def b/doomsday/engine/api/doomsday.def
@@ -299,30 +299,30 @@ EXPORTS
     Uri_New                     @238 NONAME
     Uri_NewWithPath2            @497 NONAME
     Uri_NewWithPath             @244 NONAME
-    Uri_NewCopy                 @249 NONAME
-    Uri_NewFromReader           @741 NONAME
+    Uri_Dup                     @249 NONAME
+    Uri_FromReader              @741 NONAME
     Uri_Copy                    @250 NONAME
     Uri_Delete                  @255 NONAME
-    Uri_SetUri                  @326 NONAME
-    Uri_SetUri2                 @328 NONAME
-    Uri_SetUri3                 @332 NONAME
+    Uri_SetUriStr               @326 NONAME
+    Uri_SetUri                  @328 NONAME
+    Uri_SetUri2                 @332 NONAME
     Uri_Resolved                @405 NONAME
+    Uri_ResolvedConst           @760 NONAME
     Uri_Clear                   @406 NONAME
     Uri_Scheme                  @486 NONAME
     Uri_Path                    @487 NONAME
     Uri_Compose                 @488 NONAME
     Uri_ToString                @489 NONAME
-    Uri_ToString2               @760 NONAME
     Uri_Equality                @493 NONAME
     Uri_SetPath                 @437 NONAME
     Uri_SetScheme               @500 NONAME
     Uri_Write                   @735 NONAME
     Uri_Write2                  @736 NONAME
     Uri_Read                    @737 NONAME
     Uri_ReadWithDefaultScheme   @738 NONAME
-    Uri_Print                   @821 NONAME
-    Uri_Print2                  @822 NONAME
-    Uri_Print3                  @823 NONAME
+    Uri_DebugPrint              @821 NONAME
+    Uri_DebugPrint2             @822 NONAME
+    Uri_DebugPrint3             @823 NONAME
 
 ; Base: Definitions.
     Def_Get                     @11 NONAME

diff --git a/doomsday/engine/api/doomsday.h b/doomsday/engine/api/doomsday.h
@@ -78,6 +78,10 @@ extern "C" {
 
 struct font_s;
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #include "dd_share.h"
 #include "dd_plugin.h"
 #include "filehandle.h"
@@ -90,6 +94,10 @@ struct font_s;
 #include <de/smoother.h>
 #include <de/stringpool.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 //------------------------------------------------------------------------
 //
 // Base.

diff --git a/doomsday/engine/api/rect.h b/doomsday/engine/api/rect.h
@@ -22,13 +22,13 @@
 #ifndef LIBDENG_DATA_RECT_H
 #define LIBDENG_DATA_RECT_H
 
+#include "point.h"
+#include "size.h"
+
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-#include "point.h"
-#include "size.h"
-
 /**
  * RectRaw. Rectangle Raw (i)integer. Is intended as a handy POD
  * structure for easy manipulation of rectangles using integer precison.

diff --git a/doomsday/engine/api/thinker.h b/doomsday/engine/api/thinker.h
@@ -23,6 +23,10 @@
 #ifndef LIBDENG_THINKER_H
 #define LIBDENG_THINKER_H
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /**
  * @defgroup thinker Thinkers
  * @ingroup playsim
@@ -56,4 +60,8 @@ int DD_IterateThinkers(think_t func, int (*callback) (thinker_t*, void*), void*
 boolean P_IsMobjThinker(think_t thinker);
 ///@}
 
+#ifdef __cplusplus
+} // extern "C"
+#endif
+
 #endif // LIBDENG_THINKER_H