libcommon: Cleanup

skyjake · Feb 21, 2014 · 69de5e3 · 69de5e3
1 parent 1ecc57b
commit 69de5e3
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/doomsday/plugins/common/src/g_game.cpp b/doomsday/plugins/common/src/g_game.cpp
@@ -413,13 +413,25 @@ static dd_bool quitInProgress;
 
 void G_Register()
 {
-    int i;
-
-    for(i = 0; gamestatusCVars[i].path[0]; ++i)
+    for(int i = 0; gamestatusCVars[i].path[0]; ++i)
+    {
         Con_AddVariable(gamestatusCVars + i);
+    }
+
+#if !__JHEXEN__
+    C_VAR_BYTE("game-save-auto-loadonreborn",    &cfg.loadAutoSaveOnReborn,  0, 0, 1);
+#endif
+    C_VAR_BYTE("game-save-confirm",              &cfg.confirmQuickGameSave,  0, 0, 1);
+    C_VAR_BYTE("game-save-confirm-loadonreborn", &cfg.confirmRebornLoad,     0, 0, 1);
+    C_VAR_BYTE("game-save-last-loadonreborn",    &cfg.loadLastSaveOnReborn,  0, 0, 1);
+
+    // Aliases for obsolete cvars:
+    C_VAR_BYTE("menu-quick-ask",                 &cfg.confirmQuickGameSave, 0, 0, 1);
 
-    for(i = 0; gameCmds[i].name[0]; ++i)
+    for(int i = 0; gameCmds[i].name[0]; ++i)
+    {
         Con_AddCommand(gameCmds + i);
+    }
 
     C_CMD("warp", "i", WarpMap);
     C_CMD("setmap", "i", WarpMap); // alias
@@ -497,7 +509,7 @@ void G_CommonPreInit()
     // Add our cvars and ccmds to the console databases.
     G_ConsoleRegistration();     // Main command list.
     D_NetConsoleRegistration();  // For network.
-    G_Register();                // Read-only game status cvars (for playsim).
+    G_Register();                // Top level game cvars and commands.
     Pause_Register();
     G_ControlRegister();         // For controls/input.
     SaveSlots::consoleRegister(); // Game-save system.

diff --git a/doomsday/plugins/common/src/saveslots.cpp b/doomsday/plugins/common/src/saveslots.cpp
@@ -351,15 +351,6 @@ void SaveSlots::copySlot(int sourceSlotNumber, int destSlotNumber)
 
 void SaveSlots::consoleRegister() // static
 {
-#if !__JHEXEN__
-    C_VAR_BYTE("game-save-auto-loadonreborn",    &cfg.loadAutoSaveOnReborn,  0, 0, 1);
-#endif
-    C_VAR_BYTE("game-save-confirm",              &cfg.confirmQuickGameSave,  0, 0, 1);
-    C_VAR_BYTE("game-save-confirm-loadonreborn", &cfg.confirmRebornLoad,     0, 0, 1);
-    C_VAR_BYTE("game-save-last-loadonreborn",    &cfg.loadLastSaveOnReborn,  0, 0, 1);
     C_VAR_INT ("game-save-last-slot",            &cvarLastSlot, CVF_NO_MIN|CVF_NO_MAX|CVF_NO_ARCHIVE|CVF_READ_ONLY, 0, 0);
     C_VAR_INT ("game-save-quick-slot",           &cvarQuickSlot, CVF_NO_MAX|CVF_NO_ARCHIVE, -1, 0);
-
-    // Aliases for obsolete cvars:
-    C_VAR_BYTE("menu-quick-ask",                 &cfg.confirmQuickGameSave, 0, 0, 1);
 }