Mirrored_Repos/DarkflameServer
1
0
Fork 0
mirror of https://github.com/DarkflameUniverse/DarkflameServer.git synced 2025-08-06 10:44:08 +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
parent 95d1c65011 c8991666d2
commit 180db5dea5
3 changed files with 21 additions and 0 deletions
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] == "gravity") effectType = 3;
else if (argArray[0] == "friction") effectType = 4;
phanPhys->SetEffectType(effectType);
phanPhys->SetDirectionalMultiplier(std::stof(argArray[1]));
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->SetMax(std::stoi(argArray[7]));
}
if (target == "self") {
EntityManager::Instance()->ConstructEntity(this);
}
}
else if (id == "updateMission") {
CDMissionTasksTable* missionTasksTable = CDClientManager::Instance()->GetTable<CDMissionTasksTable>("MissionTasks");