revert compatibilty-breaking changes no longer needed

longturn · Sep 8, 2024 · 68626e6 · 68626e6
1 parent e83dbd1
commit 68626e6
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/client/packhand.cpp b/client/packhand.cpp
@@ -495,11 +495,9 @@ void handle_unit_combat_info(const struct packet_unit_combat_info *packet)
   struct unit *punit1 = game_unit_by_number(packet->defender_unit_id);
 
   if (punit0 && punit1) {
-    if (!packet->bombard) {
-      popup_combat_info(packet->attacker_unit_id, packet->defender_unit_id,
-                        packet->attacker_hp, packet->defender_hp,
-                        packet->make_att_veteran, packet->make_def_veteran);
-    }
+    popup_combat_info(packet->attacker_unit_id, packet->defender_unit_id,
+                      packet->attacker_hp, packet->defender_hp,
+                      packet->make_att_veteran, packet->make_def_veteran);
     if (tile_visible_mapcanvas(unit_tile(punit0))
         && tile_visible_mapcanvas(unit_tile(punit1))) {
       show_combat = true;

diff --git a/common/networking/packets.def b/common/networking/packets.def
@@ -1086,7 +1086,6 @@ PACKET_UNIT_COMBAT_INFO = 65; sc, lsend
   HP defender_hp;
   BOOL make_att_veteran;
   BOOL make_def_veteran;
-  BOOL bombard;
 end
 
 PACKET_UNIT_BOMBARD_INFO = 66; sc, lsend, cap(bombard-info)