🗣 💩

src/servers/sapphire_zone/Actor/PlayerQuest.cpp

@@ -1030,7 +1030,7 @@ bool Core::Entity::Player::giveQuestRewards( uint32_t questId, uint32_t optional
    exp = questInfo->expFactor;
 
    auto rewardItemCount = questInfo->itemReward0.size();
-   uint16_t optionalItemCount = questInfo->itemReward1.size();
+   uint16_t optionalItemCount = static_cast< uint16_t >( questInfo->itemReward1.size() );
 
    uint32_t gilReward = questInfo->gilReward;
 

src/servers/sapphire_zone/Framework.cpp

@@ -6,48 +6,40 @@ Core::ServerZone g_serverZone( "config/settings_zone.xml" );
 
 Core::Logger& Core::Framework::getLogger()
 {
-   g_log.debug( "loogu" );
    return g_log;
 }
 
 Core::DebugCommandHandler& Core::Framework::getDebugCommandHandler()
 {
-   g_log.debug( "debugu" );
    return g_debugCmdHandler;
 }
 
 Core::Scripting::ScriptMgr& Core::Framework::getScriptMgr()
 {
-   g_log.debug( "sukiriputo" );
    return g_scriptMgr;
 }
 
 Core::Data::ExdDataGenerated& Core::Framework::getExdDataGen()
 {
-   g_log.debug( "ekkusudegen" );
    return g_exdDataGen;
 }
 
 Core::TerritoryMgr& Core::Framework::getTerritoryMgr()
 {
-   g_log.debug( "teriitoru" );
    return g_territoryMgr;
 }
 
 Core::LinkshellMgr& Core::Framework::getLinkshellMgr()
 {
-   g_log.debug( "linkusheru" );
    return g_linkshellMgr;
 }
 
 Core::Db::DbWorkerPool< Core::Db::CharaDbConnection >& Core::Framework::getCharaDb()
 {
-   g_log.debug( "chiyaradebee" );
    return g_charaDb;
 }
 
 Core::ServerZone& Core::Framework::getServerZone()
 {
-   g_log.debug( "seruvaa zone" );
    return g_serverZone;
 }

src/servers/sapphire_zone/Script/ScriptInfo.h

@@ -6,6 +6,7 @@
 #include "NativeScriptApi.h"
 
 #ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 typedef HMODULE ModuleHandle;
 #else

src/servers/sapphire_zone/Script/ScriptLoader.cpp

@@ -1,14 +1,13 @@
-#include <boost/format.hpp>
-#include <boost/algorithm/string/predicate.hpp>
-#include <boost/filesystem.hpp>
-
+#include "ScriptLoader.h"
 
 #include <common/Logging/Logger.h>
 #include <common/Config/XMLConfig.h>
-
-#include "ScriptLoader.h"
 #include "Framework.h"
 
+#include <boost/format.hpp>
+#include <boost/algorithm/string/predicate.hpp>
+#include <boost/filesystem.hpp>
+
 extern Core::Framework g_framework;
 
 namespace fs = boost::filesystem;
@@ -68,7 +67,7 @@ Core::Scripting::ScriptInfo* Core::Scripting::ScriptLoader::loadModule( const st
    }
    catch ( const boost::filesystem::filesystem_error& err )
    {
-      g_log.error( "Error copying file to cache: " + err.code().message() );
+      g_framework.getLogger().error( "Error copying file to cache: " + err.code().message() );
 
       return nullptr;
    }

src/servers/sapphire_zone/Script/ScriptLoader.h

@@ -9,6 +9,7 @@
 #include "ScriptInfo.h"
 
 #ifdef _WIN32
+#define WIN32_LEAN_AND_MEAN
 #include <windows.h>
 typedef HMODULE ModuleHandle;
 #else

src/servers/sapphire_zone/ServerZone.cpp

@@ -38,6 +38,7 @@
 #include "Framework.h"
 
 Core::Framework g_framework;
+Core::Logger g_log;
 
 Core::ServerZone::ServerZone( const std::string& configPath )
    : m_configPath( configPath ),
@@ -197,6 +198,7 @@ void Core::ServerZone::run( int32_t argc, char* argv[] )
    g_framework.getLogger().setLogPath( "log/SapphireZone_" );
    g_framework.getLogger().init();
 
+   g_log = g_framework.getLogger();
    
 
    if( !loadSettings( argc, argv ) )

src/servers/sapphire_zone/Zone/TerritoryMgr.cpp

@@ -111,7 +111,7 @@ bool Core::TerritoryMgr::createDefaultTerritories()
          continue;
 
       uint32_t guid = getNextInstanceId();
-      g_framework.getLogger.info( std::to_string( territoryId ) +
+      g_framework.getLogger().info( std::to_string( territoryId ) +
                                         "\t" + std::to_string( guid ) +
                                         "\t" + std::to_string( territoryInfo->territoryIntendedUse ) +
                                         "\t" + territoryInfo->name +

src/servers/sapphire_zone/mainGameServer.cpp

@@ -5,13 +5,10 @@
 
 #include "Framework.h"
 
-
-
 extern Core::Framework g_framework;
 
 int main( int32_t argc, char* argv[] )
 {
-   //g_framework.init( g_serverZone );
    g_framework.getServerZone().run( argc, argv );
    return 0;
 }