Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-08-04 09:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

dGame Precompiled header improvements (#876)

Browse Source 
* moving branch

* Add deleteinven slash command

* Change name of BRICKS_IN_BBB

* Use string_view instead of strcmp

* Clean up include tree

* Remove unneeded headers from PCH files

Removes unneeded headers from pre-compiled headers.  This increases compile time, however reduces development time for most files.

* Update Entity.h

* Update EntityManager.h

* Update GameMessages.cpp

* There it compiles now

Co-authored-by: Aaron Kimbrell <aronwk.aaron@gmail.com>
This commit is contained in:
David Markowitz
2023-01-06 21:17:05 -08:00
committed by GitHub
parent 8bcb4bd36d
commit fc75d6048f
99 changed files with 821 additions and 648 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
dZoneManager/LUTriggers.h Normal file
View File

@@ -0,0 +1,30 @@
#ifndef __LUTRIGGERS__H__
#define __LUTRIGGERS__H__
#include <string>
#include <vector>
class Command;
class Event;
namespace LUTriggers {
struct Command {
std::string id;
std::string target;
std::string targetName;
std::string args;
};
struct Event {
std::string eventID;
std::vector<Command*> commands;
};
struct Trigger {
uint32_t id;
bool enabled;
std::vector<Event*> events;
};
};
#endif //!__LUTRIGGERS__H__

1
dZoneManager/Spawner.h
View File

@@ -9,6 +9,7 @@
#include <string>
#include <functional>
#include "LDFFormat.h"
#include "EntityInfo.h"
struct SpawnerNode {
NiPoint3 position = NiPoint3::ZERO;

1
dZoneManager/Zone.cpp
View File

@@ -6,6 +6,7 @@
#include "dLogger.h"
#include "GeneralUtils.h"
#include "BinaryIO.h"
#include "LUTriggers.h"
#include "AssetManager.h"
#include "CDClientManager.h"

41
dZoneManager/Zone.h
View File

@@ -1,35 +1,18 @@
#pragma once
#include "dZMCommon.h"
#include "LDFFormat.h"
#include "../thirdparty/tinyxml2/tinyxml2.h"
#include "tinyxml2.h"
#include <string>
#include <vector>
#include <map>
class Level;
class LUTriggers {
public:
struct Command {
std::string id;
std::string target;
std::string targetName;
std::string args;
};
struct Event {
std::string eventID;
std::vector<Command*> commands;
};
struct Trigger {
uint32_t id;
bool enabled;
std::vector<Event*> events;
};
namespace LUTriggers {
struct Trigger;
};
class Level;
struct SceneRef {
std::string filename;
uint32_t id;
@@ -110,11 +93,11 @@ enum class PropertyPathType : int32_t {
GenetatedRectangle = 2
};
enum class PropertyType : int32_t{
enum class PropertyType : int32_t {
Premiere = 0,
Prize = 1,
LUP = 2,
Headspace = 3
Prize = 1,
LUP = 2,
Headspace = 3
};
enum class PropertyRentalTimeUnit : int32_t {
@@ -222,7 +205,7 @@ public:
uint32_t GetWorldID() const { return m_WorldID; }
[[nodiscard]] std::string GetZoneName() const { return m_ZoneName; }
std::string GetZoneRawPath() const { return m_ZoneRawPath;}
std::string GetZoneRawPath() const { return m_ZoneRawPath; }
std::string GetZonePath() const { return m_ZonePath; }
const NiPoint3& GetSpawnPos() const { return m_Spawnpoint; }
@@ -254,7 +237,7 @@ private:
uint32_t m_PathDataLength;
uint32_t m_PathChunkVersion;
std::vector<Path> m_Paths;
std::vector<Path> m_Paths;
std::map<LWOSCENEID, uint32_t, mapCompareLwoSceneIDs> m_MapRevisions; //rhs is the revision!