Combine timer data into a single structure

2015-02-06 16:54:05 -05:00
parent c50e24b8e4
commit f609711e27
12 changed files with 52 additions and 60 deletions
--- a/src/boe.town.cpp
+++ b/src/boe.town.cpp
@@ -592,12 +592,9 @@ location end_town_mode(short switching_level,location destination) { // returns
 		
 		to_return = univ.party.p_loc;
 		
-		for(i = univ.party.party_event_timers.size() - 1; i >= 0; i++)
-	 		if(univ.party.party_event_timers[i].global_or_town == 1) {
-				cParty::timerIter iter = univ.party.party_event_timers.begin();
-				iter += i;
-				univ.party.party_event_timers.erase(iter);
-			}
+		std::remove_if(univ.party.party_event_timers.begin(), univ.party.party_event_timers.end(), [](const cTimer& t) {
+			return t.node_type == 2;
+		});
 		
 	}