Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2024-11-10 02:08:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Resolved some more comments

Browse Source
This commit is contained in:
wincent 2023-11-20 20:26:52 +01:00
parent 17a62d95e0
commit 3a60fffe1d
12 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeVariables.txt
View File

@ -7,9 +7,9 @@ LICENSE=AGPL-3.0
# Set __dynamic to 1 to enable the -rdynamic flag for the linker, yielding some symbols in crashlogs.
__dynamic=1
# Set __ggdb to 1 to enable the -ggdb flag for the linker, including more debug info.
#__ggdb=1
# __ggdb=1
# Set __include_backtrace__ to 1 to includes the backtrace library for better crashlogs.
#__include_backtrace__=1
# __include_backtrace__=1
# Set __compile_backtrace__ to 1 to compile the backtrace library instead of using system libraries.
# __compile_backtrace__=1
# Set to the number of jobs (make -j equivalent) to compile the mariadbconn files with.

2
dGame/EntityManager.cpp
View File

@ -24,7 +24,7 @@
#include "eGameMasterLevel.h"
#include "eReplicaComponentType.h"
#include "eReplicaPacketType.h"
#include "ServerPreconditions.hpp"
#include "ServerPreconditions.h"
// Configure which zones have ghosting disabled, mostly small worlds.
std::vector<LWOMAPID> EntityManager::m_GhostingExcludedZones = {

15
dGame/dCinema/Recorder.cpp
View File

@ -7,15 +7,19 @@
#include "ChatPackets.h"
#include "EntityManager.h"
#include "EntityInfo.h"
#include "ServerPreconditions.hpp"
#include "ServerPreconditions.h"
#include "MovementAIComponent.h"
#include "BaseCombatAIComponent.h"
using namespace Cinema::Recording;
std::unordered_map<LWOOBJID, Recorder*> m_Recorders = {};
namespace {
std::unordered_map<int32_t, std::string> m_EffectAnimations = {};
std::unordered_map<LWOOBJID, Recorder*> m_Recorders = {};
std::unordered_map<int32_t, std::string> m_EffectAnimations = {};
}
Recorder::Recorder() {
this->m_StartTime = std::chrono::duration_cast<std::chrono::milliseconds>(std::chrono::system_clock::now().time_since_epoch());
@ -23,8 +27,7 @@ Recorder::Recorder() {
this->m_LastRecordTime = this->m_StartTime;
}
Recorder::~Recorder() {
}
Recorder::~Recorder() = default;
void Recorder::AddRecord(Record* record)
{
@ -522,8 +525,6 @@ void Cinema::Recording::Recorder::RegisterEffectForActor(LWOOBJID actorID, const
m_EffectAnimations.emplace(effectId, animationName);
result.finalize();
recorder->AddRecord(new AnimationRecord(animationName));
}
}

2
dGame/dCinema/Scene.cpp
View File

@ -4,7 +4,7 @@
#include <tinyxml2.h>
#include "ServerPreconditions.hpp"
#include "ServerPreconditions.h"
#include "EntityManager.h"
#include "EntityInfo.h"
#include "MissionComponent.h"

10
dGame/dUtilities/ServerPreconditions.cpp
View File

@ -1,14 +1,16 @@
#include "ServerPreconditions.hpp"
#include "ServerPreconditions.h"
#include "tinyxml2.h"
using namespace ServerPreconditions;
std::unordered_map<LOT, std::vector<std::pair<bool, PreconditionExpression>>> ServerPreconditions::m_Preconditions;
namespace {
std::unordered_map<LOT, std::vector<std::pair<bool, PreconditionExpression>>> m_Preconditions;
std::unordered_map<LWOOBJID, LWOOBJID> ServerPreconditions::m_SoloActors;
std::unordered_map<LWOOBJID, LWOOBJID> m_SoloActors;
std::unordered_map<LWOOBJID, std::unordered_set<LWOOBJID>> ServerPreconditions::m_ExcludeForPlayer;
std::unordered_map<LWOOBJID, std::unordered_set<LWOOBJID>> m_ExcludeForPlayer;
}
void ServerPreconditions::LoadPreconditions(std::string file) {
tinyxml2::XMLDocument doc;

6
dGame/dUtilities/ServerPreconditions.hpp → dGame/dUtilities/ServerPreconditions.h
View File

@ -15,12 +15,6 @@ class Entity;
namespace ServerPreconditions
{
extern std::unordered_map<LOT, std::vector<std::pair<bool, PreconditionExpression>>> m_Preconditions;
extern std::unordered_map<LWOOBJID, LWOOBJID> m_SoloActors;
extern std::unordered_map<LWOOBJID, std::unordered_set<LWOOBJID>> m_ExcludeForPlayer;
/**
* @brief Loads the preconditions from the given file.
*

10
dGame/dUtilities/SlashCommandHandler.cpp
View File

@ -87,7 +87,7 @@
#include "CDZoneTableTable.h"
#include "Recorder.h"
#include "ServerPreconditions.hpp"
#include "ServerPreconditions.h"
#include "Prefab.h"
#include "Scene.h"
@ -953,7 +953,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
if (record) {
record->Act(actor);
} else {
Game::logger->Log("SlashCommandHandler", "Failed to get recorder for objectID: %llu", entity->GetObjectID());
LOG("Failed to get recorder for objectID: %llu", entity->GetObjectID());
}
}
@ -981,7 +981,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
}
}
} else {
Game::logger->Log("SlashCommandHandler", "Failed to get recorder for objectID: %llu", entity->GetObjectID());
LOG("Failed to get recorder for objectID: %llu", entity->GetObjectID());
}
}
@ -995,7 +995,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
if (record) {
record->SaveToFile(args[0]);
} else {
Game::logger->Log("SlashCommandHandler", "Failed to get recorder for objectID: %llu", entity->GetObjectID());
LOG("Failed to get recorder for objectID: %llu", entity->GetObjectID());
}
}
@ -1005,7 +1005,7 @@ void SlashCommandHandler::HandleChatCommand(const std::u16string& command, Entit
if (record) {
Cinema::Recording::Recorder::AddRecording(entity->GetObjectID(), record);
} else {
Game::logger->Log("SlashCommandHandler", "Failed to load recording from file: %s", args[0].c_str());
LOG("Failed to load recording from file: %s", args[0].c_str());
}
}

2
dWorldServer/WorldServer.cpp
View File

@ -75,7 +75,7 @@
#include "EntityManager.h"
#include "CheatDetection.h"
#include "ServerPreconditions.hpp"
#include "ServerPreconditions.h"
#include "Scene.h"
namespace Game {