X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=events.cpp;fp=events.cpp;h=4fd7ff6321ea5050a08e6721adf99d033fe45bb5;hb=05a32509046f05d110de9e847025544c2a36ed02;hp=cc7a909cb90f7627e219dbbdd90dfcffaee46a0b;hpb=745bd8b15dfa631f5213c9bb02e700438069b4d5;p=pkanalytics

diff --git a/events.cpp b/events.cpp
index cc7a909..4fd7ff6 100644
--- a/events.cpp
+++ b/events.cpp
@@ -29,7 +29,7 @@ static string event_type_to_string(EventType type)
 		return "drop";
 	case EventType::GOAL:
 		return "goal";
-	case EventType::IN:
+	case EventType::SWAP_IN:
 		return "in";
 	case EventType::INTERCEPTION:
 		return "interception";
@@ -37,7 +37,7 @@ static string event_type_to_string(EventType type)
 		return "offensive_soft_minus";
 	case EventType::OFFENSIVE_SOFT_PLUS:
 		return "offensive_soft_plus";
-	case EventType::OUT:
+	case EventType::SWAP_OUT:
 		return "out";
 	case EventType::PULL:
 		return "pull";
@@ -90,7 +90,7 @@ static EventType string_to_event_type(const string &type)
 	} else if (type == "goal") {
 		return EventType::GOAL;
 	} else if (type == "in") {
-		return EventType::IN;
+		return EventType::SWAP_IN;
 	} else if (type == "interception") {
 		return EventType::INTERCEPTION;
 	} else if (type == "offensive_soft_minus") {
@@ -98,7 +98,7 @@ static EventType string_to_event_type(const string &type)
 	} else if (type == "offensive_soft_plus") {
 		return EventType::OFFENSIVE_SOFT_PLUS;
 	} else if (type == "out") {
-		return EventType::OUT;
+		return EventType::SWAP_OUT;
 	} else if (type == "pull") {
 		return EventType::PULL;
 	} else if (type == "pull_landed") {
@@ -486,7 +486,7 @@ EventsModel::Status EventsModel::get_status_at(uint64_t t)
 
 		if (e.type == EventType::GOAL || e.type == EventType::THEIR_GOAL) {
 			s.pull_state = Status::SHOULD_PULL;
-		} else if (e.type == EventType::IN || e.type == EventType::OUT || e.type == EventType::STOPPAGE || e.type == EventType::RESTART || e.type == EventType::UNKNOWN || e.type == EventType::SET_DEFENSE || e.type == EventType::SET_OFFENSE) {
+		} else if (e.type == EventType::SWAP_IN || e.type == EventType::SWAP_OUT || e.type == EventType::STOPPAGE || e.type == EventType::RESTART || e.type == EventType::UNKNOWN || e.type == EventType::SET_DEFENSE || e.type == EventType::SET_OFFENSE) {
 			// No effect on pull status.
 		} else if (e.type == EventType::PULL) {
 			s.pull_state = Status::PULL_IN_AIR;
@@ -575,10 +575,10 @@ set<int> EventsModel::get_team_at(uint64_t t)
 		if (e.t > t) {
 			break;
 		}
-		if (e.type == EventType::IN) {
+		if (e.type == EventType::SWAP_IN) {
 			team.insert(*e.player_id);
 		}
-		if (e.type == EventType::OUT) {
+		if (e.type == EventType::SWAP_OUT) {
 			team.erase(*e.player_id);
 		}
 	}
@@ -609,7 +609,7 @@ void EventsModel::set_team_at(uint64_t t, const set<int> &new_team)
 		if (events[i].t > backdate_point) {
 			break;
 		}
-		if (events[i].t == backdate_point && (events[i].type == EventType::IN || events[i].type == EventType::OUT)) {
+		if (events[i].t == backdate_point && (events[i].type == EventType::SWAP_IN || events[i].type == EventType::SWAP_OUT)) {
 			delete_event(i);
 		} else {
 			++i;
@@ -642,7 +642,7 @@ void EventsModel::set_formation_at(uint64_t t, bool offense, unsigned formation)
 			break;
 		}
 		if (e.type == EventType::GOAL || e.type == EventType::THEIR_GOAL ||
-		    e.type == EventType::IN || e.type == EventType::OUT ||
+		    e.type == EventType::SWAP_IN || e.type == EventType::SWAP_OUT ||
 		    e.type == EventType::STOPPAGE ||
 		    e.type == EventType::SET_DEFENSE || e.type == EventType::SET_OFFENSE ||
 		    e.type == EventType::THROWAWAY || e.type == EventType::THEIR_THROWAWAY ||