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

Fixed merge conflicts. Scoreboard updates team when a team is picked. Fixed some code standard violations and misspellings.

Browse Source
This commit is contained in:
William Moberg
2016-03-13 14:23:56 +01:00
parent 4f99f6ef74
commit ac20e41a5d
7 changed files with 30 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Game/Systems/CapturePointSystem.cpp
+2 -2
View File
@@ -10,9 +10,9 @@ CapturePointSystem::CapturePointSystem(SystemParams params)
EVENT_SUBSCRIBE_MEMBER(m_ETriggerTouch, &CapturePointSystem::OnTriggerTouch);
EVENT_SUBSCRIBE_MEMBER(m_ETriggerLeave, &CapturePointSystem::OnTriggerLeave);
EVENT_SUBSCRIBE_MEMBER(m_ECaptured, &CapturePointSystem::OnCaptured);
EVENT_SUBSCRIBE_MEMBER(m_EReset, &CapturePointSystem::OnReset);
Init();
}
EVENT_SUBSCRIBE_MEMBER(m_EReset, &CapturePointSystem::OnReset);
Init();
}
void CapturePointSystem::Init()