Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-12-02 14:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge main into property-entrance-rewrite

Browse Source
This commit is contained in:
Jettford
2023-10-28 01:09:03 +01:00
parent 758bf8becf
commit 6df16ab406
220 changed files with 1451 additions and 1274 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
dGame/dMission/Mission.cpp
View File

@@ -13,7 +13,7 @@
#include "Mail.h"
#include "MissionComponent.h"
#include "eRacingTaskParam.h"
#include "dLogger.h"
#include "Logger.h"
#include "dServer.h"
#include "dZoneManager.h"
#include "InventoryComponent.h"
@@ -46,7 +46,7 @@ Mission::Mission(MissionComponent* missionComponent, const uint32_t missionId) {
info = *mis;
if (mis == &CDMissionsTable::Default) {
Game::logger->Log("Missions", "Failed to find mission (%i)!", missionId);
LOG("Failed to find mission (%i)!", missionId);
return;
}

2
dGame/dMission/MissionPrerequisites.cpp
View File

@@ -4,7 +4,7 @@
#include <ctime>
#include "CDClientManager.h"
#include "dLogger.h"
#include "Logger.h"
PrerequisiteExpression::PrerequisiteExpression(const std::string& str) {

10
dGame/dMission/MissionTask.cpp
View File

@@ -3,7 +3,7 @@
#include "MissionTask.h"
#include "Game.h"
#include "dLogger.h"
#include "Logger.h"
#include "Mission.h"
#include "Character.h"
#include "dServer.h"
@@ -233,7 +233,7 @@ void MissionTask::Progress(int32_t value, LWOOBJID associate, const std::string&
entity = Game::entityManager->GetEntity(associate);
if (entity == nullptr) {
if (associate != LWOOBJID_EMPTY) {
Game::logger->Log("MissionTask", "Failed to find associated entity (%llu)!", associate);
LOG("Failed to find associated entity (%llu)!", associate);
}
break;
}
@@ -275,7 +275,7 @@ void MissionTask::Progress(int32_t value, LWOOBJID associate, const std::string&
entity = Game::entityManager->GetEntity(associate);
if (entity == nullptr) {
Game::logger->Log("MissionTask", "Failed to find associated entity (%llu)!", associate);
LOG("Failed to find associated entity (%llu)!", associate);
break;
}
@@ -349,7 +349,7 @@ void MissionTask::Progress(int32_t value, LWOOBJID associate, const std::string&
entity = Game::entityManager->GetEntity(associate);
if (entity == nullptr) {
Game::logger->Log("MissionTask", "Failed to find associated entity (%llu)!", associate);
LOG("Failed to find associated entity (%llu)!", associate);
break;
}
@@ -453,7 +453,7 @@ void MissionTask::Progress(int32_t value, LWOOBJID associate, const std::string&
AddProgress(count);
break;
default:
Game::logger->Log("MissionTask", "Invalid mission task type (%i)!", static_cast<int>(type));
LOG("Invalid mission task type (%i)!", static_cast<int>(type));
return;
}