Changeset 48

Timestamp:

04/13/10 17:06:34 (22 months ago)

Author:

Carsten

Message:

a) Changed the format of pts pointfiles to Lua. That is, pointfiles are now true, complete Lua programs:

• CaBSP has been updated to write pointfiles in the new format as Lua programs,
• CaWE has been updated to run pointfiles as Lua programs and to look into the generated Points table for the results.

b) Added a new recordPath() console function to the Cafu game client that allows recording the path of the player.

(This functionality has been asked for by Dennis Köhler from the FH Dortmund for running a new set of scientific tests.)
The recored paths are saved in the same pointfile format as those for leaks, and thus can uniformly be loaded into CaWE for visualization!

c) CaWE: Fixed occurrences of wxMessageBox(..., wxOK | wxICON_...) being called without the wxOK constant.

Some open issues for future consideration:
- Allow record-style initialization besides the existing list-style initialization.
- Support setting a custom line color in the pointfile.
- In CaWE, visualize not only the point coordinates, but also the time, heading, comments, ...

Example future pointfile:

Points=
{

-- color="blue", -- Any string that the wxColour() ctor recognizes.

-- Use record-style or list-style initialization.
{ 0; -1695, -498.692, -67.9358; 9874; "" },
{ 5.26625; -1697.05, -482.187, -67.9358; 64250; "" },
{ 5.77412; -1711.62, -364.583, -67.9358; 64250; "" },
{ t=6.30243; x=-1726.45, y=-243.117, z=-67.9358; hdg=64310; comment="" },
{ t=6.80414; -1740.28, -125.456, -43.9358; hdg=64640; "" }, -- mixed...

}

Location:

cafu/trunk

Files:

• Ca3DE/Client/ClientStateInGame.cpp (modified) (5 diffs)
• Ca3DE/Client/ClientStateInGame.hpp (modified) (3 diffs)
• Ca3DE/Client/PathRecorder.cpp (added)
• Ca3DE/Client/PathRecorder.hpp (added)
• CaBSP/BspTreeBuilder/LeakDetection.cpp (modified) (4 diffs)
• CaWE/AppCaWE.cpp (modified) (1 diff)
• CaWE/ChildFrame.cpp (modified) (1 diff)
• CaWE/EditorMaterialManager.cpp (modified) (1 diff)
• CaWE/FontWizard/FontGenerator.cpp (modified) (4 diffs)
• CaWE/GameConfig.cpp (modified) (3 diffs)
• CaWE/GuiEditor/ChildFrame.cpp (modified) (3 diffs)
• CaWE/MapDocument.cpp (modified) (5 diffs)
• CaWE/ModelEditor/SceneSetup.cpp (modified) (1 diff)
• CaWE/Options.cpp (modified) (2 diffs)
• CaWE/ParentFrame.cpp (modified) (2 diffs)
• SConscript (modified) (1 diff)

cafu/trunk/Ca3DE/Client/ClientStateInGame.cpp

@@ -25 +25 @@
 #include "Client.hpp"
 #include "ClientWorld.hpp"
+#include "PathRecorder.hpp"
+
 #include "../NetConst.hpp"
 #include "GuiSys/Gui.hpp"
@@ -116 +118 @@
 
 
+int ClientStateInGameT::ConFunc_recordPath_Callback(lua_State* LuaState)
+{
+    if (!ClientIGSPtr) return 0;
+
+    PathRecorderT*& Recorder=ClientIGSPtr->m_PathRecorder;
+    const char*     FileName=lua_tostring(LuaState, 1);
+
+    if (FileName)
+    {
+        // Already recording to the file with the given name? Continue recording.
+        // If we were not recording before, or are recording to a different file, start recording.
+        if (!Recorder || Recorder->GetFileName()!=FileName)
+        {
+            delete Recorder;
+            Recorder=new PathRecorderT(FileName);
+        }
+    }
+    else
+    {
+        // Stop recording.
+        delete Recorder;
+        Recorder=NULL;
+    }
+
+    return 0;
+}
+
+static ConFuncT ConFunc_recordPath("recordPath", ClientStateInGameT::ConFunc_recordPath_Callback, ConFuncT::FLAG_MAIN_EXE, "Records the players path into a pointfile (load into CaWE to view).");
+
+
 ClientStateInGameT::ClientStateInGameT(ClientT& Client_)
     : Client(Client_),
