clean up toggleProjection code

diff --git a/radiant/brushmodule.cpp b/radiant/brushmodule.cpp
index d5853f07248b744c4894ddc1ec4a6b29d9e3786f..da508c038abbc1e8d2a52f5ac4b84b789e7e77e2 100644 (file)
--- a/radiant/brushmodule.cpp
+++ b/radiant/brushmodule.cpp
@@ -91,25 +91,25 @@ void Brush_registerPreferencesPage()
 }
 
 void Brush_unlatchPreferences()
+{
+       Brush_toggleProjection(0);
+}
+
+void Brush_toggleProjection(int i)
 {
        if(g_showAlternativeTextureProjectionOption)
        {
-               g_useAlternativeTextureProjection.useLatched();
-               globalErrorStream() << "Unlatched g_useAlternativeTextureProjection (" << g_useAlternativeTextureProjection.m_value << ")\n";
+               g_useAlternativeTextureProjection.m_value = g_useAlternativeTextureProjection.m_latched ^ i;
                Brush::destroyStatic();
                Brush::constructStatic(g_useAlternativeTextureProjection.m_value ? eBrushTypeQuake3BP : eBrushTypeQuake3);
        }
 }
 
-void Brush_toggleProjection()
+int Brush_toggleProjectionCount()
 {
        if(g_showAlternativeTextureProjectionOption)
-       {
-               g_useAlternativeTextureProjection.m_value = !g_useAlternativeTextureProjection.m_value;
-               globalErrorStream() << "Toggled g_useAlternativeTextureProjection (" << g_useAlternativeTextureProjection.m_value << ")\n";
-               Brush::destroyStatic();
-               Brush::constructStatic(g_useAlternativeTextureProjection.m_value ? eBrushTypeQuake3BP : eBrushTypeQuake3);
-       }
+               return 2;
+       return 1;
 }
 
 void Brush_Construct(EBrushType type)

diff --git a/radiant/brushmodule.h b/radiant/brushmodule.h
index efb808af97f527ba2b7829fa37709b48e7a53cbb..4a0e40e7e425ed2feb9a36709911114484480302 100644 (file)
--- a/radiant/brushmodule.h
+++ b/radiant/brushmodule.h
@@ -24,6 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 void Brush_clipperColourChanged();
 void Brush_unlatchPreferences();
-void Brush_toggleProjection();
+int Brush_toggleProjectionCount();
+void Brush_toggleProjection(int i);
 
 #endif

diff --git a/radiant/map.cpp b/radiant/map.cpp
index 339de05f1208a2462e66ce3f638d9280b36ab6e1..86b1123a30c9f63332188d79dc98ce913c302e0a 100644 (file)
--- a/radiant/map.cpp
+++ b/radiant/map.cpp
@@ -1046,12 +1046,15 @@ void Map_LoadFile (const char *filename)
     if(format->wrongFormat)
     {
       // try toggling BrushPrimitives
-      Map_Free();
-      Brush_toggleProjection();
-      g_map.m_name = filename;
-      Map_UpdateTitle(g_map);
-      g_map.m_resource = GlobalReferenceCache().capture(g_map.m_name.c_str());
-      g_map.m_resource->attach(g_map);
+      for(i = 1; i < Brush_toggleProjectionCount(); ++i)
+      {
+       Map_Free();
+       Brush_toggleProjection(i);
+       g_map.m_name = filename;
+       Map_UpdateTitle(g_map);
+       g_map.m_resource = GlobalReferenceCache().capture(g_map.m_name.c_str());
+       g_map.m_resource->attach(g_map);
+      }
     }
 
     Node_getTraversable(GlobalSceneGraph().root())->traverse(entity_updateworldspawn());