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

Arrow should now correctly track the next point no matter when you join the game

Browse Source
This commit is contained in:
Tleety
2016-03-02 13:36:24 +01:00
parent 6540848392
commit 6968e71e07
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Systems/CapturePointArrowHUDSystem.cpp
+5 -1
View File
@@ -101,6 +101,7 @@ void CapturePointArrowHUDSystem::Update(double dt)
continue;
} else {
m_RedTeamCurrentTarget = got->second;
break;
}
}
} else if ((int)homeRed["CapturePoint"]["CapturePointNumber"] == firstCP) {
@@ -112,6 +113,7 @@ void CapturePointArrowHUDSystem::Update(double dt)
continue;
} else {
m_RedTeamCurrentTarget = got->second;
break;
}
}
}
@@ -125,6 +127,7 @@ void CapturePointArrowHUDSystem::Update(double dt)
continue;
} else {
m_BlueTeamCurrentTarget = got->second;
break;
}
}
} else if ((int)homeBlue["CapturePoint"]["CapturePointNumber"] == firstCP) {
@@ -136,6 +139,7 @@ void CapturePointArrowHUDSystem::Update(double dt)
continue;
} else {
m_BlueTeamCurrentTarget = got->second;
break;
}
}
}
@@ -151,7 +155,7 @@ void CapturePointArrowHUDSystem::Update(double dt)
pos = m_BlueTeamCurrentTarget;
}
pos = currentTeam == redTeam ? m_RedTeamCurrentTarget : currentTeam == blueTeam ? m_BlueTeamCurrentTarget : glm::vec3(0.f);
//pos = currentTeam == redTeam ? m_RedTeamCurrentTarget : currentTeam == blueTeam ? m_BlueTeamCurrentTarget : glm::vec3(0.f);
glm::vec3& arrowOri = arrowEntity["Transform"]["Orientation"];
glm::vec3 lookVector = glm::normalize(Transform::AbsolutePosition(arrowEntity) - pos); //Maybe should be player instead