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

doomsday/engine/api/dd_infine.h

@@ -40,18 +40,24 @@ typedef ident_t finaleid_t;
  * @ingroup infine apiFlags
  */
 ///@{
-#define FF_LOCAL            0x1 /// Local scripts are executed client-side.
+#define FF_LOCAL            0x1 ///< Local scripts are executed client-side.
 ///@}
 
 /**
  * Execute a set of Finale commands.
- * @param script        One or more commands to be executed.
- * @param flags         @ref finaleFlags.
- * @param setupCmds     One or more commands to be executed immediately during
- *                      finale setup. Can be used to configure the default page
- *                      state.
+ * @param script     One or more commands to be executed.
+ * @param flags      @ref finaleFlags.
  */
 finaleid_t FI_Execute2(const char* script, int flags, const char* setupCmds);
+
+/**
+ * Execute a set of Finale commands.
+ * @param script     One or more commands to be executed.
+ * @param flags      @ref finaleFlags.
+ * @param setupCmds  One or more commands to be executed immediately during
+ *                   finale setup. Can be used to configure the default page
+ *                   state.
+ */
 finaleid_t FI_Execute(const char* script, int flags);
 
 /**

doomsday/engine/api/dd_share.h

@@ -54,13 +54,11 @@ extern "C" {
 #include "dd_gl.h"
 #include "dd_ui.h"
 #include "dd_infine.h"
-#include "../portable/include/p_think.h"
-#include "../portable/include/def_share.h"
+#include "def_share.h"
+#include "thinker.h"
 
 /** @file
  * @todo dd_version.h is not officially a public header file!
- * @todo def_share.h is not officially a public header file!
- * @todo p_think.h is not officially a public header file!
  */
 
 //------------------------------------------------------------------------

doomsday/engine/api/dd_types.h

@@ -162,11 +162,6 @@ typedef enum {
 
 #define VALID_RESOURCE_CLASS(n)     ((n) >= RESOURCECLASS_FIRST && (n) < RESOURCECLASS_COUNT)
 
-typedef struct trigger_s {
-    timespan_t      duration;
-    timespan_t      accum;
-} trigger_t;
-
 #ifndef __BYTEBOOL__
 #define __BYTEBOOL__
 #  ifdef __cplusplus

doomsday/engine/portable/include/def_share.h → doomsday/engine/api/def_share.h

@@ -1,36 +1,33 @@
-/**\file
- *\section License
- * License: GPL
- * Online License Link: http://www.gnu.org/licenses/gpl.html
- *
- *\author Copyright © 2003-2012 Jaakko Keränen <jaakko.keranen@iki.fi>
- *\author Copyright © 2005-2012 Daniel Swanson <danij@dengine.net>
+/**
+ * @file def_share.h
+ * Shared definition data structures and constants. @ingroup defs
  *
- * 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
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
+ * @authors Copyright © 2003-2012 Jaakko Keränen <jaakko.keranen@iki.fi>
+ * @authors Copyright © 2005-2012 Daniel Swanson <danij@dengine.net>
  *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
+ * @par License
+ * GPL: http://www.gnu.org/licenses/gpl.html
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor,
- * Boston, MA  02110-1301  USA
- */
-
-/**
- * def_share.h: Shared Definition Data Structures and Constants
+ * <small>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 the
+ * Free Software Foundation; either version 2 of the License, or (at your
+ * option) any later version. This program is distributed in the hope that it
+ * will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty
+ * of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
+ * Public License for more details. You should have received a copy of the GNU
+ * General Public License along with this program; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA</small>
  */
 
-#ifndef __DOOMSDAY_GAME_DATA_H__
-#define __DOOMSDAY_GAME_DATA_H__
+#ifndef LIBDENG_SHARED_GAME_DEFINITIONS_H
+#define LIBDENG_SHARED_GAME_DEFINITIONS_H
 
 #include "dd_types.h"
 
+/// @addtogroup defs
+///@{
+
 #define NUM_MOBJ_FLAGS          3
 #define NUM_MOBJ_MISC           4
 #define NUM_STATE_MISC          3
@@ -95,19 +92,24 @@ typedef struct {
 } musicinfo_t;
 
 typedef struct {
-    char*           text; // Pointer to the text (don't modify).
+    char*           text; ///< Pointer to the text (don't modify).
 } ddtext_t;
 
-// Map Info flags.
-#define MIF_FOG             0x1 // Fog is used in the map.
-#define MIF_DRAW_SPHERE     0x2 // Always draw the sky sphere.
-#define MIF_NO_INTERMISSION 0x4 // Skip any intermission between maps.
+/**
+ * @defgroup mapInfoFlags Map Info Flags
+ * @ingroup defs apiFlags
+ */
+///@{
+#define MIF_FOG             0x1 ///< Fog is used in the map.
+#define MIF_DRAW_SPHERE     0x2 ///< Always draw the sky sphere.
+#define MIF_NO_INTERMISSION 0x4 ///< Skip any intermission between maps.
+///@}
 
 typedef struct {
     char*           name;
     char*           author;
     int             music;
-    int             flags; // MIF_* flags.
+    int             flags; ///< MIF_* flags.
     float           ambient;
     float           gravity;
     float           parTime;
@@ -165,17 +167,17 @@ typedef struct {
     float           interval[DDLT_MAX_CHAINS][2];
     int             count[DDLT_MAX_CHAINS];
     int             ambientSound;
-    float           soundInterval[2]; // min,max
-    float           materialMoveAngle[2]; // floor, ceil
-    float           materialMoveSpeed[2]; // floor, ceil
+    float           soundInterval[2]; ///< min,max
+    float           materialMoveAngle[2]; ///< floor, ceil
+    float           materialMoveSpeed[2]; ///< floor, ceil
     float           windAngle;
     float           windSpeed;
     float           verticalWind;
     float           gravity;
     float           friction;
     char*           lightFunc;
     int             lightInterval[2];
-    char*           colFunc[3]; // RGB
+    char*           colFunc[3]; ///< RGB
     int             colInterval[3][2];
     char*           floorFunc;
     float           floorMul, floorOff;
@@ -185,4 +187,6 @@ typedef struct {
     int             ceilInterval[2];
 } sectortype_t;
 
-#endif
+///@}
+
+#endif // LIBDENG_SHARED_GAME_DEFINITIONS_H

doomsday/engine/api/doomsday.def

@@ -2,7 +2,7 @@
 ;
 ; Highest ordinal is currently: --> 751 <--
 ; Other free ordinals:
-;   none
+;   340, 341
 
 NAME                            "DOOMSDAY"
 
@@ -774,8 +774,6 @@ EXPORTS
     M_ClearBox                  @208 NONAME
     M_AddToBox                  @209 NONAME
     M_ScreenShot                @210 NONAME
-    M_CheckTrigger              @340 NONAME
-    M_RunTrigger                @341 NONAME
     M_CeilPow2                  @422 NONAME
     M_NumDigits                 @143 NONAME
     M_RatioReduce               @499 NONAME