Changeset 1326 for code/branches

Timestamp:

May 19, 2008, 4:37:06 PM (17 years ago)

Author:

landauf

Message:

fixed crash when displaying debug-level 4 and 5 in the InGameConsole. It works perfectly now, although it's not recommended, because you won't see much of your own input in the console any more
however, performance is quite good. maybe i can improve it even more.

Location:

code/branches/console/src/core

Files:

• CoreSettings.cc (modified) (2 diffs)
• CoreSettings.h (modified) (1 diff)
• Shell.cc (modified) (3 diffs)
• Shell.h (modified) (1 diff)

code/branches/console/src/core/CoreSettings.cc

@@ -117 +117 @@
 
     /**
-        @brief Static function that holds the singleton.
+        @brief Returns the softDebugLevel for the given device (returns a default-value if the class ist right about to be created).
+        @param device The device
+        @return The softDebugLevel
     */
     int CoreSettings::getSoftDebugLevel(OutputHandler::OutputDevice device)
@@ -136 +138 @@
         return 2;
     }
+
+     /**
+        @brief Sets the softDebugLevel for the given device. Please use this only temporary and restore the value afterwards, as it overrides the configured value.
+        @param device The device
+        @param level The level
+    */
+     void CoreSettings::setSoftDebugLevel(OutputHandler::OutputDevice device, int level)
+     {
+        if (!CoreSettings::isCreatingCoreSettings())
+        {
+            if (device == OutputHandler::LD_All)
+                CoreSettings::getInstance().softDebugLevel_ = level;
+            else if (device == OutputHandler::LD_Console)
+                CoreSettings::getInstance().softDebugLevelConsole_ = level;
+            else if (device == OutputHandler::LD_Logfile)
+                CoreSettings::getInstance().softDebugLevelLogfile_ = level;
+            else if (device == OutputHandler::LD_Shell)
+                CoreSettings::getInstance().softDebugLevelShell_ = level;
+        }
+     }
 
     /**

code/branches/console/src/core/CoreSettings.h

@@ -54 +54 @@
 
             static int getSoftDebugLevel(OutputHandler::OutputDevice device = OutputHandler::LD_All);
+            static void setSoftDebugLevel(OutputHandler::OutputDevice device, int level);
             static const std::string& getLanguage();
             static void resetLanguage();

code/branches/console/src/core/Shell.cc

@@ -31 +31 @@
 #include "CoreIncludes.h"
 #include "ConfigValueIncludes.h"
+#include "CoreSettings.h"
 
 #define SHELL_UPDATE_LISTENERS(function) \
@@ -70 +71 @@
     }
 
+    Shell& Shell::createShell()
+    {
+        int level = CoreSettings::getSoftDebugLevel(OutputHandler::LD_Shell);
+        CoreSettings::setSoftDebugLevel(OutputHandler::LD_Shell, -1);
+        static Shell instance;
+        CoreSettings::setSoftDebugLevel(OutputHandler::LD_Shell, level);
+        return instance;
+    }
+
     Shell& Shell::getInstance()
     {
-        static Shell instance;
+        static Shell& instance = createShell();
         return instance;
     }
@@ -325 +335 @@
 
         this->clear();
+        this->scrollPosition_ = 0;
+        this->scrollIterator_ = this->lines_.begin();
+
         SHELL_UPDATE_LISTENERS(exit);
     }

code/branches/console/src/core/Shell.h

@@ -57 +57 @@
         public:
             static Shell& getInstance();
+            static Shell& createShell();
 
             virtual void setConfigValues();