support more locations for pixbufloader-bmp

[xonotic/netradiant.git] / radiant / brushmodule.cpp

diff --git a/radiant/brushmodule.cpp b/radiant/brushmodule.cpp
index e8b605ca7d4a8da202ff4b350610644035951b12..3cdf77a829a04b2f8aac9bb7208b688d5b22e3d5 100644 (file)
--- a/radiant/brushmodule.cpp
+++ b/radiant/brushmodule.cpp
@@ -91,22 +91,37 @@ void Brush_registerPreferencesPage()
 }
 
 void Brush_unlatchPreferences()
+{
+       Brush_toggleFormat(0);
+}
+
+void Brush_toggleFormat(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);
        }
 }
 
+int Brush_toggleFormatCount()
+{
+       if(g_showAlternativeTextureProjectionOption)
+               return 2;
+       return 1;
+}
+
 void Brush_Construct(EBrushType type)
 {
   if(type == eBrushTypeQuake3)
   {
     g_showAlternativeTextureProjectionOption = true;
 
+    const char *value = g_pGameDescription->getKeyValue("brush_primit");
+    if(!string_empty(value))
+      g_useAlternativeTextureProjection.m_latched = atoi(value);
+
     GlobalPreferenceSystem().registerPreference(
       "AlternativeTextureProjection",
       BoolImportStringCaller(g_useAlternativeTextureProjection.m_latched),