Changeset 117 for cafu/trunk/CaBSP/LoadWorld.cpp

Timestamp:

08/15/10 00:56:03 (22 months ago)

Author:

Carsten

Message:

• Fixed the cmap loader code in CollModelManImplT::GetCM() as reported at <http://www.cafu.de/forum/viewtopic.php?f=2&t=762>.
• Upgraded all older cmap files to the current cmap version 13.

Files:

• cafu/trunk/CaBSP/LoadWorld.cpp (modified) (1 diff)

cafu/trunk/CaBSP/LoadWorld.cpp

@@ -261 +261 @@
     // Parse all map entities into the MFEntityList.
     ArrayT<MapFileEntityT> MFEntityList;
-
-    // Should change set of delimiters to "({})" later, when textures don't contain '{' characters anymore, or are quoted.
-    TextParserT TP(LoadName, "()");
-
-    if (TP.IsAtEOF()) Error("Unable to open map file.");
+    TextParserT            TP(LoadName, "({})");
 
     try
     {
-        TP.AssertAndSkipToken("Version");
-        const std::string Version=TP.GetNextToken();
-
-        if (Version!="13")
-        {
-            Console->Print("Bad map file version: Expected 13, got "+Version+".\n");
-            Console->Print("To fix this, you can load your cmap file into CaWE and re-save it.\n");
-            Console->Print("This will automatically update your file to the required version!\n");
-
-            Console->Warning("Bad map file version: Expected 13, got "+Version+".\n");
-            throw TextParserT::ParseError();
-        }
-
-        // Skip any group definitions.
-        while (TP.PeekNextToken()=="GroupDef")
-        {
-            // Example line:
-            //   GroupDef 0 "control room" "rgb(189, 206, 184)" 1 1 0
-            for (unsigned int TokenNr=0; TokenNr<7; TokenNr++) TP.GetNextToken();
-        }
+        MapFileReadHeader(TP);
 
         while (!TP.IsAtEOF())