mirrors/sapphire
1
Fork 0
mirror of https://github.com/SapphireServer/Sapphire.git synced 2025-04-27 06:47:45 +00:00
Code Activity

fix incorrect usage of fatal error logging and switch typedef to using

Browse source
This commit is contained in:
GokuWeedLord 2017-12-13 13:06:02 +11:00
parent a59b3185e3
commit ed882044b1
3 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
bin/config/settings_rest.xml
View file

@ -6,7 +6,7 @@
<!-- Ip the lobby server listens on --> <!-- Ip the lobby server listens on -->
<ListenIp>127.0.0.1</ListenIp> <ListenIp>127.0.0.1</ListenIp>
<!-- Path of FFXIV dat files --> <!-- Path of FFXIV dat files -->
<DataPath>C:\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack\\ffxiv</DataPath> <DataPath>H:\\SteamLibrary\\steamapps\\common\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack\\ffxiv</DataPath>
<!-- <DataPath>/opt/sapphire_3_15_0/bin/sqpack</DataPath> --> <!-- <DataPath>/opt/sapphire_3_15_0/bin/sqpack</DataPath> -->
<!-- IP of the lobby server --> <!-- IP of the lobby server -->
<LobbyHost>127.0.0.1</LobbyHost> <LobbyHost>127.0.0.1</LobbyHost>

3
bin/config/settings_zone.xml
View file

@ -1,12 +1,11 @@
<Settings> <Settings>
<General> <General>
<!-- Port the zone server accepts game conenctions on --> <!-- Port the zone server accepts game conenctions on -->
<ListenPort>54992</ListenPort> <ListenPort>54992</ListenPort>
<!-- Ip the zone server conenctions on --> <!-- Ip the zone server conenctions on -->
<ListenIp>127.0.0.1</ListenIp> <ListenIp>127.0.0.1</ListenIp>
<!-- Path of FFXIV dat files --> <!-- Path of FFXIV dat files -->
<DataPath>C:\\SquareEnix\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack\\ffxiv</DataPath> <DataPath>H:\\SteamLibrary\\steamapps\\common\\FINAL FANTASY XIV - A Realm Reborn\\game\\sqpack\\ffxiv</DataPath>
<!-- Path of Chai script files --> <!-- Path of Chai script files -->
<ScriptPath>./compiledscripts/</ScriptPath> <ScriptPath>./compiledscripts/</ScriptPath>
<!-- Connection settings for the mysql db --> <!-- Connection settings for the mysql db -->

8
src/servers/Server_Zone/Script/ScriptLoader.cpp
View file

@ -31,7 +31,7 @@ bool Core::Scripting::ScriptLoader::unloadModule( ModuleHandle handle )
if( !success ) 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; return false;
} }
@ -78,12 +78,12 @@ Core::Scripting::ScriptInfo* Core::Scripting::ScriptLoader::loadModule( const st
ScriptObject* Core::Scripting::ScriptLoader::getScriptObject( ModuleHandle handle ) ScriptObject* Core::Scripting::ScriptLoader::getScriptObject( ModuleHandle handle )
{ {
typedef ScriptObject* (*getScriptObjectType)(); using getScript = ScriptObject*(*)();
#ifdef _WIN32 #ifdef _WIN32
getScriptObjectType func = reinterpret_cast< getScriptObjectType >( GetProcAddress( handle, "getScript" ) ); getScript func = reinterpret_cast< getScript >( GetProcAddress( handle, "getScript" ) );
#else #else
getScriptObjectType func = reinterpret_cast< getScriptObjectType >( dlsym( handle, "getScript" ) ); getScript func = reinterpret_cast< getScript >( dlsym( handle, "getScript" ) );
#endif #endif
if( func ) if( func )