@@ -123 +155 @@
       IsLoadingWorld(false),
       WasLMBOnceUp(false),
-      ClientFrameNr(0)
+      ClientFrameNr(0),
+      m_PathRecorder(NULL)
 {
     assert(Client.Socket!=INVALID_SOCKET);
@@ -134 +167 @@
 ClientStateInGameT::~ClientStateInGameT()
 {
+    delete m_PathRecorder;
+    m_PathRecorder=NULL;
+
     if (Client.MainMenuGui!=NULL)
     {
@@ -824 +860 @@
         World->OurEntity_Predict(PlayerCommand, PlayerCommand.Nr /* next outgoing sequence number */);
 
+        if (m_PathRecorder)
+            m_PathRecorder->WritePath(World->OurEntity_GetState(UsePrediction.GetValueBool()), FrameTime);
+
         PlayerCommand=PlayerCommandT();     // Clear the PlayerCommand.
     }

cafu/trunk/Ca3DE/Client/ClientStateInGame.hpp

@@ -38 +38 @@
 struct CaMouseEventT;
 class  ClientT;
+class  PathRecorderT;
 
 
@@ -60 +61 @@
     static int ConFunc_chatPrint_Callback(lua_State* LuaState);
     static int ConFunc_showPath_Callback(lua_State* LuaState);
+    static int ConFunc_recordPath_Callback(lua_State* LuaState);
 
 
@@ -72 +74 @@
 
 
-    ClientT&                 Client;
+    ClientT&               Client;
 
-    GameProtocol1T           GameProtocol;
-    ArrayT< ArrayT<char> >   ReliableDatas;
-    NetDataT                 UnreliableData;
+    GameProtocol1T         GameProtocol;
+    ArrayT< ArrayT<char> > ReliableDatas;
+    NetDataT               UnreliableData;
 
-    FontT                    Font_v;
-    FontT                    Font_f;
-    CaClientWorldT*          World;
-    bool                     IsLoadingWorld;    ///< True while the world is loaded, false at all other times. This is relevant only because cf::GuiSys::GuiMan->Yield() is called while loading, which in turn calls our Render() method.
-    bool                     WasLMBOnceUp;      ///< The left mouse button must be in the released (non-pressed, up) state after the world has been loaded. This variable is false until this has been the case!
+    FontT                  Font_v;
+    FontT                  Font_f;
+    CaClientWorldT*        World;
+    bool                   IsLoadingWorld;      ///< True while the world is loaded, false at all other times. This is relevant only because cf::GuiSys::GuiMan->Yield() is called while loading, which in turn calls our Render() method.
+    bool                   WasLMBOnceUp;        ///< The left mouse button must be in the released (non-pressed, up) state after the world has been loaded. This variable is false until this has been the case!
 
-    ScrollInfoT              ChatScrollInfo;
-    ScrollInfoT              SystemScrollInfo;
-    GraphsT                  Graphs;
-    unsigned long            ClientFrameNr;
-    PlayerCommandT           PlayerCommand;     ///< The player command structure that collects the input until the next call to MainLoop().
+    ScrollInfoT            ChatScrollInfo;
+    ScrollInfoT            SystemScrollInfo;
+    GraphsT                Graphs;
+    unsigned long          ClientFrameNr;
+    PlayerCommandT         PlayerCommand;       ///< The player command structure that collects the input until the next call to MainLoop().
+    PathRecorderT*         m_PathRecorder;      ///< Records the path of this client in a pointfile that can be loaded into CaWE.
 };
 

cafu/trunk/CaBSP/BspTreeBuilder/LeakDetection.cpp

@@ -137 +137 @@
     Console->Print("\n### LEAK DETECTED! ###\n\n");
     Console->Print("A leak is a hole in the world, where the inside of it is exposed to the\n");
-    Console->Print("(unwanted) outside region. Thus, I generated a leak pointfile.\n");
-    Console->Print("Load this file into your world editor, and find the beginning of the line.\n");
+    Console->Print("(unwanted) outside region. Thus, a leak pointfile has been generated.\n");
+    Console->Print("Load this file into the world editor CaWE, and find the beginning of the line.\n");
     Console->Print("Hint: The beginning is always near one of the \"info_player_start\" entities.\n");
     Console->Print("Then find and fix the leak by tracing the line until you reach the outside.\n");
-    Console->Print("(I always take the shortest path, so this should be easy.)\n");
+    Console->Print("(The line always takes the shortest path, so this should be easy.)\n");
     Console->Print("\nNotes:\n");
     Console->Print("- Leaks can be *very* small. Use a close-up view, if necessary.\n");
     Console->Print("- Use the grid. The grid is useful to fix leaks + to avoid them from the start.\n");
     Console->Print("- Make sure that *all* \"info_player_start\" entities are inside the world!\n");
-    Console->Print("- The pointfile assumes that WcMap2Ca.exe scaled the world by factor 25.4.\n");
     Console->Print("- Be aware that both the clip hull and the draw hull must be sealed.\n");
     Console->Print("- Please refer to the documentation for additional information.\n");
@@ -154 +153 @@
     ComputeLeakPathByBFS(InfoPlayerStartOrigin);
 
-    FILE* PointFile=fopen(PointFileName.c_str(), "w");
+    std::ofstream PointFile(PointFileName.c_str());
+    unsigned long PointCount=0;
+
     if (!PointFile) Error("Could not open pointfile \"%s\" for writing!", PointFileName.c_str());
 
-    // The following is also possible in a single big for-loop that does not require the 'Points' array.
-    // However, it would then be much more complicated to consider all the special cases when something goes wrong (see below).
-    // Thus, for clarity, I keep it simple, even at the cost of sub-optimal efficiency.
-    ArrayT<VectorT> Points;
+    PointFile << "Points=\n";
+    PointFile << "{\n";
 
     // Let "S" be the start leaf that contains the 'InfoPlayerStartOrigin'.
-    // The following loop puts all the path points into the 'Points' array, including the 'InfoPlayerStartOrigin' of leaf "S".
-    // Three cases are possible, and all of them are gracefully handled (that is much harder with a big loop!):
+    // The following loop writes all the path points, including the 'InfoPlayerStartOrigin' of leaf "S".
+    // Three cases are possible, and all of them are gracefully handled:
     // a) If "S" is NOT reachable from LeafNr, something is wrong (this is a bug!).
     //    The predecessor of LeafNr is -1, and therefore only a single point (0, 0, 0) gets written.
@@ -171 +170 @@
     // c) In the normal case, as least two points are written into the 'Points' array.
     for (unsigned long CurrentLeaf=LeafNr; CurrentLeaf!=(unsigned long)-1; CurrentLeaf=BFS_Tree[CurrentLeaf])
-        Points.PushBack(scale(BFS_TreePoints[CurrentLeaf], 1.0/25.4));
-
-    for (unsigned long PointNr=0; PointNr+1<Points.Size(); PointNr++)
-    {
-        VectorT V1=Points[PointNr  ];
-        VectorT d =Points[PointNr+1]-V1;
-        double  l =length(d);
-
-        // Console->Print(cf::va("%5u %5u    %f %f %f   -   %f %f %f\n", CurrentLeaf, NextLeaf, V1.x, V1.y, V1.z, V2.x, V2.y, V2.z));
-        if (l<1.0) continue;
-        d=scale(normalize(d, 0.0), 2.0);
-
-        while (l>=0.0)
-        {
-            fprintf(PointFile, "%f %f %f\n", V1.x, V1.y, V1.z);
-            V1=V1+d;
-            l-=2.0;
-        }
-    }
-
-    fclose(PointFile);
-
-    if (Points.Size()<2)
+    {
+        const Vector3dT Point=BFS_TreePoints[CurrentLeaf]/25.4;
+
+        PointFile << "  { ";
+        PointFile << PointCount << "; " << "  ";                    // Time
+        PointFile << Point.x    << ", ";
+        PointFile << Point.y    << ", ";
+        PointFile << Point.z    << "; " << "  ";
+        PointFile << 0          << "; ";                            // Heading
+        PointFile << "\"leaf " << int(CurrentLeaf) << "\" },\n";    // Comment
+
+        PointCount++;
+    }
+
+    PointFile << "}\n";
+
+    if (PointCount<2)
     {
         Console->Print("\nSorry, I have ANOTHER WARNING:\n");
@@ -199 +192 @@
         Console->Print(">> Did you really place all your \"info_player_start\" entities INSIDE the world?\n");
         Console->Print("If you did, and you still see this message, please send an email to\n");
-        Console->Print("CarstenFuchs@T-Online.de\n");
-        Console->Print("Tell him about this message (best is to use copy & paste, or a screen-shot),\n");
+        Console->Print("info@cafu.de\n");
+        Console->Print("Tell them about this message (best is to use copy & paste, or a screen-shot),\n");
         Console->Print("and ideally, include this map as an attachment.\n");
     }

cafu/trunk/CaWE/AppCaWE.cpp

@@ -197 +197 @@
     else
     {
-        wxMessageBox(wxString("Could not open auto-save directory ")+UserDataDir, "WARNING", wxICON_ERROR);
+        wxMessageBox(wxString("Could not open auto-save directory ")+UserDataDir, "WARNING", wxOK | wxICON_ERROR);
     }
 

cafu/trunk/CaWE/ChildFrame.cpp

@@ -744 +744 @@
                 // The save was successful, but maybe it was a map export rather than a native cmap save.
                 // In this case, also keep the window open.
-                wxMessageBox("The map was exported, not saved. Please save the map before leaving.", "Map not closed.", wxICON_INFORMATION);
+                wxMessageBox("The map was exported, not saved. Please save the map before leaving.", "Map not closed.", wxOK | wxICON_INFORMATION);
                 CE.Veto();
                 return;

cafu/trunk/CaWE/EditorMaterialManager.cpp

@@ -53 +53 @@
         wxMessageBox("WARNING: No materials found in directory\n"+GameConfig.ModDir+"/Materials\n"
                      "We can continue, but the materials will NOT work.\n"
-                     "Something is wrong that really should be fixed!", "Missing Materials", wxICON_ERROR);
+                     "Something is wrong that really should be fixed!", "Missing Materials", wxOK | wxICON_ERROR);
 
         m_Materials.PushBack(new DummyMaterialT("Error: Materials not loaded!"));

