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

HealthPickupSystem seems to work ok

Browse Source
This commit is contained in:
verysecrethero
2016-03-01 14:57:50 +01:00
parent 1b2055e11a
commit 842f26d8fc
2 changed files with 4621 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/Schema/Entities/NewMap2version3x.xml
+4620
View File
File diff suppressed because it is too large Load Diff
src/Game/Systems/HealthPickupSystem.cpp
+1 -1
View File
@@ -83,7 +83,7 @@ bool HealthPickupSystem::OnTriggerTouch(Events::TriggerTouch& e)
bool HealthPickupSystem::OnTriggerLeave(Events::TriggerLeave& e) {
//triggerleave erases possible m_PickupAtMaximum
for (auto& it = m_PickupAtMaximum.begin(); it != m_PickupAtMaximum.end(); ++it) {
if (it->pickup.ID == e.Trigger.ID && it->player.ID == e.Entity.ID) {
if (it->trigger.ID == e.Trigger.ID && it->player.ID == e.Entity.ID) {
LOG_INFO("trigger leave - erasing max");
m_PickupAtMaximum.erase(it);
break;