Project layout changed.

CMakeLists.txt

@@ -38,7 +38,7 @@ add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/vgears_version.h
   COMMAND ${CMAKE_COMMAND} -P ${CMAKE_CURRENT_BINARY_DIR}/configure_version_file.cmake
   DEPENDS
     ${CMAKE_CURRENT_BINARY_DIR}/configure_version_file.cmake
-    ${CMAKE_CURRENT_SOURCE_DIR}/QGearsMain/include/vgears_version.h.in
+    ${CMAKE_CURRENT_SOURCE_DIR}/V-Gears/include/vgears_version.h.in
   COMMENT "Configuring vgears_version.h"
   VERBATIM)
 add_custom_target(configure_vgears_version ALL DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vgears_version.h)
@@ -63,7 +63,7 @@ set(OGRE_FRAMEWORK_INCLUDES
 )
 
 option(VGears_BUILD_PLUGINS     "Build the plugins"     TRUE)
-option(VGears_BUILD_UTILITIES   "Build the utilities"   TRUE)
+option(VGears_BUILD_UTILITIES   "Build the V-Gears-Installer"   TRUE)
 option(VGears_BUILD_TESTS       "Build the unit tests"  FALSE)
 option(VGears_MULTITHREADING    "Enable multithreading" FALSE)
 option(VGears_SOUND             "Enable Sound"          TRUE)