cafu/trunk/CaWE/FontWizard/FontGenerator.cpp

@@ -168 +168 @@
     if (!m_FTInited && FT_Init_FreeType(&m_FTLib)!=0)
     {
-        wxMessageBox("Could not init the FreeType library.", "Error", wxICON_ERROR);
+        wxMessageBox("Could not init the FreeType library.", "Error", wxOK | wxICON_ERROR);
         return false;
     }
@@ -181 +181 @@
         if (FT_New_Face(m_FTLib, FontFile.c_str(), 0, &m_FontData[SizeNr].FTFontFace)!=0)
         {
-            wxMessageBox("Could not load the font face from \""+FontFile+"\".", "Error", wxICON_ERROR);
+            wxMessageBox("Could not load the font face from \""+FontFile+"\".", "Error", wxOK | wxICON_ERROR);
             ClearFontData();
             return false;
@@ -191 +191 @@
         if (FT_Set_Char_Size(m_FontData[SizeNr].FTFontFace, SizeInPoints*64, 0, 72, 72)!=0)
         {
-            wxMessageBox(wxString::Format("Error: Could not set the character size to %i pt.", SizeInPoints), "Error", wxICON_ERROR);
+            wxMessageBox(wxString::Format("Error: Could not set the character size to %i pt.", SizeInPoints), "Error", wxOK | wxICON_ERROR);
             continue;
         }
@@ -217 +217 @@
             if (FT_Load_Glyph(m_FontData[SizeNr].FTFontFace, GlyphIndex, FT_LOAD_RENDER)!=0)
             {
-                wxMessageBox(wxString::Format("Error: Could not obtain the glyph at index %lu.", GlyphIndex), "Error", wxICON_ERROR);
+                wxMessageBox(wxString::Format("Error: Could not obtain the glyph at index %lu.", GlyphIndex), "Error", wxOK | wxICON_ERROR);
                 continue;   // TODO: Is this proper error handling???
             }

cafu/trunk/CaWE/GameConfig.cpp

@@ -81 +81 @@
             wxMessageBox("Entity class definitions script could not be processed,\n"+
                          wxString(lua_tostring(LuaState, -1))+".\n",
-                         "Error while initializing game configuration \""+Name+"\"", wxICON_ERROR);
+                         "Error while initializing game configuration \""+Name+"\"", wxOK | wxICON_ERROR);
 
             lua_pop(LuaState, 1);
