X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=plugins%2Fvfspk3%2Fvfspk3.cpp;h=478ce8f1a15cfef9ad265d2d2acc53add54548b8;hb=25e4f9e8cf6aa80de16ba5f25cfc9b3da7c2c368;hp=ed250e3915cbd9ee0d9237d7429e865a2b7997db;hpb=12b372f89ce109a4db9d510884fbe7d05af79870;p=xonotic%2Fnetradiant.git

diff --git a/plugins/vfspk3/vfspk3.cpp b/plugins/vfspk3/vfspk3.cpp
index ed250e39..478ce8f1 100644
--- a/plugins/vfspk3/vfspk3.cpp
+++ b/plugins/vfspk3/vfspk3.cpp
@@ -1,23 +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
-*/
+   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 "vfspk3.h"
 
@@ -32,57 +32,47 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 class FileSystemDependencies : public GlobalRadiantModuleRef
 {
-  ArchiveModulesRef m_archive_modules;
+ArchiveModulesRef m_archive_modules;
 public:
-  FileSystemDependencies() :
-    m_archive_modules(GlobalRadiant().getRequiredGameDescriptionKeyValue("archivetypes"))
-  {
-  }
-  ArchiveModules& getArchiveModules()
-  {
-    return m_archive_modules.get();
-  }
+FileSystemDependencies() :
+	m_archive_modules( GlobalRadiant().getRequiredGameDescriptionKeyValue( "archivetypes" ) ){
+}
+ArchiveModules& getArchiveModules(){
+	return m_archive_modules.get();
+}
 };
 
 class FileSystemQ3API
 {
-  VirtualFileSystem* m_filesystemq3;
+VirtualFileSystem* m_filesystemq3;
 public:
-  typedef VirtualFileSystem Type;
-  STRING_CONSTANT(Name, "*");
-
-  FileSystemQ3API()
-  {
-    FileSystem_Init();
-    m_filesystemq3 = &GetFileSystem();
-  }
-  ~FileSystemQ3API()
-  {
-    FileSystem_Shutdown();
-  }
-  VirtualFileSystem* getTable()
-  {
-    return m_filesystemq3;
-  }
+typedef VirtualFileSystem Type;
+STRING_CONSTANT( Name, "*" );
+
+FileSystemQ3API(){
+	FileSystem_Init();
+	m_filesystemq3 = &GetFileSystem();
+}
+~FileSystemQ3API(){
+	FileSystem_Shutdown();
+}
+VirtualFileSystem* getTable(){
+	return m_filesystemq3;
+}
 };
 
 typedef SingletonModule<FileSystemQ3API, FileSystemDependencies> FileSystemQ3Module;
 
 FileSystemQ3Module g_FileSystemQ3Module;
 
-ArchiveModules& FileSystemQ3API_getArchiveModules()
-{
-  return g_FileSystemQ3Module.getDependencies().getArchiveModules();
+ArchiveModules& FileSystemQ3API_getArchiveModules(){
+	return g_FileSystemQ3Module.getDependencies().getArchiveModules();
 }
 
 
 
-extern "C" void RADIANT_DLLEXPORT Radiant_RegisterModules(ModuleServer& server)
-{
-  GlobalErrorStream::instance().setOutputStream(server.getErrorStream());
-  GlobalOutputStream::instance().setOutputStream(server.getOutputStream());
-  GlobalDebugMessageHandler::instance().setHandler(server.getDebugMessageHandler());
-  GlobalModuleServer::instance().set(server);
+extern "C" void RADIANT_DLLEXPORT Radiant_RegisterModules( ModuleServer& server ){
+	initialiseModule( server );
 
-  g_FileSystemQ3Module.selfRegister();
+	g_FileSystemQ3Module.selfRegister();
 }