API: Dropped old/obsolete W API

The specialized lump index functionality of this old API can now be accessed directly via de::LumpIndex's public API. The central lump index can be accessed via the F API's F_LumpIndex(). libcommon provides a convenient CentralLumpIndex() accessor function.
skyjake · Jun 28, 2014 · 0d0e8c4 · 0d0e8c4
1 parent adcfd4d
commit 0d0e8c4
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 374 deletions.
diff --git a/doomsday/api/api_filesys.h b/doomsday/api/api_filesys.h
@@ -71,7 +71,7 @@ DENG_API_TYPEDEF(F)
     /**
      * Returns a pointer to the global WAD lump index.
      */
-    void*           (*LumpIndex)();
+    void const*     (*LumpIndex)();
 }
 DENG_API_T(F);
 

diff --git a/doomsday/api/api_wad.h b/doomsday/api/api_wad.h
diff --git a/doomsday/api/apis.h b/doomsday/api/apis.h
@@ -1,4 +1,4 @@
-/** @file api/apis.h Doomsday's public API mechanism.
+/** @file apis.h  Doomsday's public API mechanism.
  * @ingroup base
  *
  * @authors Copyright © 2013 Jaakko Keränen <jaakko.keranen@iki.fi>
@@ -142,11 +142,7 @@ enum {
 
     DE_API_URI_v1               = 2300,    // 1.10
     DE_API_URI_v2               = 2301,    // 1.14
-    DE_API_URI                  = DE_API_URI_v2,
-
-    DE_API_WAD_v1               = 2400,    // 1.10
-    DE_API_WAD_v2               = 2401,    // 1.14
-    DE_API_WAD                  = DE_API_WAD_v2
+    DE_API_URI                  = DE_API_URI_v2
 };
 
 /**

diff --git a/doomsday/api/dd_share.h b/doomsday/api/dd_share.h
@@ -44,7 +44,6 @@
 #include "dd_version.h"
 #include "dd_types.h"
 #include "def_share.h"
-#include "api_wad.h"
 #include "api_thinker.h"
 #include "api_map.h"
 #include "api_gl.h"
@@ -152,7 +151,7 @@ enum {
     DD_PLAYBACK,
     DD_NUMSOUNDS,
     DD_NUMMUSIC,
-    DD_NUMLUMPS,
+    DD_UNUSED12, // DD_NUMLUMPS
     DD_CLIENT_PAUSED,
     DD_WEAPON_OFFSET_SCALE_Y, ///< 1000x
     DD_GAME_DATA_FORMAT,

diff --git a/doomsday/client/client.pro b/doomsday/client/client.pro
@@ -103,7 +103,6 @@ DENG_API_HEADERS = \
     $$DENG_API_DIR/api_svg.h \
     $$DENG_API_DIR/api_thinker.h \
     $$DENG_API_DIR/api_uri.h \
-    $$DENG_API_DIR/api_wad.h \
     $$DENG_API_DIR/dd_share.h \
     $$DENG_API_DIR/dd_types.h \
     $$DENG_API_DIR/dd_version.h \
@@ -541,7 +540,6 @@ SOURCES += \
     src/dd_main.cpp \
     src/dd_pinit.cpp \
     src/dd_plugin.cpp \
-    src/dd_wad.cpp \
     src/def_main.cpp \
     src/edit_bias.cpp \
     src/face.cpp \

diff --git a/doomsday/client/src/api_filesys.cpp b/doomsday/client/src/api_filesys.cpp
@@ -43,5 +43,6 @@ DENG_DECLARE_API(F) =
     F_PrettyPath,
     M_ReadFile,
     M_ReadFileIntoString,
-    M_WriteFile
+    M_WriteFile,
+    F_LumpIndex
 };
diff --git a/doomsday/client/src/dd_main.cpp b/doomsday/client/src/dd_main.cpp
@@ -2473,9 +2473,6 @@ int DD_GetInteger(int ddvalue)
         return vrCfg().mode() == VRConfig::OculusRift && vrCfg().oculusRift().isReady();
 #endif
 
-    case DD_NUMLUMPS:
-        return App_FileSystem().lumpCount();
-
     case DD_MAP_MUSIC:
         if(App_WorldSystem().hasMap())
         {
@@ -2594,11 +2591,6 @@ void *DD_GetVariable(int ddvalue)
         fracTic = gameTime * TICSPERSEC;
         return &fracTic; }
 
-    case DD_NUMLUMPS: {
-        static int count;
-        count = App_FileSystem().lumpCount();
-        return &count; }
-
     default: break;
     }