Changeset 9550 for code/trunk/src/orxonox/overlays

Timestamp:

Mar 12, 2013, 11:13:03 PM (12 years ago)

Author:

landauf

Message:

merged testing branch back to trunk. unbelievable it took me 13 months to finish this chore…

Location:

code/trunk

Files:

• . (modified) (1 prop)
• src/orxonox/overlays/InGameConsole.cc (modified) (2 diffs)

code/trunk/src/orxonox/overlays/InGameConsole.cc

@@ -47 +47 @@
 #include "util/ScopedSingletonManager.h"
 #include "util/output/MemoryWriter.h"
+#include "util/output/OutputManager.h"
 #include "core/CoreIncludes.h"
 #include "core/ConfigValueIncludes.h"
@@ -95 +96 @@
         // Output buffering is not anymore needed. Not the best solution to do
         // this here, but there isn't much of another way.
-        MemoryWriter::getInstance().disable();
+        OutputManager::getInstance().getMemoryWriter()->disable();
     }