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

Merge pull request #151 from OogwayUniverse/trigger_fixes

Browse Source 
Moonbase fix
This commit is contained in:
Gie "Max" Vanommeslaeghe 2021-12-11 19:39:24 +01:00 committed by GitHub
commit 180db5dea5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dGame/Entity.cpp
View File

@ -1788,6 +1788,7 @@ void Entity::HandleTriggerCommand(std::string id, std::string target, std::strin
else if (argArray[0] == "repulse") effectType = 2; else if (argArray[0] == "repulse") effectType = 2;
else if (argArray[0] == "gravity") effectType = 3; else if (argArray[0] == "gravity") effectType = 3;
else if (argArray[0] == "friction") effectType = 4; else if (argArray[0] == "friction") effectType = 4;
phanPhys->SetEffectType(effectType); phanPhys->SetEffectType(effectType);
phanPhys->SetDirectionalMultiplier(std::stof(argArray[1])); phanPhys->SetDirectionalMultiplier(std::stof(argArray[1]));
if (argArray.size() > 4) { if (argArray.size() > 4) {
@ -1801,6 +1802,10 @@ void Entity::HandleTriggerCommand(std::string id, std::string target, std::strin
phanPhys->SetMin(std::stoi(argArray[6])); phanPhys->SetMin(std::stoi(argArray[6]));
phanPhys->SetMax(std::stoi(argArray[7])); phanPhys->SetMax(std::stoi(argArray[7]));
} }
if (target == "self") {
EntityManager::Instance()->ConstructEntity(this);
}
} }
else if (id == "updateMission") { else if (id == "updateMission") {
CDMissionTasksTable* missionTasksTable = CDClientManager::Instance()->GetTable<CDMissionTasksTable>("MissionTasks"); CDMissionTasksTable* missionTasksTable = CDClientManager::Instance()->GetTable<CDMissionTasksTable>("MissionTasks");

9
dGame/dComponents/ControllablePhysicsComponent.h
View File

@ -7,6 +7,8 @@
#include "NiQuaternion.h" #include "NiQuaternion.h"
#include "tinyxml2.h" #include "tinyxml2.h"
#include "Component.h" #include "Component.h"
#include "dpCollisionChecks.h"
#include "PhantomPhysicsComponent.h"
class Entity; class Entity;
class dpEntity; class dpEntity;
@ -218,6 +220,13 @@ public:
*/ */
bool GetStatic() const { return m_Static; } bool GetStatic() const { return m_Static; }
/**
* Returns the Physics entity for the component
* @return Physics entity for the component
*/
dpEntity* GetdpEntity() const { return m_dpEntity; }
private: private:
/** /**
* The entity that owns this component * The entity that owns this component

7
dGame/dComponents/PhantomPhysicsComponent.h
View File

@ -110,6 +110,13 @@ public:
*/ */
void SetEffectType(uint32_t type); void SetEffectType(uint32_t type);
/**
* Returns the Physics entity for the component
* @return Physics entity for the component
*/
dpEntity* GetdpEntity() const { return m_dpEntity; }
/** /**
* Spawns an object at each of the vertices for debugging purposes * Spawns an object at each of the vertices for debugging purposes
*/ */