Changeset 149 for cafu/trunk/Libs/ConsoleCommands/Console_Lua.cpp

Timestamp:

09/03/10 00:25:58 (21 months ago)

Author:

Carsten

Message:

Revision of Console code:

• New "composite console" is the new default console, making it easy to add logging into a file and the graphical console during init, and making it unnecessary to reset the console pointer in DLLs that have been initialized before the graphical console.
• Replaced several old/obsolete printf-statements (in the renderer DLLs) with their proper Console->Print() counterparts.
• Put the Lua bindings to the global Console into separate files. This way the DLLs can include Console.hpp without being forced to link the Lua libraries in.

Files:

• cafu/trunk/Libs/ConsoleCommands/Console_Lua.cpp (copied) (copied from cafu/trunk/Libs/ConsoleCommands/Console.cpp) (3 diffs)

cafu/trunk/Libs/ConsoleCommands/Console_Lua.cpp

@@ -22 +22 @@
 */
 
+#include "Console_Lua.hpp"
 #include "Console.hpp"
 
@@ -28 +29 @@
     #include <lua.h>
     #include <lauxlib.h>
-}
-
-#if defined(_WIN32) && defined (_MSC_VER)
-    #if (_MSC_VER<1300)
-        #define vsnprintf _vsnprintf
-        #define for if (false) ; else for
-    #endif
-#endif
-
-
-std::string cf::va(const char* FormatString, ...)
-{
-    va_list ArgList;
-    char    Buffer[1024];
-
-    if (!FormatString) return "";
-
-    va_start(ArgList, FormatString);
-    vsnprintf(Buffer, 1024-1, FormatString, ArgList);
-    Buffer[1024-1]=0;
-    va_end(ArgList);
-
-    return Buffer;
 }
 
@@ -194 +172 @@
 
 
-void cf::ConsoleI::RegisterLua(lua_State* LuaState)
+void cf::Console_RegisterLua(lua_State* LuaState)
 {
     static const luaL_Reg ConsoleFunctions[]=