@@ -129 +129 @@
             {
                 wxMessageBox("Non-string entity class name in EntityClassDefs table.\n",
-                    "Error while initializing game configuration \""+Name+"\"", wxICON_ERROR);
+                    "Error while initializing game configuration \""+Name+"\"", wxOK | wxICON_ERROR);
                 throw InitErrorT();
             }
@@ -220 +220 @@
     }
 
-    // wxMessageBox(out, "Entity Classes Overview", wxICON_INFORMATION);
+    // wxMessageBox(out, "Entity Classes Overview", wxOK | wxICON_INFORMATION);
     wxLogDebug(out);
 #endif

cafu/trunk/CaWE/GuiEditor/ChildFrame.cpp

@@ -362 +362 @@
         wxMessageBox(wxString("I was not able to backup file '")+FileName+"' to '"+FileName+"_bak"+"'.\n"
                      "Please make sure that there is enough disk space left and that the path still exists,\n"
-                     "or use 'File -> Save As...' to save the current GUI elsewhere.", "File not saved!", wxICON_ERROR);
+                     "or use 'File -> Save As...' to save the current GUI elsewhere.", "File not saved!", wxOK | wxICON_ERROR);
         return false;
     }
@@ -667 +667 @@
                                  "This is most likely a problem in your custom script code that you should look into.\n"+
                                  "We will proceed anyway, using the script portions that were loaded before the error occurred.",
