AxioDL
/
metaforce
mirror of https://github.com/AxioDL/metaforce.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

CRelayTracker: Make HasRelay() a const member function 

While we're at it, we can make use of HasRelay() internally where
applicable to simplify code a little bit.
This commit is contained in:
Lioncash 2020-03-18 01:03:32 -04:00
parent 6ddbd15cfc
commit cb4884fcef
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Runtime/CRelayTracker.cpp
View File

@ -23,17 +23,23 @@ CRelayTracker::CRelayTracker(CBitStreamReader& in, const CSaveWorld& saveworld)
} }
} }
bool CRelayTracker::HasRelay(TEditorId id) { bool CRelayTracker::HasRelay(TEditorId id) const {
return std::find(x0_relayStates.begin(), x0_relayStates.end(), id) != x0_relayStates.end(); return std::find(x0_relayStates.cbegin(), x0_relayStates.cend(), id) != x0_relayStates.cend();
} }
void CRelayTracker::AddRelay(TEditorId id) { void CRelayTracker::AddRelay(TEditorId id) {
if (std::find(x0_relayStates.begin(), x0_relayStates.end(), id) == x0_relayStates.end()) if (HasRelay(id)) {
return;
}
x0_relayStates.push_back(id); x0_relayStates.push_back(id);
} }
void CRelayTracker::RemoveRelay(TEditorId id) { void CRelayTracker::RemoveRelay(TEditorId id) {
if (std::find(x0_relayStates.begin(), x0_relayStates.end(), id) != x0_relayStates.end()) if (!HasRelay(id)) {
return;
}
x0_relayStates.erase(std::remove(x0_relayStates.begin(), x0_relayStates.end(), id), x0_relayStates.end()); x0_relayStates.erase(std::remove(x0_relayStates.begin(), x0_relayStates.end(), id), x0_relayStates.end());
} }

2
Runtime/CRelayTracker.hpp
View File

@ -31,7 +31,7 @@ public:
CRelayTracker() = default; CRelayTracker() = default;
CRelayTracker(CBitStreamReader&, const CSaveWorld&); CRelayTracker(CBitStreamReader&, const CSaveWorld&);
bool HasRelay(TEditorId); bool HasRelay(TEditorId) const;
void AddRelay(TEditorId); void AddRelay(TEditorId);
void RemoveRelay(TEditorId); void RemoveRelay(TEditorId);
void SendMsgs(TAreaId, CStateManager&); void SendMsgs(TAreaId, CStateManager&);