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

Fixes

Browse Source
This commit is contained in:
Aaron Kimbre 2022-10-24 22:14:42 -05:00
parent 3386bf54a4
commit 8ecfdb6256
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dGame/dComponents/ControllablePhysicsComponent.cpp
View File

@ -101,41 +101,28 @@ void ControllablePhysicsComponent::Update(float deltaTime) {
EntityManager::Instance()->SerializeEntity(m_Parent); EntityManager::Instance()->SerializeEntity(m_Parent);
} else m_PathWaypoint = 0; } else m_PathWaypoint = 0;
} else { // paused, meaing we are at a waypoint, and we want to do something } else { // paused, meaing we are at a waypoint, and we want to do something
// Game::logger->Log("ControllablePhysicsComponent", "paused");
if (m_PausedTime > 0) { if (m_PausedTime > 0) {
Game::logger->Log("ControllablePhysicsComponent", "pause left %f", m_PausedTime);
m_PausedTime = m_PausedTime - deltaTime; m_PausedTime = m_PausedTime - deltaTime;
} else if (m_PausedTime < 0){ } else if (m_PausedTime < 0){
Game::logger->Log("ControllablePhysicsComponent", "done pausing");
m_Paused = false; m_Paused = false;
m_PausedTime = 0; m_PausedTime = 0;
} else if (path->pathWaypoints.size() - 1 > m_PathWaypoint) { } else if (path->pathWaypoints.size() - 1 > m_PathWaypoint) {
Game::logger->Log("ControllablePhysicsComponent", "actiosnsss");
Game::logger->Log("ControllablePhysicsComponent", "path %s, waypoint %i", path->pathName.c_str(), m_PathWaypoint);
PathWaypoint waypoint = path->pathWaypoints.at(m_PathWaypoint); PathWaypoint waypoint = path->pathWaypoints.at(m_PathWaypoint);
Game::logger->Log("ControllablePhysicsComponent", "actions %i", waypoint.config.size());
if (waypoint.config.size() > 0) { if (waypoint.config.size() > 0) {
for (LDFBaseData* action : waypoint.config) { for (LDFBaseData* action : waypoint.config) {
if (action) { if (action) {
Game::logger->Log("ControllablePhysicsComponent", "Message type %s", action->GetString().c_str());
if (action->GetKey() == u"delay"){ if (action->GetKey() == u"delay"){
Game::logger->Log("ControllablePhysicsComponent", "delay");
m_PausedTime = std::stof(action->GetValueAsString()); m_PausedTime = std::stof(action->GetValueAsString());
Game::logger->Log("ControllablePhysicsComponent", "delay action %f", m_PausedTime); SetVelocity(NiPoint3::ZERO);
} else if (action->GetKey() == u"emote"){ } else if (action->GetKey() == u"emote"){
Game::logger->Log("ControllablePhysicsComponent", "emote actioN");
GameMessages::SendPlayAnimation(m_Parent, GeneralUtils::UTF8ToUTF16(action->GetValueAsString())); GameMessages::SendPlayAnimation(m_Parent, GeneralUtils::UTF8ToUTF16(action->GetValueAsString()));
} else if (action->GetKey() == u"pathspeed") { } else if (action->GetKey() == u"pathspeed") {
Game::logger->Log("ControllablePhysicsComponent", "speedd action");
m_PathSpeed = std::stof(action->GetValueAsString()); m_PathSpeed = std::stof(action->GetValueAsString());
Game::logger->Log("ControllablePhysicsComponent", "speed action %f", m_PathSpeed); if (m_PathSpeed < 2.5f) m_PathSpeed = 2.5f;
} else if (action->GetKey() == u"changeWP") { } else if (action->GetKey() == u"changeWP") {
Game::logger->Log("ControllablePhysicsComponent", "changewp action");
m_AttachedPath = action->GetValueAsString(); m_AttachedPath = action->GetValueAsString();
Game::logger->Log("ControllablePhysicsComponent", "changewp %s", m_AttachedPath.c_str());
} else { } else {
Game::logger->Log("ControllablePhysicsComponent", "unknown action"); Game::logger->LogDebug("ControllablePhysicsComponent", "Unhandled action %s", GeneralUtils::UTF16ToWTF8(action->GetKey()).c_str());
Game::logger->Log("ControllablePhysicsComponent", "Unhandled action %s", action->GetKey().c_str());
} }
} }
} }

9
dZoneManager/Zone.cpp
View File

@ -539,8 +539,13 @@ void Zone::LoadPath(std::ifstream& file) {
BinaryIO::BinaryRead(file, character); BinaryIO::BinaryRead(file, character);
value.push_back(character); value.push_back(character);
} }
LDFBaseData* ldfConfig = LDFBaseData::DataFromString(parameter + "=" + value); LDFBaseData* ldfConfig = nullptr;
waypoint.config.push_back(ldfConfig); if (path.pathType == PathType::Movement) {
ldfConfig = LDFBaseData::DataFromString(parameter + "=0:" + value);
} else {
ldfConfig = LDFBaseData::DataFromString(parameter + "=" + value);
}
if (ldfConfig) waypoint.config.push_back(ldfConfig);
} }
} }