diff --git a/bin/config/settings_rest.xml b/bin/config/settings_rest.xml index ddadaf67..e3059921 100644 --- a/bin/config/settings_rest.xml +++ b/bin/config/settings_rest.xml @@ -6,7 +6,7 @@ 127.0.0.1 - C:\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack\\ffxiv + H:\\SteamLibrary\\steamapps\\common\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack\\ffxiv 127.0.0.1 diff --git a/bin/config/settings_zone.xml b/bin/config/settings_zone.xml index 5c0d5fb6..fcff6d3f 100644 --- a/bin/config/settings_zone.xml +++ b/bin/config/settings_zone.xml @@ -1,12 +1,11 @@ - 54992 127.0.0.1 - C:\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack\\ffxiv + H:\\SteamLibrary\\steamapps\\common\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack\\ffxiv ./compiledscripts/ diff --git a/src/servers/Server_Zone/Script/ScriptLoader.cpp b/src/servers/Server_Zone/Script/ScriptLoader.cpp index e7b661a7..159f6e12 100644 --- a/src/servers/Server_Zone/Script/ScriptLoader.cpp +++ b/src/servers/Server_Zone/Script/ScriptLoader.cpp @@ -31,7 +31,7 @@ bool Core::Scripting::ScriptLoader::unloadModule( ModuleHandle handle ) if( !success ) { - g_log.fatal( "Failed to unload module @ 0x" + boost::str( boost::format( "%|08X|" ) % handle ) ); + g_log.error( "Failed to unload module @ 0x" + boost::str( boost::format( "%|08X|" ) % handle ) ); return false; } @@ -78,12 +78,12 @@ Core::Scripting::ScriptInfo* Core::Scripting::ScriptLoader::loadModule( const st ScriptObject* Core::Scripting::ScriptLoader::getScriptObject( ModuleHandle handle ) { - typedef ScriptObject* (*getScriptObjectType)(); + using getScript = ScriptObject*(*)(); #ifdef _WIN32 - getScriptObjectType func = reinterpret_cast< getScriptObjectType >( GetProcAddress( handle, "getScript" ) ); + getScript func = reinterpret_cast< getScript >( GetProcAddress( handle, "getScript" ) ); #else - getScriptObjectType func = reinterpret_cast< getScriptObjectType >( dlsym( handle, "getScript" ) ); + getScript func = reinterpret_cast< getScript >( dlsym( handle, "getScript" ) ); #endif if( func )