detect the wrong type Q3 format by a different error message when loading

diff --git a/plugins/mapq3/plugin.cpp b/plugins/mapq3/plugin.cpp
index a11dc4a9bf3633a25e10642aa6f4449f8f8cc3f6..be7212c2bc9fa84d67e12008a8d5d50d7ee5c213 100644 (file)
--- a/plugins/mapq3/plugin.cpp
+++ b/plugins/mapq3/plugin.cpp
@@ -257,6 +257,7 @@ public:
 
 class MapQ3API : public TypeSystemRef, public MapFormat, public PrimitiveParser
 {
 
 class MapQ3API : public TypeSystemRef, public MapFormat, public PrimitiveParser
 {

+  mutable bool detectedFormat;

 public:
   typedef MapFormat Type;
   STRING_CONSTANT(Name, "mapq3");
 public:
   typedef MapFormat Type;
   STRING_CONSTANT(Name, "mapq3");


@@ -284,16 +285,30 @@ public:
       {
         if(string_equal(primitive, "brushDef"))
         {
       {
         if(string_equal(primitive, "brushDef"))
         {

+         detectedFormat = true;

           return GlobalBrushModule::getTable().createBrush();
         }
           return GlobalBrushModule::getTable().createBrush();
         }

+       else if(!detectedFormat && string_equal(primitive, "("))
+       {
+         detectedFormat = true;
+         Tokeniser_unexpectedError(tokeniser, primitive, "#quake3-switch-to-texdef");
+         return g_nullNode;
+       }

       }
       else
       {
         if(string_equal(primitive, "("))
         {
       }
       else
       {
         if(string_equal(primitive, "("))
         {

+         detectedFormat = true;

           tokeniser.ungetToken(); // (
           return GlobalBrushModule::getTable().createBrush();
         }
           tokeniser.ungetToken(); // (
           return GlobalBrushModule::getTable().createBrush();
         }

+       else if(!detectedFormat && string_equal(primitive, "("))
+       {
+         detectedFormat = true;
+         Tokeniser_unexpectedError(tokeniser, primitive, "#quake3-switch-to-brush-primitives");
+         return g_nullNode;
+       }

       }
     }
 
       }
     }
 


@@ -303,6 +318,7 @@ public:
 
   void readGraph(scene::Node& root, TextInputStream& inputStream, EntityCreator& entityTable) const
   {
 
   void readGraph(scene::Node& root, TextInputStream& inputStream, EntityCreator& entityTable) const
   {

+    detectedFormat = false;

     Tokeniser& tokeniser = GlobalScripLibModule::getTable().m_pfnNewSimpleTokeniser(inputStream);
     Map_Read(root, tokeniser, entityTable, *this);
     tokeniser.release();
     Tokeniser& tokeniser = GlobalScripLibModule::getTable().m_pfnNewSimpleTokeniser(inputStream);
     Map_Read(root, tokeniser, entityTable, *this);
     tokeniser.release();