-                                 MainScriptFileName, wxICON_EXCLAMATION);
+                                 MainScriptFileName, wxOK | wxICON_EXCLAMATION);
                 }
 
@@ -676 +676 @@
             {
                 // Getting here means the GUI has no root window set, but this should never happen within CaWE.
-                wxMessageBox("There was an error initializing the live preview from script\n"+MainScriptFileName, "Live Preview", wxICON_ERROR);
+                wxMessageBox("There was an error initializing the live preview from script\n"+MainScriptFileName, "Live Preview", wxOK | wxICON_ERROR);
             }
 

cafu/trunk/CaWE/MapDocument.cpp

@@ -86 +86 @@
 #include "wx/numdlg.h"
 
+extern "C"
+{
+    #include <lua.h>
+    #include <lualib.h>
+    #include <lauxlib.h>
+}
+
 
 #if defined(_WIN32) && defined(_MSC_VER)
@@ -525 +532 @@
             wxMessageBox("Sorry, creating the backup file \""+FileName+"_bak\" before saving the map to \""+FileName+"\" didn't work out.\n"
                          "Please check the path and file permissions, "
-                         "or use 'File -> Save As...' to save the current map elsewhere.", "File not saved!", wxICON_ERROR);
+                         "or use 'File -> Save As...' to save the current map elsewhere.", "File not saved!", wxOK | wxICON_ERROR);
             return false;
         }
