Game|Resources: Added method of querying the logical status of a Game

doomsday/client/include/game.h

@@ -44,6 +44,13 @@ class ResourceManifest;
 class Game : public de::game::Game
 {
 public:
+    /// Logical game status:
+    enum Status {
+        Loaded,
+        Complete,
+        Incomplete
+    };
+
     typedef QMultiMap<resourceclassid_t, ResourceManifest *> Manifests;
 
 public:
@@ -56,9 +63,31 @@ class Game : public de::game::Game
 
     virtual ~Game();
 
-    /// @return  Unique plugin identifier attributed to that which registered this.
+    /**
+     * Determines the status of the game.
+     *
+     * @see statusAsText()
+     */
+    Status status() const;
+
+    /**
+     * Returns a textual representation of the current game status.
+     *
+     * @see status()
+     */
+    String const &statusAsText() const;
+
+    /**
+     * Returns the unique identifier of the plugin which registered the game.
+     */
     pluginid_t pluginId() const;
 
+    /**
+     * Change the identfier of the plugin associated with this.
+     * @param newId  New identifier.
+     */
+    void setPluginId(pluginid_t newId);
+
     /**
      * Returns the unique identity key of the game.
      */
@@ -84,12 +113,6 @@ class Game : public de::game::Game
      */
     de::Path const &bindingConfig() const;
 
-    /**
-     * Change the identfier of the plugin associated with this.
-     * @param newId  New identifier.
-     */
-    void setPluginId(pluginid_t newId);
-
     /**
      * Add a new manifest to the list of manifests.
      *

doomsday/client/src/game.cpp

@@ -90,16 +90,39 @@ bool Game::allStartupFilesFound() const
     return true;
 }
 
-void Game::setPluginId(pluginid_t newId)
+Game::Status Game::status() const
 {
-    d->pluginId = newId;
+    if(App_GameLoaded() && &App_CurrentGame() == this)
+    {
+        return Loaded;
+    }
+    if(allStartupFilesFound())
+    {
+        return Complete;
+    }
+    return Incomplete;
+}
+
+String const &Game::statusAsText() const
+{
+    static String const statusTexts[] = {
+        "Loaded",
+        "Complete/Playable",
+        "Incomplete/Not playable",
+    };
+    return statusTexts[int(status())];
 }
 
 pluginid_t Game::pluginId() const
 {
     return d->pluginId;
 }
 
+void Game::setPluginId(pluginid_t newId)
+{
+    d->pluginId = newId;
+}
+
 String const &Game::identityKey() const
 {
     return d->identityKey;
@@ -260,10 +283,7 @@ D_CMD(InspectGame)
     LOG_MSG("Other resources:");
     Game::printFiles(*game, 0, false);
 
-    LOG_MSG("Status: ")
-        << (  &App_CurrentGame() == game? "Loaded" :
-            game->allStartupFilesFound()? "Complete/Playable" :
-                                          "Incomplete/Not playable");
+    LOG_MSG("Status: ") << game->statusAsText();
 
     return true;
 }

doomsday/client/src/games.cpp

@@ -227,10 +227,7 @@ static int locateAllResourcesWorker(void *context)
             LOG_MSG("Startup resources:");
             Game::printFiles(*game, FF_STARTUP);
 
-            LOG_MSG("Status: ")
-                << (&App_CurrentGame() == game? "Loaded" :
-                    game->allStartupFilesFound()? "Complete/Playable" :
-                                                  "Incomplete/Not playable");
+            LOG_MSG("Status: ") << game->statusAsText();
         )
         ++n;
     }