X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=radiant%2Fmap.h;h=62b480471abeb2ba94886eeac696f3ea9f38b4e9;hb=9dfae1c9b270ee369c6362903a9205b30751b95f;hp=a359d46159a676405df4523b4961573c41f1d10a;hpb=7fc621fc78d0e040dc2c12f38dc53dd9048215dc;p=xonotic%2Fnetradiant.git

diff --git a/radiant/map.h b/radiant/map.h
index a359d461..62b48047 100644
--- a/radiant/map.h
+++ b/radiant/map.h
@@ -28,71 +28,82 @@
 #include "string/stringfwd.h"
 
 class Map;
+
 extern Map g_map;
 
 class MapFormat;
 
-void Map_addValidCallback( Map& map, const SignalHandler& handler );
-bool Map_Valid( const Map& map );
+void Map_addValidCallback(Map &map, const SignalHandler &handler);
 
-class DeferredDraw
-{
-Callback m_draw;
-bool m_defer;
-bool m_deferred;
+bool Map_Valid(const Map &map);
+
+class DeferredDraw {
+    Callback<void()> m_draw;
+    bool m_defer;
+    bool m_deferred;
 public:
-DeferredDraw( const Callback& draw ) : m_draw( draw ), m_defer( false ), m_deferred( false ){
-}
-void defer(){
-	m_defer = true;
-}
-void draw(){
-	if ( m_defer ) {
-		m_deferred = true;
-	}
-	else
-	{
-		m_draw();
-	}
-}
-void flush(){
-	if ( m_defer && m_deferred ) {
-		m_draw();
-	}
-	m_deferred = false;
-	m_defer = false;
-}
+    DeferredDraw(const Callback<void()> &draw) : m_draw(draw), m_defer(false), m_deferred(false)
+    {
+    }
+
+    void defer()
+    {
+        m_defer = true;
+    }
+
+    void draw()
+    {
+        if (m_defer) {
+            m_deferred = true;
+        } else {
+            m_draw();
+        }
+    }
+
+    void flush()
+    {
+        if (m_defer && m_deferred) {
+            m_draw();
+        }
+        m_deferred = false;
+        m_defer = false;
+    }
 };
 
-inline void DeferredDraw_onMapValidChanged( DeferredDraw& self ){
-	if ( Map_Valid( g_map ) ) {
-		self.flush();
-	}
-	else
-	{
-		self.defer();
-	}
+inline void DeferredDraw_onMapValidChanged(DeferredDraw &self)
+{
+    if (Map_Valid(g_map)) {
+        self.flush();
+    } else {
+        self.defer();
+    }
 }
-typedef ReferenceCaller<DeferredDraw, DeferredDraw_onMapValidChanged> DeferredDrawOnMapValidChangedCaller;
 
+typedef ReferenceCaller<DeferredDraw, void(), DeferredDraw_onMapValidChanged> DeferredDrawOnMapValidChangedCaller;
 
 
-const char* Map_Name( const Map& map );
-const MapFormat& Map_getFormat( const Map& map );
-bool Map_Unnamed( const Map& map );
+const char *Map_Name(const Map &map);
 
+const MapFormat &Map_getFormat(const Map &map);
 
-namespace scene
-{
-class Node;
-class Graph;
+bool Map_Unnamed(const Map &map);
+
+
+namespace scene {
+    class Node;
+
+    class Graph;
 }
 
-scene::Node* Map_GetWorldspawn( const Map& map );
-scene::Node* Map_FindWorldspawn( Map& map );
-scene::Node& Map_FindOrInsertWorldspawn( Map& map );
+scene::Node *Map_GetWorldspawn(const Map &map);
+
+scene::Node *Map_FindWorldspawn(Map &map);
+
+scene::Node &Map_FindOrInsertWorldspawn(Map &map);
+
+template<typename Element>
+class BasicVector3;
 
-template<typename Element> class BasicVector3;
 typedef BasicVector3<float> Vector3;
 
 extern Vector3 region_mins, region_maxs;
@@ -102,64 +113,79 @@ extern bool region_active;
 extern float g_MaxWorldCoord;
 extern float g_MinWorldCoord;
 
-void Map_LoadFile( const char* filename );
-bool Map_SaveFile( const char* filename );
+void Map_LoadFile(const char *filename);
+
+bool Map_SaveFile(const char *filename);
 
 void Map_New();
+
 void Map_Free();
 
 void Map_RegionOff();
 
-bool Map_SaveRegion( const char* filename );
+bool Map_SaveRegion(const char *filename);
 
 class TextInputStream;
+
 class TextOutputStream;
 
-void Map_ImportSelected( TextInputStream& in, const MapFormat& format );
-void Map_ExportSelected( TextOutputStream& out, const MapFormat& format );
+void Map_ImportSelected(TextInputStream &in, const MapFormat &format);
+
+void Map_ExportSelected(TextOutputStream &out, const MapFormat &format);
 
-bool Map_Modified( const Map& map );
-void Map_SetModified( Map& map, bool modified );
+bool Map_Modified(const Map &map);
+
+void Map_SetModified(Map &map, bool modified);
 
 bool Map_Save();
+
 bool Map_SaveAs();
 
-scene::Node& Node_Clone( scene::Node& node );
+scene::Node &Node_Clone(scene::Node &node);
 
 void DoMapInfo();
 
-void Scene_parentSelectedBrushesToEntity( scene::Graph& graph, scene::Node& parent );
-std::size_t Scene_countSelectedBrushes( scene::Graph& graph );
+void Scene_parentSelectedBrushesToEntity(scene::Graph &graph, scene::Node &parent);
+
+std::size_t Scene_countSelectedBrushes(scene::Graph &graph);
 
 void Scene_parentSelected();
 
 void OnUndoSizeChanged();
 
 void NewMap();
+
 void OpenMap();
+
 void ImportMap();
+
 void SaveMapAs();
+
 void SaveMap();
+
 void ExportMap();
+
 void SaveRegion();
 
 
-void Map_Traverse( scene::Node& root, const scene::Traversable::Walker& walker );
+void Map_Traverse(scene::Node &root, const scene::Traversable::Walker &walker);
 
 
-void SelectBrush( int entitynum, int brushnum );
+void SelectBrush(int entitynum, int brushnum);
 
 extern CopiedString g_strLastMap;
 extern bool g_bLoadLastMap;
 
 void Map_Construct();
+
 void Map_Destroy();
 
 
-void Map_gatherNamespaced( scene::Node& root );
+void Map_gatherNamespaced(scene::Node &root);
+
 void Map_mergeClonedNames();
 
 
-const char* getMapsPath();
+const char *getMapsPath();
 
 #endif