@@ -536 +543 @@
         {
             wxMessageBox("The file \""+FileName+"\" could not be opened for writing.\nPlease check the path and file permissions, "
-                         "or use 'File -> Save As...' to save the current map elsewhere.", "File not saved!", wxICON_ERROR);
+                         "or use 'File -> Save As...' to save the current map elsewhere.", "File not saved!", wxOK | wxICON_ERROR);
             return false;
         }
@@ -568 +575 @@
         if (OutFile.fail())
         {
-            wxMessageBox("There was an error when saving the file. Please try again.", "File not saved!", wxICON_ERROR);
+            wxMessageBox("There was an error when saving the file. Please try again.", "File not saved!", wxOK | wxICON_ERROR);
             return false;
         }
@@ -1176 +1183 @@
     }
 
-    if (!wxFileExists(PointFileName))
-    {
-        wxMessageBox("Couldn't load the pointfile.");
-        return;
-    }
-
-    TextParserT TP(PointFileName);
-
-    while (!TP.IsAtEOF())
-    {
-        const float x=TP.GetNextTokenAsFloat(); if (TP.IsAtEOF()) break;
-        const float y=TP.GetNextTokenAsFloat(); if (TP.IsAtEOF()) break;
-        const float z=TP.GetNextTokenAsFloat(); if (TP.IsAtEOF()) break;
-
-        m_PointFilePoints.PushBack(Vector3fT(x, y, z));
-    }
-
-    UpdateAllObservers(UPDATE_POINTFILE);
+
+    // Create a new Lua state.
+    lua_State* LuaState=lua_open();
+
+    try
+    {
+        if (LuaState==NULL) throw wxString("Couldn't open Lua state.");
+        if (!wxFileExists(PointFileName)) throw wxString("The file does not exist.");
+
+        lua_pushcfunction(LuaState, luaopen_base);    lua_pushstring(LuaState, "");              lua_call(LuaState, 1, 0);  // Opens the basic library.
+        lua_pushcfunction(LuaState, luaopen_package); lua_pushstring(LuaState, LUA_LOADLIBNAME); lua_call(LuaState, 1, 0);  // Opens the package library.
+        lua_pushcfunction(LuaState, luaopen_table);   lua_pushstring(LuaState, LUA_TABLIBNAME);  lua_call(LuaState, 1, 0);  // Opens the table library.
+        lua_pushcfunction(LuaState, luaopen_io);      lua_pushstring(LuaState, LUA_IOLIBNAME);   lua_call(LuaState, 1, 0);  // Opens the I/O library.
+        lua_pushcfunction(LuaState, luaopen_os);      lua_pushstring(LuaState, LUA_OSLIBNAME);   lua_call(LuaState, 1, 0);  // Opens the OS library.
+        lua_pushcfunction(LuaState, luaopen_string);  lua_pushstring(LuaState, LUA_STRLIBNAME);  lua_call(LuaState, 1, 0);  // Opens the string lib.
+        lua_pushcfunction(LuaState, luaopen_math);    lua_pushstring(LuaState, LUA_MATHLIBNAME); lua_call(LuaState, 1, 0);  // Opens the math lib.
+
+        // Load and process the Lua script file with the entity class definitions.
+        if (luaL_loadfile(LuaState, PointFileName.c_str())!=0 || lua_pcall(LuaState, 0, 0, 0)!=0)
+            throw wxString("Couldn't load the file:\n")+lua_tostring(LuaState, -1);
+
+        wxASSERT(lua_gettop(LuaState)==0);
+        m_PointFilePoints.Clear();
+        lua_getglobal(LuaState, "Points");
+        const size_t NumPoints=lua_objlen(LuaState, 1);
+
+        for (size_t PointNr=1; PointNr<=NumPoints; PointNr++)
+        {
+            // Put that table of the current point onto the stack (at index 2).
+            lua_rawgeti(LuaState, 1, PointNr);
+            m_PointFilePoints.PushBackEmpty();
+
+            for (size_t i=2; i<=4; i++)
+            {
+                lua_rawgeti(LuaState, 2, i);
+                m_PointFilePoints[PointNr-1][i-2]=lua_tonumber(LuaState, 3);
+                lua_pop(LuaState, 1);
+            }
+
+            // Remove the processed points table from the stack again.
+            lua_pop(LuaState, 1);
+        }
+
+        wxASSERT(lua_gettop(LuaState)==1);
+        lua_pop(LuaState, 1);
+
+        UpdateAllObservers(UPDATE_POINTFILE);
+    }
+    catch (const wxString& msg)
+    {
+        wxMessageBox(msg, "Error loading "+PointFileName, wxOK | wxICON_ERROR);
+    }
+
+    // Close the Lua state.
+    if (LuaState) lua_close(LuaState);
 }
 

