BTH/axyz
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

DamageIndicator is now disabled for Friendly fire

Browse Source
This commit is contained in:
verysecrethero
2016-03-09 10:44:08 +01:00
parent e43a7be7db
commit 6456df8ce1
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Systems/DamageIndicatorSystem.cpp
+5 -4
View File
@@ -41,6 +41,11 @@ bool DamageIndicatorSystem::OnPlayerDamage(Events::PlayerDamage& e)
return false; return false;
} }
//friendly fire - return
if (e.Damage < 0.1f) {
return false;
}
glm::vec3 inflictorPos = e.Inflictor["Transform"]["Position"]; glm::vec3 inflictorPos = e.Inflictor["Transform"]["Position"];
//if testing //if testing
#ifdef INDICATOR_TEST #ifdef INDICATOR_TEST
@@ -55,10 +60,6 @@ bool DamageIndicatorSystem::OnPlayerDamage(Events::PlayerDamage& e)
m_World->SetParent(sprite.ID, m_CurrentCamera); m_World->SetParent(sprite.ID, m_CurrentCamera);
//simply set the rotation z-wise to the angleBetweenVectors //simply set the rotation z-wise to the angleBetweenVectors
sprite["Transform"]["Orientation"] = glm::vec3(0, 0, angleBetweenVectors); sprite["Transform"]["Orientation"] = glm::vec3(0, 0, angleBetweenVectors);
//friendly fire - change color of the marker
if (e.Damage < 0.1f) {
sprite["Sprite"]["Color"] = glm::vec4(0.0, 1.0f, 1.0f, 1.0f);
}
if (!IsServer || !m_NetworkEnabled) { if (!IsServer || !m_NetworkEnabled) {
updateDamageIndicatorVector.emplace_back(sprite, inflictorPos); updateDamageIndicatorVector.emplace_back(sprite, inflictorPos);