Revert partially (auto) "reformat code! now the code is only ugly on the *inside*"

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

diff --git a/plugins/entity/plugin.cpp b/plugins/entity/plugin.cpp
index d67ad14c404da55494348edc47ba3ce4919096ea..58b6fb37ee5a854d981f7b81b0ca0487d78c2567 100644 (file)
--- a/plugins/entity/plugin.cpp
+++ b/plugins/entity/plugin.cpp
@@ -43,44 +43,40 @@
 #include "modulesystem/singletonmodule.h"
 
 class EntityDependencies :
-        public GlobalRadiantModuleRef,
-        public GlobalOpenGLModuleRef,
-        public GlobalUndoModuleRef,
-        public GlobalSceneGraphModuleRef,
-        public GlobalShaderCacheModuleRef,
-        public GlobalSelectionModuleRef,
-        public GlobalReferenceModuleRef,
-        public GlobalFilterModuleRef,
-        public GlobalPreferenceSystemModuleRef,
-        public GlobalNamespaceModuleRef,
-        public GlobalModelSkinCacheModuleRef {
+       public GlobalRadiantModuleRef,
+       public GlobalOpenGLModuleRef,
+       public GlobalUndoModuleRef,
+       public GlobalSceneGraphModuleRef,
+       public GlobalShaderCacheModuleRef,
+       public GlobalSelectionModuleRef,
+       public GlobalReferenceModuleRef,
+       public GlobalFilterModuleRef,
+       public GlobalPreferenceSystemModuleRef,
+       public GlobalNamespaceModuleRef,
+       public GlobalModelSkinCacheModuleRef
+{
 };
 
-class EntityQ3API : public TypeSystemRef {
-    EntityCreator *m_entityq3;
+class EntityQ3API : public TypeSystemRef
+{
+EntityCreator* m_entityq3;
 public:
-    typedef EntityCreator Type;
-
-    STRING_CONSTANT(Name, "quake3");
+typedef EntityCreator Type;
+STRING_CONSTANT( Name, "quake3" );
 
-    EntityQ3API()
-    {
-        Entity_Construct();
+EntityQ3API(){
+       Entity_Construct();
 
-        m_entityq3 = &GetEntityCreator();
+       m_entityq3 = &GetEntityCreator();
 
-        GlobalReferenceCache().setEntityCreator(*m_entityq3);
-    }
-
-    ~EntityQ3API()
-    {
-        Entity_Destroy();
-    }
-
-    EntityCreator *getTable()
-    {
-        return m_entityq3;
-    }
+       GlobalReferenceCache().setEntityCreator( *m_entityq3 );
+}
+~EntityQ3API(){
+       Entity_Destroy();
+}
+EntityCreator* getTable(){
+       return m_entityq3;
+}
 };
 
 typedef SingletonModule<EntityQ3API, EntityDependencies> EntityQ3Module;
@@ -88,31 +84,26 @@ typedef SingletonModule<EntityQ3API, EntityDependencies> EntityQ3Module;
 EntityQ3Module g_EntityQ3Module;
 
 
-class EntityWolfAPI : public TypeSystemRef {
-    EntityCreator *m_entitywolf;
+class EntityWolfAPI : public TypeSystemRef
+{
+EntityCreator* m_entitywolf;
 public:
-    typedef EntityCreator Type;
-
-    STRING_CONSTANT(Name, "wolf");
-
-    EntityWolfAPI()
-    {
-        Entity_Construct(eGameTypeRTCW);
-
-        m_entitywolf = &GetEntityCreator();
+typedef EntityCreator Type;
+STRING_CONSTANT( Name, "wolf" );
 
-        GlobalReferenceCache().setEntityCreator(*m_entitywolf);
-    }
+EntityWolfAPI(){
+       Entity_Construct( eGameTypeRTCW );
 
-    ~EntityWolfAPI()
-    {
-        Entity_Destroy();
-    }
+       m_entitywolf = &GetEntityCreator();
 
-    EntityCreator *getTable()
-    {
-        return m_entitywolf;
-    }
+       GlobalReferenceCache().setEntityCreator( *m_entitywolf );
+}
+~EntityWolfAPI(){
+       Entity_Destroy();
+}
+EntityCreator* getTable(){
+       return m_entitywolf;
+}
 };
 
 typedef SingletonModule<EntityWolfAPI, EntityDependencies> EntityWolfModule;
@@ -120,31 +111,26 @@ typedef SingletonModule<EntityWolfAPI, EntityDependencies> EntityWolfModule;
 EntityWolfModule g_EntityWolfModule;
 
 
-class EntityDoom3API : public TypeSystemRef {
-    EntityCreator *m_entitydoom3;
+class EntityDoom3API : public TypeSystemRef
+{
+EntityCreator* m_entitydoom3;
 public:
-    typedef EntityCreator Type;
-
-    STRING_CONSTANT(Name, "doom3");
-
-    EntityDoom3API()
-    {
-        Entity_Construct(eGameTypeDoom3);
+typedef EntityCreator Type;
+STRING_CONSTANT( Name, "doom3" );
 
-        m_entitydoom3 = &GetEntityCreator();
+EntityDoom3API(){
+       Entity_Construct( eGameTypeDoom3 );
 
-        GlobalReferenceCache().setEntityCreator(*m_entitydoom3);
-    }
+       m_entitydoom3 = &GetEntityCreator();
 
-    ~EntityDoom3API()
-    {
-        Entity_Destroy();
-    }
-
-    EntityCreator *getTable()
-    {
-        return m_entitydoom3;
-    }
+       GlobalReferenceCache().setEntityCreator( *m_entitydoom3 );
+}
+~EntityDoom3API(){
+       Entity_Destroy();
+}
+EntityCreator* getTable(){
+       return m_entitydoom3;
+}
 };
 
 typedef SingletonModule<EntityDoom3API, EntityDependencies> EntityDoom3Module;
@@ -152,12 +138,11 @@ typedef SingletonModule<EntityDoom3API, EntityDependencies> EntityDoom3Module;
 EntityDoom3Module g_EntityDoom3Module;
 
 
-extern "C" void RADIANT_DLLEXPORT Radiant_RegisterModules(ModuleServer &server)
-{
-    initialiseModule(server);
+extern "C" void RADIANT_DLLEXPORT Radiant_RegisterModules( ModuleServer& server ){
+       initialiseModule( server );
 
-    g_EntityQ3Module.selfRegister();
-    g_EntityWolfModule.selfRegister();
-    g_EntityDoom3Module.selfRegister();
-    Doom3ModelSkinCacheModule_selfRegister(server);
+       g_EntityQ3Module.selfRegister();
+       g_EntityWolfModule.selfRegister();
+       g_EntityDoom3Module.selfRegister();
+       Doom3ModelSkinCacheModule_selfRegister( server );
 }