cafu/trunk/CaWE/ModelEditor/SceneSetup.cpp

@@ -144 +144 @@
         // Don't uncomment this:
         // Changing child properties (e.g. "Pos.x" to "5") also generates events for the composite parent (e.g. "Pos" to "(5, 0, 0)")!
-        // wxMessageBox("Unknown property label \""+Name+"\".", "Warning", wxICON_ERROR);
+        // wxMessageBox("Unknown property label \""+Name+"\".", "Warning", wxOK | wxICON_ERROR);
     }
 }

cafu/trunk/CaWE/Options.cpp

@@ -139 +139 @@
             // Just do nothing but warn the user if there was an error initializing the game config,
             // that is, the game config will not be pushed back to the GameConfigs array.
-            wxMessageBox("Configuration for game \""+GameName+"\" could not be loaded!", "Warning", wxICON_EXCLAMATION);
+            wxMessageBox("Configuration for game \""+GameName+"\" could not be loaded!", "Warning", wxOK | wxICON_EXCLAMATION);
         }
 
@@ -152 +152 @@
                      "You need to have at least one game configuration inside your\n"
                      "Games directory for the editor to work.\n"
-                     "Please re-install Cafu or contact the Cafu forums for help.", "No game configurations found", wxICON_ERROR);
+                     "Please re-install Cafu or contact the Cafu forums for help.", "No game configurations found", wxOK | wxICON_ERROR);
     } */
 }

cafu/trunk/CaWE/ParentFrame.cpp

@@ -425 +425 @@
                      "You need to have at least one game configuration inside your\n"
                      "Games directory for the editor to work.\n"
-                     "Please re-install Cafu or contact the Cafu forums for help.", "No game configurations found", wxICON_ERROR);
+                     "Please re-install Cafu or contact the Cafu forums for help.", "No game configurations found", wxOK | wxICON_ERROR);
 
         return NULL;
@@ -656 +656 @@
                     {
                         if (FileName.EndsWith("_init.cgui")) new GuiEditor::ChildFrameT(this, FileName, new GuiEditor::GuiDocumentT(GameConfig, FileName));
-                                                        else wxMessageBox("Only GUI initialization scripts (_init.cgui extension) can be opened by CaWE", "Error", wxICON_ERROR);
+                                                        else wxMessageBox("Only GUI initialization scripts (_init.cgui extension) can be opened by CaWE", "Error", wxOK | wxICON_ERROR);
                     }
                     else

cafu/trunk/SConscript

@@ -124 +124 @@
 envCafu.Program('Ca3DE/Cafu',
     CafuMainObj + EngineCommonAndServerObjs + CommonWorldObject + ["Common/WorldMan.cpp"] + WinResource +
-    Split("""Ca3DE/Client/Client.cpp Ca3DE/Client/ClientStateConnecting.cpp Ca3DE/Client/ClientStateIdle.cpp Ca3DE/Client/ClientStateInGame.cpp
-             Ca3DE/Client/ClientWindow.cpp Ca3DE/Client/ClientWorld.cpp Ca3DE/Client/Graphs.cpp Ca3DE/Client/ScrlInfo.cpp"""))
+    Glob("Ca3DE/Client/*.cpp"))
 
 # Build an explicit dedicated server currently only under Linux.