From: Rudolf Polzer Date: Sun, 10 Oct 2010 11:54:01 +0000 (+0200) Subject: rename to toggleFormat X-Git-Tag: xonotic-v0.5.0~176 X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fnetradiant.git;a=commitdiff_plain;h=182f62c459ad1b9e5439fd9d1f141e29c0138840 rename to toggleFormat --- diff --git a/radiant/brushmodule.cpp b/radiant/brushmodule.cpp index da508c03..21cec0ee 100644 --- a/radiant/brushmodule.cpp +++ b/radiant/brushmodule.cpp @@ -92,10 +92,10 @@ void Brush_registerPreferencesPage() void Brush_unlatchPreferences() { - Brush_toggleProjection(0); + Brush_toggleFormat(0); } -void Brush_toggleProjection(int i) +void Brush_toggleFormat(int i) { if(g_showAlternativeTextureProjectionOption) { @@ -105,7 +105,7 @@ void Brush_toggleProjection(int i) } } -int Brush_toggleProjectionCount() +int Brush_toggleFormatCount() { if(g_showAlternativeTextureProjectionOption) return 2; diff --git a/radiant/brushmodule.h b/radiant/brushmodule.h index 4a0e40e7..ac89a890 100644 --- a/radiant/brushmodule.h +++ b/radiant/brushmodule.h @@ -24,7 +24,7 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA void Brush_clipperColourChanged(); void Brush_unlatchPreferences(); -int Brush_toggleProjectionCount(); -void Brush_toggleProjection(int i); +int Brush_toggleFormatCount(); +void Brush_toggleFormat(int i); #endif diff --git a/radiant/map.cpp b/radiant/map.cpp index 86b1123a..ece542bb 100644 --- a/radiant/map.cpp +++ b/radiant/map.cpp @@ -1046,10 +1046,10 @@ void Map_LoadFile (const char *filename) if(format->wrongFormat) { // try toggling BrushPrimitives - for(i = 1; i < Brush_toggleProjectionCount(); ++i) + for(i = 1; i < Brush_toggleFormatCount(); ++i) { Map_Free(); - Brush_toggleProjection(i); + Brush_toggleFormat(i); g_map.m_name = filename; Map_UpdateTitle(g_map); g_map.m_resource = GlobalReferenceCache().capture(g_map.m_name.c_str());