reformat code! now the code is only ugly on the *inside*

[xonotic/netradiant.git] / plugins / mapxml / plugin.cpp

diff --git a/plugins/mapxml/plugin.cpp b/plugins/mapxml/plugin.cpp
index 6bb09be8bfef06b947400c6b8c42904b3fa006a8..fb850543765efbb2bc20396ef3410b0b6c46fc3d 100644 (file)
--- a/plugins/mapxml/plugin.cpp
+++ b/plugins/mapxml/plugin.cpp
@@ -1,25 +1,23 @@
 /*
-Copyright (C) 2001-2006, William Joseph.
-All Rights Reserved.
+   Copyright (C) 2001-2006, William Joseph.
+   All Rights Reserved.
 
-This file is part of GtkRadiant.
+   This file is part of GtkRadiant.
 
-GtkRadiant is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
+   GtkRadiant is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
 
-GtkRadiant is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
+   GtkRadiant is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-You should have received a copy of the GNU General Public License
-along with GtkRadiant; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-*/
-
-#include "plugin.h"
+   You should have received a copy of the GNU General Public License
+   along with GtkRadiant; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+ */
 
 #include "ibrush.h"
 #include "ipatch.h"
@@ -35,45 +33,63 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 
 class MapXMLDependencies :
-  public GlobalRadiantModuleRef,
-  public GlobalBrushModuleRef,
-  public GlobalPatchModuleRef,
-  public GlobalFiletypesModuleRef,
-  public GlobalEntityClassManagerModuleRef,
-  public GlobalSceneGraphModuleRef
-{
+        public GlobalRadiantModuleRef,
+        public GlobalBrushModuleRef,
+        public GlobalFiletypesModuleRef,
+        public GlobalEntityClassManagerModuleRef,
+        public GlobalSceneGraphModuleRef {
+    PatchModuleRef m_patchDef2Doom3Module;
+    PatchModuleRef m_patchDoom3Module;
 public:
-  MapXMLDependencies() :
-    GlobalBrushModuleRef(GlobalRadiant().getRequiredGameDescriptionKeyValue("brushtypes")),
-    GlobalPatchModuleRef(GlobalRadiant().getRequiredGameDescriptionKeyValue("patchtypes")),
-    GlobalEntityClassManagerModuleRef(GlobalRadiant().getRequiredGameDescriptionKeyValue("entityclass"))
-  {
-  }
+    MapXMLDependencies() :
+            GlobalBrushModuleRef(GlobalRadiant().getRequiredGameDescriptionKeyValue("brushtypes")),
+            GlobalEntityClassManagerModuleRef(GlobalRadiant().getRequiredGameDescriptionKeyValue("entityclass")),
+            m_patchDef2Doom3Module("def2doom3"),
+            m_patchDoom3Module("doom3")
+    {
+    }
+
+    BrushCreator &getBrushDoom3()
+    {
+        return GlobalBrushModule::getTable();
+    }
+
+    PatchCreator &getPatchDoom3()
+    {
+        return *m_patchDoom3Module.getTable();
+    }
+
+    PatchCreator &getPatchDef2Doom3()
+    {
+        return *m_patchDef2Doom3Module.getTable();
+    }
 };
 
-class MapXMLAPI : public TypeSystemRef, public MapFormat
-{
+class MapXMLAPI : public TypeSystemRef, public MapFormat {
 public:
-  typedef MapFormat Type;
-  STRING_CONSTANT(Name, "xmlq3");
-
-  MapXMLAPI()
-  {
-    GlobalFiletypesModule::getTable().addType(Type::Name(), Name(), filetype_t("xml quake3 maps", "*.xmap"));
-  }
-  MapFormat* getTable()
-  {
-    return this;
-  }
-
-  void readGraph(scene::Node& root, TextInputStream& inputStream, EntityCreator& entityTable) const
-  {
-    Map_Read(root, inputStream, entityTable);
-  }
-  void writeGraph(scene::Node& root, GraphTraversalFunc traverse, TextOutputStream& outputStream) const
-  {
-    Map_Write(root, traverse, outputStream);
-  }
+    typedef MapFormat Type;
+
+    STRING_CONSTANT(Name, "xmldoom3");
+
+    MapXMLAPI()
+    {
+        GlobalFiletypesModule::getTable().addType(Type::Name(), Name(), filetype_t("xml doom3 maps", "*.xmap"));
+    }
+
+    MapFormat *getTable()
+    {
+        return this;
+    }
+
+    void readGraph(scene::Node &root, TextInputStream &inputStream, EntityCreator &entityTable) const
+    {
+        Map_Read(root, inputStream, entityTable);
+    }
+
+    void writeGraph(scene::Node &root, GraphTraversalFunc traverse, TextOutputStream &outputStream) const
+    {
+        Map_Write(root, traverse, outputStream);
+    }
 };
 
 typedef SingletonModule<MapXMLAPI, MapXMLDependencies> MapXMLModule;
@@ -81,10 +97,12 @@ typedef SingletonModule<MapXMLAPI, MapXMLDependencies> MapXMLModule;
 MapXMLModule g_MapXMLModule;
 
 
-
-extern "C" void RADIANT_DLLEXPORT Radiant_RegisterModules(ModuleServer& server)
+extern "C" void RADIANT_DLLEXPORT Radiant_RegisterModules(ModuleServer &server)
 {
-  initialiseModule(server);
+    GlobalErrorStream::instance().setOutputStream(server.getErrorStream());
+    GlobalOutputStream::instance().setOutputStream(server.getOutputStream());
+    GlobalDebugMessageHandler::instance().setHandler(server.getDebugMessageHandler());
+    GlobalModuleServer::instance().set(server);
 
-  g_MapXMLModule.selfRegister();
+    g_MapXMLModule.selfRegister();
 }