diff --git a/crates/game-service/src/battle_session.rs b/crates/game-service/src/battle_session.rs index 4e11cee..b8f6d09 100644 --- a/crates/game-service/src/battle_session.rs +++ b/crates/game-service/src/battle_session.rs @@ -11,8 +11,7 @@ pub fn snapshot_interval_ticks() -> i32 { pub const MAX_CATCH_UP_TICKS: i32 = 40; use std::time::Instant; use logic::battle::{ - LogicGameMode, LogicGameObjectEntry, LogicGameObjectRef, LogicVector2, - BATTLE_TICKS_PER_SECOND, BATTLE_TYPE_PVP, CHARACTER_OBJECT_TYPE, + LogicGameMode, LogicGameObjectEntry, LogicVector2, BATTLE_TICKS_PER_SECOND, BATTLE_TYPE_PVP, }; use logic::battle::{verify_snapshot, LogicBattleEvent}; use logic::SectorStateMessage; @@ -66,37 +65,11 @@ impl BattleSession { pending_bot_play: None, } } - fn reannounce(&mut self) { - let leaders = self.mode.battle.leaders; - let mut remap: Vec<(LogicGameObjectRef, LogicGameObjectRef)> = Vec::new(); - for entry in self.mode.battle.objects.objects.iter_mut() { - if leaders.contains(&entry.global_id) { - continue; - } - let fresh = LogicGameObjectRef::of(CHARACTER_OBJECT_TYPE + 1, self.next_instance); - self.next_instance += 1; - remap.push((entry.global_id, fresh)); - entry.global_id = fresh; - } - for towers in self.mode.battle.leader_towers.iter_mut() { - for tower in towers.iter_mut() { - if let Some((_, now)) = remap.iter().find(|(was, _)| was == tower) { - *tower = *now; - } - } - } - self.mode - .battle - .objects - .objects - .sort_by_key(|entry| entry.global_id.0.map(|id| (id.class_id, id.instance_id))); - } pub fn announce(&mut self) -> bool { if self.announced { return false; } self.announced = true; - self.reannounce(); self.next_snapshot = self.tick; true } diff --git a/crates/game-service/src/service.rs b/crates/game-service/src/service.rs index 17a373c..7a55724 100644 --- a/crates/game-service/src/service.rs +++ b/crates/game-service/src/service.rs @@ -161,7 +161,7 @@ impl GameService { opponent = %opponent_name, location = %location, objects, - "sending the opening sector state, objects get new ids once the client is up" + "sending the opening sector state" ); Ok(vec![message]) }