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

Merge branch 'main' into moreMovementAi

Browse Source
This commit is contained in:
David Markowitz
2024-03-07 00:40:26 -08:00
parent ae891aa4c3 3a6313a3ba
commit 02de7ef28a
143 changed files with 1769 additions and 1288 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
dZoneManager/CMakeLists.txt
View File

@@ -3,7 +3,20 @@ set(DZONEMANAGER_SOURCES "dZoneManager.cpp"
"Spawner.cpp"
"Zone.cpp")
add_library(dZoneManager STATIC ${DZONEMANAGER_SOURCES})
add_library(dZoneManager OBJECT ${DZONEMANAGER_SOURCES})
target_link_libraries(dZoneManager
PUBLIC dPhysics
INTERFACE dWorldServer)
PRIVATE dDatabaseCDClient
PUBLIC dPhysics)
#set_property(TARGET dZoneManager APPEND PROPERTY INTERFACE_LINK_LIBRARIES dWorldServer)
target_include_directories(dZoneManager PUBLIC "."
"${PROJECT_SOURCE_DIR}/dGame" # Entity.h
"${PROJECT_SOURCE_DIR}/dGame/dEntity" # EntityInfo.h
PRIVATE
"${PROJECT_SOURCE_DIR}/dGame/dComponents" #InventoryComponent.h
"${PROJECT_SOURCE_DIR}/dGame/dInventory" #InventoryComponent.h (transitive)
"${PROJECT_SOURCE_DIR}/dGame/dBehaviors" #BehaviorSlot.h
"${PROJECT_SOURCE_DIR}/dGame/dGameMessages" #GameMessages.h
"${PROJECT_SOURCE_DIR}/dGame/dUtilities" #VanityUtilities.h
)

4
dZoneManager/Zone.cpp
View File

@@ -420,7 +420,7 @@ void Zone::LoadPath(std::istream& file) {
if (path.pathType == PathType::MovingPlatform) {
BinaryIO::BinaryRead(file, waypoint.movingPlatform.lockPlayer);
BinaryIO::BinaryRead(file, waypoint.movingPlatform.speed);
BinaryIO::BinaryRead(file, waypoint.speed);
BinaryIO::BinaryRead(file, waypoint.movingPlatform.wait);
if (path.pathVersion >= 13) {
BinaryIO::ReadString<uint8_t>(file, waypoint.movingPlatform.departSound, BinaryIO::ReadType::WideString);
@@ -439,7 +439,7 @@ void Zone::LoadPath(std::istream& file) {
BinaryIO::BinaryRead(file, waypoint.racing.planeHeight);
BinaryIO::BinaryRead(file, waypoint.racing.shortestDistanceToEnd);
} else if (path.pathType == PathType::Rail) {
if (path.pathVersion > 16) BinaryIO::BinaryRead(file, waypoint.rail.speed);
if (path.pathVersion > 16) BinaryIO::BinaryRead(file, waypoint.speed);
}
// object LDF configs

7
dZoneManager/Zone.h
View File

@@ -50,7 +50,6 @@ struct SceneTransition {
struct MovingPlatformPathWaypoint {
uint8_t lockPlayer;
float speed;
float wait;
std::string departSound;
std::string arriveSound;
@@ -72,17 +71,13 @@ struct RacingPathWaypoint {
float shortestDistanceToEnd;
};
struct RailPathWaypoint {
float speed;
};
struct PathWaypoint {
NiPoint3 position;
NiQuaternion rotation; // not included in all, but it's more convenient here
MovingPlatformPathWaypoint movingPlatform;
CameraPathWaypoint camera;
RacingPathWaypoint racing;
RailPathWaypoint rail;
float speed;
std::vector<LDFBaseData*> config;
std::vector<WaypointCommand> commands;
};