@@ -195,7 +195,7 @@ endif()
 
 set(VGears_INCLUDE_DIRS
     ${VGears_INCLUDE_DIRS}
-    ${CMAKE_CURRENT_SOURCE_DIR}/QGearsMain/include/
+    ${CMAKE_CURRENT_SOURCE_DIR}/V-Gears/include/
     ${OIS_INCLUDE_DIRS}
     #/usr/include/luabind # TODO: Autofind
     #/usr/include/lua5.2
@@ -231,15 +231,15 @@ endif()
 
 add_definitions(-DTIXML_USE_STL)
 add_subdirectory(lib)
-add_subdirectory(QGearsMain)
-add_subdirectory(SupportedGames)
+add_subdirectory(V-Gears)
+#add_subdirectory(SupportedGames)
 
 if(VGears_BUILD_PLUGINS)
     add_subdirectory(PlugIns)
 endif()
 
 if(VGears_BUILD_UTILITIES)
-    add_subdirectory(utilities)
+    add_subdirectory(V-Gears-Installer)
 endif()
 
 if(VGears_BUILD_TESTS)

PlugIns/Data/CMakeLists.txt

@@ -1,17 +1,17 @@
-set(QGearsMain_SOURCE_DIR ../../QGearsMain)
+set(V-Gears_SOURCE_DIR ../../V-Gears)
 
 # define header and source files for the library
 set(HEADER_FILES
-  ${QGearsMain_SOURCE_DIR}/include/QGearsPrerequisites.h
-  ${QGearsMain_SOURCE_DIR}/include/common/QGearsManualObject.h
-  ${QGearsMain_SOURCE_DIR}/include/common/QGearsStringUtil.h
-  ${QGearsMain_SOURCE_DIR}/include/common/TypeDefine.h
+  ${V-Gears_SOURCE_DIR}/include/QGearsPrerequisites.h
+  ${V-Gears_SOURCE_DIR}/include/common/QGearsManualObject.h
+  ${V-Gears_SOURCE_DIR}/include/common/QGearsStringUtil.h
+  ${V-Gears_SOURCE_DIR}/include/common/TypeDefine.h
   include/QGearsDataPlugin.h
 )
 set(SOURCE_FILES
-  ${QGearsMain_SOURCE_DIR}/src/common/QGearsManualObject.cpp
-  ${QGearsMain_SOURCE_DIR}/src/common/QGearsStringUtil.cpp
-  ${QGearsMain_SOURCE_DIR}/src/common/TypeDefine.cpp
+  ${V-Gears_SOURCE_DIR}/src/common/QGearsManualObject.cpp
+  ${V-Gears_SOURCE_DIR}/src/common/QGearsStringUtil.cpp
+  ${V-Gears_SOURCE_DIR}/src/common/TypeDefine.cpp
   src/QGearsDataPlugin.cpp
   src/QGearsDataPluginDll.cpp
 )
@@ -20,7 +20,7 @@ include_directories(
     ${OIS_INCLUDE_DIRS}
     ${OGRE_INCLUDE_DIRS}
     ${OGRE_SAMPLES_INCLUDEPATH}
-    ${QGearsMain_SOURCE_DIR}/include
+    ${V-Gears_SOURCE_DIR}/include
     ${CMAKE_CURRENT_SOURCE_DIR}/include
     ${CMAKE_CURRENT_SOURCE_DIR}/../../lib
 )
@@ -41,7 +41,7 @@ set_target_properties(DataPlugin PROPERTIES
 
 set(LIBRARIES
   ${OGRE_LIBRARIES} 
-  FinalFantasy7
+  #FinalFantasy7
   v-gears-data
 )
 

PlugIns/Data/include/QGearsDataPlugin.h

@@ -1,30 +1,19 @@
 /*
------------------------------------------------------------------------------
-The MIT License (MIT)
-
-Copyright (c) 2013-07-30 Tobias Peters <tobias.peters@kreativeffekt.at>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
------------------------------------------------------------------------------
-*/
-#ifndef __QGearsTexPlugin_H__
-#define __QGearsTexPlugin_H__
+ * Copyright (C) 2022 The V-Gears Team
+ *
+ * This file is part of V-Gears
+ *
+ * V-Gears is free software: you can redistribute it and/or modify it under
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, version 3.0 (GPLv3) of the License.
+ *
+ * V-Gears 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.
+ */
+
+#pragma once
 
 #include <OgrePlugin.h>
 
@@ -37,36 +26,71 @@ THE SOFTWARE.
 
 namespace QGears {
 
-	/** Plugin instance for various FFVII Data Formats */
-    class DataPlugin : public Ogre::Plugin
-    {
-    public:
-        DataPlugin();
+    /**
+     * Plugin instance for various FFVII Data Formats
+     */
+    class DataPlugin : public Ogre::Plugin{
 
-        /// @copydoc Ogre::Plugin::getName
-        const Ogre::String& getName() const;
+        public:
 
-        /// @copydoc Ogre::Plugin::install
-        void install();
+            DataPlugin();
 
-        /// @copydoc Ogre::Plugin::initialise
-        void initialise();
+            /**
+             * Retrieves the name fo the plugin.
+             */
+            const Ogre::String& getName() const;
 
-        /// @copydoc Ogre::Plugin::shutdown
-        void shutdown();
+            /**
+             * Perform the plugin initial installation sequence.
+             */
+            void install();
 
-        /// @copydoc Ogre::Plugin::uninstall
-        void uninstall();
+            /**
+             * Perform any tasks the plugin needs on system initialization.
+             */
+            void initialise();
 
-        static const Ogre::String ms_plugin_name;
+            /**
+             * Perform any tasks the plugin needs on system shut down.
+             */
+            void shutdown();
 
-    private:
-        PFileManager           *p_manager;
-        HRCFileManager         *hrc_manager;
-        RSDFileManager         *rsd_manager;
-        PaletteFileManager     *palette_manager;
-        BackgroundFileManager  *background_manager;
+            /**
+             * Perform the final plugin uninstallation sequence.
+             */
+            void uninstall();
+
+            /**
+             * The plugin name.
+             */
+            static const Ogre::String ms_plugin_name;
+
+        private:
+
+            /**
+             * The .P file manager.
+             */
+            PFileManager *p_manager_;
+
+            /**
+             * The HRC file manager.
+             */
+            HRCFileManager *hrc_manager_;
+
+            /**
+             * The RSD file manager.
+             */
+            RSDFileManager *rsd_manager_;
+
+            /**
+             * The palette file manager.
+             */
+            PaletteFileManager *palette_manager_;
+
+            /**
+             * The background file manager.
+             */
+            BackgroundFileManager *background_manager_;
 
     };
 }
-#endif // __QGearsTexPlugin_H__

PlugIns/Data/src/QGearsDataPlugin.cpp

@@ -1,83 +1,52 @@
 /*
------------------------------------------------------------------------------
-The MIT License (MIT)
+ * Copyright (C) 2022 The V-Gears Team
+ *
+ * This file is part of V-Gears
+ *
+ * V-Gears is free software: you can redistribute it and/or modify it under
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, version 3.0 (GPLv3) of the License.
+ *
+ * V-Gears 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.
+ */
 
-Copyright (c) 2013-07-30 Tobias Peters <tobias.peters@kreativeffekt.at>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
------------------------------------------------------------------------------
-*/
 #include "QGearsDataPlugin.h"
-
 #include "data/QGearsTexCodec.h"
 
 using Ogre::String;
 
 namespace QGears {
-    const String DataPlugin::ms_plugin_name( "Plugin for Various FFVII File Formats" );
 
+    const String DataPlugin::ms_plugin_name(
+      "Plugin for Various FFVII File Formats"
+    );
 
-    DataPlugin::DataPlugin()
-    {
-    }
-
+    DataPlugin::DataPlugin(){}
 
-    const String& DataPlugin::getName() const
-    {
-        return ms_plugin_name;
-    }
+    const String& DataPlugin::getName() const{return ms_plugin_name;}
 
+    void DataPlugin::install(){TexCodec::install();}
 
-    void DataPlugin::install()
-    {
-        //install called - create stuff here
-        TexCodec::install();
-    }
-
-
-    void DataPlugin::initialise()
-    {
-        //intialise called - register stuff here
+    void DataPlugin::initialise(){
         TexCodec::initialise();
-        p_manager           = new PFileManager();
-        hrc_manager         = new HRCFileManager();
-        rsd_manager         = new RSDFileManager();
-        //palette_manager     = new PaletteFileManager();
-        //background_manager  = new BackgroundFileManager();
+        p_manager_           = new PFileManager();
+        hrc_manager_         = new HRCFileManager();
+        rsd_manager_         = new RSDFileManager();
+        //palette_manager_     = new PaletteFileManager();
+        //background_manager_  = new BackgroundFileManager();
     }
 
-
-    void DataPlugin::shutdown()
-    {
-        //shutdown called - unregister stuff here
+    void DataPlugin::shutdown(){
         TexCodec::shutdown();
-        delete p_manager;
-        delete hrc_manager;
-        delete rsd_manager;
-        //delete palette_manager;
-        //delete background_manager;
+        delete p_manager_;
+        delete hrc_manager_;
+        delete rsd_manager_;
+        //delete palette_manager_;
+        //delete background_manager_;
     }
 
-
-    void DataPlugin::uninstall()
-    {
-        //uninstall called - delete stuff here
-        TexCodec::uninstall();
-    }
+    void DataPlugin::uninstall(){TexCodec::uninstall();}
 }

PlugIns/Data/src/QGearsDataPluginDll.cpp

@@ -1,52 +1,36 @@
 /*
------------------------------------------------------------------------------
-The MIT License (MIT)
+ * Copyright (C) 2022 The V-Gears Team
+ *
+ * This file is part of V-Gears
+ *
+ * V-Gears is free software: you can redistribute it and/or modify it under
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, version 3.0 (GPLv3) of the License.
+ *
+ * V-Gears 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.
+ */
 
-Copyright (c) 2013-07-30 Tobias Peters <tobias.peters@kreativeffekt.at>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
------------------------------------------------------------------------------
-*/
 #include <OgreRoot.h>
-
 #include "QGearsDataPlugin.h"
 
 #ifndef QGEARS_STATIC_LIB
 
-namespace QGears
-{
-    DataPlugin* data_plugin( NULL );
+namespace QGears{
 
-    extern "C" void _QGearsExport dllStartPlugin( void )
-    {
-        // Create new scene manager
-        data_plugin = new DataPlugin();
-
-        // Register
-        Ogre::Root::getSingleton().installPlugin( data_plugin );
+    DataPlugin* data_plugin(NULL);
 
+    extern "C" void _QGearsExport dllStartPlugin( void ){
+        data_plugin = new DataPlugin();
+        // Register.
+        Ogre::Root::getSingleton().installPlugin(data_plugin);
     }
-    extern "C" void _QGearsExport dllStopPlugin( void )
-    {
-	    Ogre::Root::getSingleton().uninstallPlugin( data_plugin );
-	    delete data_plugin;
-	    data_plugin = NULL;
+    extern "C" void _QGearsExport dllStopPlugin( void ){
+        Ogre::Root::getSingleton().uninstallPlugin(data_plugin);
+        delete data_plugin;
+        data_plugin = NULL;
     }
 }
 

PlugIns/Data/test/tex_file_info.cpp

@@ -1,38 +1,25 @@
 /*
------------------------------------------------------------------------------
-The MIT License (MIT)
-
-Copyright (c) 2013-07-31 Tobias Peters <tobias.peters@kreativeffekt.at>
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
------------------------------------------------------------------------------
-*/
+ * Copyright (C) 2022 The V-Gears Team
+ *
+ * This file is part of V-Gears
+ *
+ * V-Gears is free software: you can redistribute it and/or modify it under
+ * terms of the GNU General Public License as published by the Free Software
+ * Foundation, version 3.0 (GPLv3) of the License.
+ *
+ * V-Gears 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.
+ */
+
 #include <algorithm>
 #include <cstdio>
-
 #include <boost/algorithm/string/predicate.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/filesystem/fstream.hpp>
 #include <boost/program_options.hpp>
-
 #include <OgreDataStream.h>
-
 #include "data/QGearsTexFile.h"
 
 using std::back_inserter;
@@ -46,121 +33,109 @@ using std::string;
 namespace bfs = boost::filesystem;
 namespace bpo = boost::program_options;
 
-void pintFileInfo( const bfs::path &tex_path )
-{
+void pintFileInfo(const bfs::path &tex_path){
     cout << endl << "TX Image File Info"
-         << endl << " filename: " << tex_path.filename().string();
-
-    bfs::ifstream *ifs(  OGRE_NEW_T( bfs::ifstream, Ogre::MEMCATEGORY_GENERAL )( tex_path, bfs::ifstream::binary ) );
-    Ogre::FileStreamDataStream *stream( OGRE_NEW Ogre::FileStreamDataStream( ifs ) );
-    Ogre::DataStreamPtr input( stream );
-
+      << endl << " filename: " << tex_path.filename().string();
+    bfs::ifstream *ifs(OGRE_NEW_T(bfs::ifstream, Ogre::MEMCATEGORY_GENERAL)(tex_path, bfs::ifstream::binary));
+    Ogre::FileStreamDataStream *stream(OGRE_NEW Ogre::FileStreamDataStream(ifs));
+    Ogre::DataStreamPtr input(stream);
     QGears::TexFile tex;
-    tex.readHeader( input );
-
+    tex.readHeader(input);
     cout << endl << " size: "
-         << tex.m_header.image_data.width
-         << "x" << tex.m_header.image_data.height
-         << "x" << tex.m_header.image_data.bit_depth
-         << endl << " pitch: " << tex.m_header.image_data.pitch
-         << endl << " color_key_flag: " << tex.m_header.color_key_flag
-         << endl << "Palette:"
-         << endl << " type              : " << tex.m_header.palette_type
-         << endl << " count             : " << tex.m_header.palette_count
-         << endl << " index_bits        : " << tex.m_header.palette_data.index_bits
-         << endl << " flag              : " << tex.m_header.palette_data.flag
-         << endl << " total_color_count : " << tex.m_header.palette_total_color_count
-         << endl << " total_color_count : " << tex.m_header.palette_data.total_color_count
-         << endl << " colors_per_palette: " << tex.m_header.palette_data.colors_per_palette
-         << endl << " unknown_CC        : " << tex.m_header.unknown_0xCC
-         ;
-    if ( tex.m_header.palette_data.flag )
-    {
-    cout << endl << " mask_red   : " << tex.m_header.pixel_format.bit_mask.red
-         << endl << " mask_green : " << tex.m_header.pixel_format.bit_mask.green
-         << endl << " mask_blue  : " << tex.m_header.pixel_format.bit_mask.blue
-         << endl << " mask_alpha : " << tex.m_header.pixel_format.bit_mask.alpha
-         ;
+      << tex.m_header.image_data.width
+      << "x" << tex.m_header.image_data.height
+      << "x" << tex.m_header.image_data.bit_depth
+      << endl << " pitch: " << tex.m_header.image_data.pitch
+      << endl << " color_key_flag: " << tex.m_header.color_key_flag
+      << endl << "Palette:"
+      << endl << " type              : " << tex.m_header.palette_type
+      << endl << " count             : " << tex.m_header.palette_count
+      << endl << " index_bits        : "
+      << tex.m_header.palette_data.index_bits
+      << endl << " flag              : " << tex.m_header.palette_data.flag
+      << endl << " total_color_count : "
+      << tex.m_header.palette_total_color_count
+      << endl << " total_color_count : "
+      << tex.m_header.palette_data.total_color_count
+      << endl << " colors_per_palette: "
+      << tex.m_header.palette_data.colors_per_palette
+      << endl << " unknown_CC        : " << tex.m_header.unknown_0xCC;
+    if (tex.m_header.palette_data.flag){
+        cout << endl
+          << " mask_red   : " << tex.m_header.pixel_format.bit_mask.red
+          << endl << " mask_green : "
+          << tex.m_header.pixel_format.bit_mask.green
+          << endl << " mask_blue  : " << tex.m_header.pixel_format.bit_mask.blue
+          << endl << " mask_alpha : "
+          << tex.m_header.pixel_format.bit_mask.alpha;
     }
     cout << endl;
 }
 
-int
-main(int ac, char *av[])
-{
-    const char* PO_HELP( "help" );
-    const char* PO_INPUT_PATHS( "input-paths" );
-    const string TEX_EXT( ".tex" );
+int main(int ac, char *av[]){
+    const char* PO_HELP("help");
+    const char* PO_INPUT_PATHS("input-paths");
+    const string TEX_EXT(".tex");
 
     typedef vector<bfs::path> t_InputPaths;
 
     try {
         bpo::options_description generic("Generic options");
         generic.add_options()
-            ( PO_HELP, "produce help message" )
+            (PO_HELP, "produce help message")
             ;
 
         // Hidden options, will be allowed both on command line and
         // in config file, but will not be shown to the user.
         bpo::options_description hidden("Hidden options");
         hidden.add_options()
-            ( PO_INPUT_PATHS, bpo::value< t_InputPaths >()->required(), "input paths to files or directories" )
+            (PO_INPUT_PATHS, bpo::value< t_InputPaths >()->required(), "input paths to files or directories")
             ;
 
         bpo::positional_options_description p;
-        p.add( PO_INPUT_PATHS, -1 );
+        p.add(PO_INPUT_PATHS, -1);
 
         bpo::options_description cmdline_options;
-        cmdline_options.add( generic ).add( hidden );
+        cmdline_options.add(generic).add(hidden);
         bpo::variables_map vm;
-        bpo::store( bpo::command_line_parser( ac, av ).options( cmdline_options ).positional( p ).run(), vm );
+        bpo::store(bpo::command_line_parser(ac, av).options(cmdline_options).positional(p).run(), vm);
 
-        if ( vm.count( PO_HELP ) )
-        {
-            bfs::path self( av[0] );
+        if (vm.count(PO_HELP)){
+            bfs::path self(av[0]);
             cout << "Usage: " << self.stem().string() << " [options] file|path...\n";
             cout << generic << "\n";
             return 0;
         }
 
-        bpo::notify( vm );
+        bpo::notify(vm);
 
-        if ( vm.count( PO_INPUT_PATHS ) )
-        {
-            t_InputPaths input( vm[ PO_INPUT_PATHS ].as< t_InputPaths >() );
+        if (vm.count(PO_INPUT_PATHS)){
+            t_InputPaths input(vm[ PO_INPUT_PATHS ].as< t_InputPaths >());
             t_InputPaths paths;
 
-            for ( t_InputPaths::const_iterator it( input.begin() ); it != input.end(); ++it )
-            {
-                if( bfs::exists( *it ) )
-                {
-                    if( bfs::is_directory( *it ) )
-                    {
-                        copy( bfs::recursive_directory_iterator( *it ), bfs::recursive_directory_iterator(), back_inserter( paths ) );
+            for (t_InputPaths::const_iterator it(input.begin()); it != input.end(); ++it){
+                if(bfs::exists(*it)){
+                    if(bfs::is_directory(*it)){
+                        copy(bfs::recursive_directory_iterator(*it), bfs::recursive_directory_iterator(), back_inserter(paths));
                     }
-                    else
-                    {
-                        paths.push_back( *it );
+                    else{
+                        paths.push_back(*it);
                     }
                 }
             }
 
-            for ( t_InputPaths::const_iterator it( paths.begin() ); it != paths.end(); ++it )
-            {
-                if( bfs::is_regular_file( *it ) )
-                {
-                    string ext( it->extension().string() );
-                    if( boost::iequals( ext, TEX_EXT ) )
-                    {
-                        pintFileInfo( *it );
+            for (t_InputPaths::const_iterator it(paths.begin()); it != paths.end(); ++it){
+                if(bfs::is_regular_file(*it)){
+                    string ext(it->extension().string());
+                    if(boost::iequals(ext, TEX_EXT)){
+                        pintFileInfo(*it);
                     }
                 }
             }
         }
 
     }
-    catch( const bfs::filesystem_error& e )
-    {
+    catch(const bfs::filesystem_error& e){
         cout << e.what() << endl;
         return 1;
     }

SupportedGames/FinalFantasy7/CMakeLists.txt

@@ -21,7 +21,7 @@ set(SOURCE_FILES
 
 include_directories(
     ${VGears_INCLUDE_DIRS}
-    ${VGears_SOURCE_DIR}/QGearsMain/include
+    ${VGears_SOURCE_DIR}/V-Gears/include
     ${CMAKE_CURRENT_SOURCE_DIR}/include
 )
 
@@ -34,7 +34,7 @@ SET_PROPERTY(TARGET FinalFantasy7 PROPERTY FOLDER "q-gears")
 set(LIBRARIES
     ${OGRE_LIBRARIES}
     ${OIS_LIBRARIES}
-    QGearsMain
+    V-Gears
 )
 
 target_link_libraries(FinalFantasy7 ${LIBRARIES})

SupportedGames/FinalFantasy7/src/FF7Character.cpp

@@ -1,60 +0,0 @@
-/*
- * Copyright (C) 2022 The V-Gears Team
- *
- * This file is part of V-Gears
- *
- * V-Gears is free software: you can redistribute it and/or modify it under
- * terms of the GNU General Public License as published by the Free Software
- * Foundation, version 3.0 (GPLv3) of the License.
- *
- * V-Gears 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.
- */
-
-
-#include "FFVIICharacter.h"
-
-namespace FFVII{
-
-    Character::Character(){}
-
-    Character::~Character(){}
-
-    Character::CharacterIdLookupMap Character::CreateLookupMap(){
-        character_id_lookup_ lookup;
-        lookup["AAAA"]      = CLOUD;
-        lookup["n_cloud"]   = CLOUD;
-        lookup["AAGB"]      = TIFA;
-        lookup["n_tifa"]    = TIFA;
-        lookup["AUFF"]      = AERIS;
-        lookup["CAHC"]      = AERIS;
-        lookup["n_erith"]   = AERIS;
-        lookup["earithf"]   = AERIS;
-        lookup["ACGD"]      = BARRET;
-        lookup["ballet"]    = BARRET;
-        lookup["ADDA"]      = RED;
-        lookup["red"]       = RED;
-        lookup["ABDA"]      = CID;
-        lookup["cid"]       = CID;
-        lookup["AEHD"]      = VINCENT;
-        lookup["vincent"]   = VINCENT;
-        lookup["ABJB"]      = YUVI;
-        lookup["yufi"]      = YUVI;
-        lookup["AEBC"]      = KETCY;
-        lookup["ketcy"]     = KETCY;
-        return lookup;
-    }
-
-    const Character::CharacterIdLookupMap Character::character_id_lookup_(
-      Character::CreateLookupMap()
-    );
-
-    Character::CharacterId Character::GetIdByName(const QGears::String& name){
-        character_id_lookup_::const_iterator entry;
-        entry = ms_character_id_lookups.find(name);
-        if (entry != ms_character_id_lookups.end()) return entry->second;
-        return UNKNOWN;
-    }
-}

Tests/CMakeLists.txt

@@ -8,7 +8,7 @@ if(UNIX OR APPLE)
     )
 endif()
 
-set(QGearsMain_SOURCE_DIR ${VGears_SOURCE_DIR}/QGearsMain)
+set(V-Gears_SOURCE_DIR ${VGears_SOURCE_DIR}/V-Gears)
 
-add_subdirectory(QGearsMain)
+add_subdirectory(V-Gears)
 add_subdirectory(FinalFantasy7)

Tests/FinalFantasy7/CMakeLists.txt

@@ -2,14 +2,14 @@ file(COPY misc DESTINATION .)
 
 include_directories(
     ${VGears_INCLUDE_DIRS}
-    ${QGearsMain_SOURCE_DIR}/include
+    ${V-Gears_SOURCE_DIR}/include
     ${VGears_SOURCE_DIR}/SupportedGames/FinalFantasy7/include
 )
 
 set(LIBRARIES
     ${VGears_TEST_LIBRARIES}
     FinalFantasy7
-	QGearsMain
+	V-Gears
 	v-gears-data
 )
 

Tests/QGearsMain/CMakeLists.txt

@@ -2,12 +2,12 @@ file(COPY misc DESTINATION .)
 
 include_directories(
     ${VGears_INCLUDE_DIRS}
-    ${QGearsMain_SOURCE_DIR}/include
+    ${V-Gears_SOURCE_DIR}/include
 )
 
 set(LIBRARIES
     ${VGears_TEST_LIBRARIES}
-    QGearsMain
+    V-Gears
 	v-gears-data
 )
 

V-Gears-Installer/CMakeLists.txt

@@ -0,0 +1,124 @@
+include_directories(
+    ${VGears_INCLUDE_DIRS}
+    ${VGears_SOURCE_DIR}/V-Gears/include
+    ${VGears_SOURCE_DIR}/SupportedGames/FinalFantasy7/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/common/include
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${ZLIB_INCLUDE_DIRS}
+)
+
+# define header and source files for the library
+set(HEADER_FILES
+./common/FontFile.h
+./common/include/QGearsUtility.h
+./common/Logger.h
+./common/Surface.h
+./common/TimToVram.h
+./common/BinGZipFile.h
+./common/OgreBase.h
+./common/OgreGenUtilites.h
+./common/Vram.h
+./common/DrawSkeleton.h
+)
+
+set(SOURCE_FILES
+./common/Logger.cpp
+./common/BinGZipFile.cpp
+./common/DrawSkeleton.cpp
+./common/Surface.cpp
+./common/OgreGenUtilites.cpp
+./common/FontFile.cpp
+./common/TimToVram.cpp
+./common/Vram.cpp
+./common/OgreBase.cpp
+./common/src/QGearsUtility.cpp
+)
+
+add_library(Utility STATIC
+  ${HEADER_FILES}
+  ${SOURCE_FILES}
+)
+
+target_link_libraries(Utility
+    ${OGRE_LIBRARIES}
+    ${OIS_LIBRARIES}
+    ${ZLIB_LIBRARIES}
+)
+SET_PROPERTY(TARGET Utility PROPERTY FOLDER "utilities")
+
+add_subdirectory(flevel)
+add_subdirectory(lzs)
+#add_subdirectory(v-gears-launcher)
+
+
+find_package ( Qt5Widgets REQUIRED )
+#include ( ${QT_USE_FILE} )
+include_directories (
+    ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
+    ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}
+    )
+set ( v-gears-launcher_HDRS
+    include/mainwindow.h
+    include/ff7DataInstaller.h
+    include/ff7FieldTextWriter.h
+    )
+
+set ( v-gears-launcher_SRCS
+    src/main.cpp
+    src/mainwindow.cpp
+    src/ff7DataInstaller.cpp
+    src/ff7FieldTextWriter.cpp
+    )
+
+set ( v-gears-launcher_UIS
+    src/mainwindow.ui
+    )
+QT5_WRAP_UI(UIS ${v-gears-launcher_UIS})
+
+message(UIS: ${UIS})
+
+set ( v-gears-launcher_MOCS
+    include/mainwindow.h
+    )
+QT5_WRAP_CPP(MOCS ${v-gears-launcher_MOCS})
+
+add_definitions(
+    -DQGEARS_ADD_MANAGERS
+)
+add_executable ( v-gears-launcher ${v-gears-launcher_SRCS} ${UIS} ${RSCS} ${TRS} ${MOCS} )
+
+SET_PROPERTY(TARGET v-gears-launcher PROPERTY FOLDER "utilities")
+
+if (APPLE)
+target_link_libraries(v-gears-launcher "-framework CoreFoundation -framework Cocoa -framework IOKit")
+endif()
+
+if(WIN32)
+  set_target_properties(v-gears-launcher PROPERTIES WIN32_EXECUTABLE ON)
+  if (MSVC)
+    set_target_properties(v-gears-launcher PROPERTIES LINK_FLAGS "/SUBSYSTEM:CONSOLE")
+  endif()
+endif()
+
+set(LIBRARIES
+    Utility
+    V-Gears
+    v-gears-data
+    Sudm_Lib
+)
+
+
+find_package(Qt5 COMPONENTS Widgets REQUIRED)
+
+find_package(Qt5 COMPONENTS Core REQUIRED)
+
+#target_link_libraries ( v-gears-launcher  ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${LIBRARIES} )
+target_link_libraries ( v-gears-launcher  Qt5::Widgets Qt5::Core  ${LIBRARIES} )
+
+if(WIN32 OR APPLE)
+  install(TARGETS v-gears-launcher DESTINATION . ) 
+else()
+  install(TARGETS v-gears-launcher RUNTIME DESTINATION bin ) 
+endif()
+
+

utilities/flevel/CMakeLists.txt → V-Gears-Installer/flevel/CMakeLists.txt

@@ -29,7 +29,7 @@ endif()
 
 set(LIBRARIES
     Utility
-    QGearsMain
+    V-Gears
     v-gears-data
 )
 target_link_libraries(flevel    ${LIBRARIES})

utilities/v-gears-launcher/src/ff7DataInstaller.h → V-Gears-Installer/include/ff7DataInstaller.h

@@ -20,7 +20,7 @@
 #include <iostream>
 #include "common/make_unique.h"
 #include "common/QGearsApplication.h"
-#include "common/FF7NameLookup.h"
+#include "common/FinalFantasy7/FF7NameLookup.h"
 #include "data/QGearsTriggersFile.h"
 #include "common/QGearsStringUtil.h"
 #include "data/QGearsFLevelFile.h"

utilities/lzs/CMakeLists.txt → V-Gears-Installer/lzs/CMakeLists.txt

@@ -29,7 +29,7 @@ endif()
 
 set(LIBRARIES
     Utility
-    QGearsMain
+    V-Gears
     v-gears-data
 )
 target_link_libraries(lzs    ${LIBRARIES})

V-Gears-Installer/src/CMakeLists.txt

@@ -0,0 +1,124 @@
+include_directories(
+    ${VGears_INCLUDE_DIRS}
+    ${VGears_SOURCE_DIR}/V-Gears/include
+    ${VGears_SOURCE_DIR}/SupportedGames/FinalFantasy7/include
+    ${CMAKE_CURRENT_SOURCE_DIR}/common/include
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ${ZLIB_INCLUDE_DIRS}
+)
+
+# define header and source files for the library
+set(HEADER_FILES
+./common/FontFile.h
+./common/include/QGearsUtility.h
+./common/Logger.h
+./common/Surface.h
+./common/TimToVram.h
+./common/BinGZipFile.h
+./common/OgreBase.h
+./common/OgreGenUtilites.h
+./common/Vram.h
+./common/DrawSkeleton.h
+)
+
+set(SOURCE_FILES
+./common/Logger.cpp
+./common/BinGZipFile.cpp
+./common/DrawSkeleton.cpp
+./common/Surface.cpp
+./common/OgreGenUtilites.cpp
+./common/FontFile.cpp
+./common/TimToVram.cpp
+./common/Vram.cpp
+./common/OgreBase.cpp
+./common/src/QGearsUtility.cpp
+)
+
+add_library(Utility STATIC
+  ${HEADER_FILES}
+  ${SOURCE_FILES}
+)
+
+target_link_libraries(Utility
+    ${OGRE_LIBRARIES}
+    ${OIS_LIBRARIES}
+    ${ZLIB_LIBRARIES}
+)
+SET_PROPERTY(TARGET Utility PROPERTY FOLDER "utilities")
+
+add_subdirectory(flevel)
+add_subdirectory(lzs)
+#add_subdirectory(v-gears-launcher)
+
+
+find_package ( Qt5Widgets REQUIRED )
+#include ( ${QT_USE_FILE} )
+include_directories (
+    ${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}
+    ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR} ${QT_QTCORE_INCLUDE_DIR} ${QT_QTGUI_INCLUDE_DIR}
+    )
+set ( v-gears-launcher_HDRS
+    include/mainwindow.h
+    include/ff7DataInstaller.h
+    include/ff7FieldTextWriter.h
+    )
+
+set ( v-gears-launcher_SRCS
+    src/main.cpp
+    src/mainwindow.cpp
+    src/ff7DataInstaller.cpp
+    src/ff7FieldTextWriter.cpp
+    )
+
+set ( v-gears-launcher_UIS
+    src/mainwindow.ui
+    )
+QT5_WRAP_UI(UIS ${v-gears-launcher_UIS})
+
+message(UIS: ${UIS})
+
+set ( v-gears-launcher_MOCS
+    include/mainwindow.h
+    )
+QT5_WRAP_CPP(MOCS ${v-gears-launcher_MOCS})
+
+add_definitions(
+    -DQGEARS_ADD_MANAGERS
+)
+add_executable ( v-gears-launcher ${v-gears-launcher_SRCS} ${UIS} ${RSCS} ${TRS} ${MOCS} )
+
+SET_PROPERTY(TARGET v-gears-launcher PROPERTY FOLDER "utilities")
+
+if (APPLE)
+target_link_libraries(v-gears-launcher "-framework CoreFoundation -framework Cocoa -framework IOKit")
+endif()
+
+if(WIN32)
+  set_target_properties(v-gears-launcher PROPERTIES WIN32_EXECUTABLE ON)
+  if (MSVC)
+    set_target_properties(v-gears-launcher PROPERTIES LINK_FLAGS "/SUBSYSTEM:CONSOLE")
+  endif()
+endif()
+
+set(LIBRARIES
+    Utility
+    V-Gears
+    v-gears-data
+    Sudm_Lib
+)
+
+
+find_package(Qt5 COMPONENTS Widgets REQUIRED)
+
+find_package(Qt5 COMPONENTS Core REQUIRED)
+
+#target_link_libraries ( v-gears-launcher  ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${LIBRARIES} )
+target_link_libraries ( v-gears-launcher  Qt5::Widgets Qt5::Core  ${LIBRARIES} )
+
+if(WIN32 OR APPLE)
+  install(TARGETS v-gears-launcher DESTINATION . ) 
+else()
+  install(TARGETS v-gears-launcher RUNTIME DESTINATION bin ) 
+endif()
+
+

utilities/v-gears-launcher/src/ff7DataInstaller.cpp → V-Gears-Installer/src/ff7DataInstaller.cpp

@@ -29,7 +29,7 @@
 #include <OgreHardwarePixelBuffer.h>
 #include <OgreResourceGroupManager.h>
 #include <OgreLog.h>
-#include "ff7DataInstaller.h"
+#include "../include/ff7DataInstaller.h"
 #include "QGearsGameState.h"
 #include "data/QGearsAFileManager.h"
 #include "data/QGearsBackgroundFileManager.h"
@@ -42,9 +42,9 @@
 #include "data/QGearsTexCodec.h"
 #include "map/QGearsBackground2DFileManager.h"
 #include "map/QGearsWalkmeshFileManager.h"
-#include "data/FF7ModelListFileManager.h"
+#include "data/FinalFantasy7/FF7ModelListFileManager.h"
 #include "data/QGearsLGPArchiveFactory.h"
-#include "common/FF7NameLookup.h"
+#include "common/FinalFantasy7/FF7NameLookup.h"
 #include "data/QGearsTexCodec.h"
 #include "data/QGearsMapListFile.h"
 #include "decompiler/sudm.h"

utilities/v-gears-launcher/src/ff7FieldTextWriter.cpp → V-Gears-Installer/src/ff7FieldTextWriter.cpp

@@ -13,7 +13,7 @@
  * GNU General Public License for more details.
  */
 
-#include "ff7FieldTextWriter.h"
+#include "../include/ff7FieldTextWriter.h"
 #include "common/QGearsStringUtil.h"
 
 // TODO: Refactor: this is based on/copied from DatFile::DumpText.

utilities/v-gears-launcher/src/main.cpp → V-Gears-Installer/src/main.cpp

@@ -14,7 +14,7 @@
  */
 
 #include <QtWidgets/QApplication>
-#include "mainwindow.h"
+#include "../include/mainwindow.h"
 
 /**
  * Installer main function.

utilities/v-gears-launcher/src/mainwindow.cpp → V-Gears-Installer/src/mainwindow.cpp

@@ -13,9 +13,9 @@
  * GNU General Public License for more details.
  */
 
-#include "mainwindow.h"
+#include "../include/mainwindow.h"
 #include "ui_mainwindow.h"
-#include "ff7DataInstaller.h"
+#include "../include/ff7DataInstaller.h"
 #include <iostream>
 #include <QtCore/QProcess>
 #include <QtWidgets/QFileDialog>

QGearsMain/CMakeLists.txt → V-Gears/CMakeLists.txt

@@ -104,6 +104,10 @@ set(HEADER_FILES
   include/core/TextManagerCommands.h
   #include/viewer/ViewerModule.h
   include/data/QGearsXMLSerializer.h
+  include/common/FinalFantasy7/FF7NameLookup.h
+  include/map/FinalFantasy7/FF7WalkmeshFileSerializer.h
+  include/FF7Character.h
+  include/FF7Common.h
 )
 
 set(HEADER_FILES_DATA
@@ -154,6 +158,9 @@ include/data/worldmap/MapFile.h
   include/data/QGearsTexFile.h
   include/data/QGearsTriggersFile.h
   include/data/QGearsMapListFile.h
+  include/data/FinalFantasy7/FF7ModelListFile.h
+  include/data/FinalFantasy7/FF7ModelListFileManager.h
+  include/data/FinalFantasy7/FF7ModelListFileSerializer.h
 )
 
 set(SOURCE_FILES_DATA
@@ -204,6 +211,9 @@ set(SOURCE_FILES_DATA
   src/data/QGearsTexFile.cpp
   src/data/QGearsTriggersFile.cpp
   src/data/QGearsMapListFile.cpp
+  src/data/FinalFantasy7/FF7ModelListFile.cpp
+  src/data/FinalFantasy7/FF7ModelListFileManager.cpp
+  src/data/FinalFantasy7/FF7ModelListFileSerializer.cpp
 )
 
 set(SOURCE_FILES
@@ -288,6 +298,10 @@ set(SOURCE_FILES
   #src/viewer/ViewerModule.cpp
   src/QGearsGameState.cpp
   src/data/QGearsXMLSerializer.cpp
+  src/common/FinalFantasy7/FF7NameLookup.cpp
+  src/map/FinalFantasy7/FF7WalkmeshFileSerializer.cpp
+  src/FF7Character.cpp
+  src/FF7Common.cpp
 )
 if(VGears_SOUND)
     set(HEADER_FILES
@@ -314,8 +328,8 @@ include_directories(
     ${CMAKE_CURRENT_SOURCE_DIR}/include
 
     # TODO: remove dependency on ff7 related code
-    ${VGears_SOURCE_DIR}/SupportedGames/FinalFantasy7/include
-    ${CMAKE_CURRENT_SOURCE_DIR}/SupportedGames/FinalFantasy7/include
+    #${VGears_SOURCE_DIR}/SupportedGames/FinalFantasy7/include
+    #${CMAKE_CURRENT_SOURCE_DIR}/SupportedGames/FinalFantasy7/include
     /usr/include/OIS/
 
 )
@@ -347,7 +361,7 @@ if(WIN32)
   add_definitions(-DWIN32 -D__WIN32__ -D_WINDOWS)
 endif()
 
-add_library(QGearsMain STATIC
+add_library(V-Gears STATIC
   ${HEADER_FILES}
   ${SOURCE_FILES}
   /usr/include/OIS/
@@ -355,9 +369,9 @@ add_library(QGearsMain STATIC
 
 # Coverage uses more memory, combined with PCH can cause OOM/ICE
 #if ($ENV{COVERAGE}!=1)
-cotire(QGearsMain)
+cotire(V-Gears)
 #endif()
-SET_PROPERTY(TARGET QGearsMain PROPERTY FOLDER "v-gears")
+SET_PROPERTY(TARGET V-Gears PROPERTY FOLDER "v-gears")
 
 add_library(v-gears-data STATIC
  ${HEADER_FILES_DATA}
@@ -389,20 +403,20 @@ if( WIN32 AND NOT (CMAKE_BUILD_TYPE MATCHES "Debug") )
     endif()
 endif()
 
-target_link_libraries(QGearsMain 
+target_link_libraries(V-Gears 
     ${VGears_LIBRARIES}
     #lua5.2
     LuaBind
     liblua
     tinyxml
-    FinalFantasy7
+    #FinalFantasy7
     ${ois_lib}
     #${lua_lib}
     #${luabind_lib}
 )
 
 target_link_libraries(v-gears 
-	QGearsMain
+	V-Gears
 	${Boost_LIBRARIES}
     v-gears-data
     ${ois_lib}
@@ -411,7 +425,7 @@ target_link_libraries(v-gears
 )
 
 target_link_libraries(v-gears-data
-    QGearsMain
+    V-Gears
     ${ois_lib}
     #${luabind_lib}
 )

SupportedGames/FinalFantasy7/include/FF7Character.h → V-Gears/include/FF7Character.h

@@ -97,7 +97,7 @@ namespace FFVII{
              * @return ID of the character with the specified name, or {@see
              * UNKNOWN} if the character doesn't exist.
              */
-            static CharacterId GetIdByName( const QGears::String& name );
+            static CharacterId GetIdByName( const QGears::String& name);
 
         private:
 
@@ -118,4 +118,3 @@ namespace FFVII{
     };
 }
 
-#endif // __FFVIICharacter_H__