Changeset 923

Timestamp:

03/16/10 00:50:07 (5 months ago)

Author:

zoogie

Message:

Added "Config" class in Lua (C++ peer: ConfigPeer).

Example (in an init script):

local cfg = game:get_config()
cfg:unlink() -- Prevents accidental writing to disk
local w, h = cfg:get_video_res()
print("Video res from config: ", w, h)

Location:

trunk/client

Files:

• client.vcproj (modified) (3 diffs)
• Game2/ConfigPeer.cpp (added)
• Game2/ConfigPeer.h (added)
• Game2/GameApp.cpp (modified) (2 diffs)
• Game2/GamePeer.cpp (modified) (3 diffs)
• Game2/GamePeer.h (modified) (2 diffs)

trunk/client/client.vcproj

@@ -234 +234 @@
             </File>
             <File
+                RelativePath=".\Game2\ConfigPeer.cpp"
+                >
+            </File>
+            <File
+                RelativePath=".\Game2\ConfigPeer.h"
+                >
+            </File>
+            <File
                 RelativePath=".\Game2\Console.cpp"
                 >
@@ -740 +748 @@
                         Name="VCCustomBuildTool"
                         Description="$(InputFileName)"
-                        CommandLine="copy &quot;$(InputPath)&quot; $(OutDir)"
+                        CommandLine="copy &quot;$(InputPath)&quot; $(OutDir)&#x0D;&#x0A;"
                         Outputs="$(OutDir)\$(InputFileName)"
                     />
@@ -751 +759 @@
                         Name="VCCustomBuildTool"
                         Description="$(InputFileName)"
-                        CommandLine="copy &quot;$(InputPath)&quot; $(OutDir)"
+                        CommandLine="copy &quot;$(InputPath)&quot; $(OutDir)&#x0D;&#x0A;"
                         Outputs="$(OutDir)\$(InputFileName)"
                     />

trunk/client/Game2/GameApp.cpp

@@ -26 +26 @@
 #include "GameApp.h"
 #include "AboutDialog.h"
+#include "ConfigPeer.h"
 #include "FirstChoiceDialog.h"
 #include "FullscreenTest.h"
@@ -1147 +1148 @@
     // This allows the script to modify the configuration (e.g. for unit tests).
     scripting = new Script::Core();
+    ConfigPeer::Register(scripting);
     GamePeer::Register(scripting);
     gamePeer = new GamePeer(scripting);

trunk/client/Game2/GamePeer.cpp

@@ -23 +23 @@
 #include "StdAfx.h"
 
+#include <luabind/adopt_policy.hpp>
+
 #include "../../engine/Script/Core.h"
+#include "ConfigPeer.h"
 
 #include "GamePeer.h"
@@ -58 +61 @@
     module(L) [
         class_<GamePeer>("Game")
+            .def("get_config", &LGetConfig, adopt(result))
             .def("get_on_init", &LGetOnInit)
             .def("on_init", &LOnInit)
@@ -84 +88 @@
     // table
     lua_pop(L, 1);
+}
+
+ConfigPeer *GamePeer::LGetConfig()
+{
+    // function get_config()
+    // Returns the game configuration, so it can be modified.
+    return new ConfigPeer(scripting);
 }
 

trunk/client/Game2/GamePeer.h

@@ -27 +27 @@
 
 namespace HoverRace {
+    namespace Client {
+        class ConfigPeer;
+    }
     namespace Script {
         class Core;
@@ -53 +56 @@
 
     public:
+        ConfigPeer *LGetConfig();
+
         void LOnInit(const luabind::object &fn);
         void LGetOnInit();