From bb3362a2fb22dc03ddd975152bb3e5e9db102220 Mon Sep 17 00:00:00 2001
From: Markus Heikkinen <ittevien@gmail.com>
Date: Thu, 25 Oct 2018 23:08:14 +0300
Subject: [PATCH] Use bw_dat for collision rect

---
 src/bw/mod.rs | 9 ---------
 src/unit.rs   | 2 +-
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/src/bw/mod.rs b/src/bw/mod.rs
index b4d504d..1b943ec 100644
--- a/src/bw/mod.rs
+++ b/src/bw/mod.rs
@@ -115,15 +115,6 @@ lazy_static! {
         samase::read_file("scripts\\aiscript.bin").unwrap() as usize;
     static ref SAMASE_BWSCRIPT_BIN: usize =
         samase::read_file("scripts\\bwscript.bin").unwrap() as usize;
-    static ref SAMASE_UNITS_DAT: usize = samase::read_file("arr\\units.dat").unwrap() as usize;
-}
-
-pub fn collision_rect(unit: UnitId) -> Rect {
-    unsafe {
-        assert!(unit.0 < 0xe4);
-        let dat = *SAMASE_UNITS_DAT as *const u8;
-        *(dat.offset(0x3124 + unit.0 as isize * 8) as *const Rect)
-    }
 }
 
 pub fn aiscript_bin() -> *mut u8 {
diff --git a/src/unit.rs b/src/unit.rs
index eba0d0c..cef68b8 100644
--- a/src/unit.rs
+++ b/src/unit.rs
@@ -275,7 +275,7 @@ impl Unit {
     }
 
     pub fn collision_rect(&self) -> bw::Rect {
-        let collision_rect = bw::collision_rect(self.id());
+        let collision_rect = self.id().dimensions();
         let position = self.position();
         bw::Rect {
             left: position.x - collision_rect.left,