Export town_hall_details in release CI builds

Author: Trolldemorted

.github/workflows/release.yml

@@ -24,6 +24,7 @@ jobs:
         mv target/i686-pc-windows-msvc/release/scrollmap_render_all_ships.dll ./mods/
         mv target/i686-pc-windows-msvc/release/shipyard_details.dll ./mods/
         mv target/i686-pc-windows-msvc/release/tavern_show_all_sailors.dll ./mods/
+        mv target/i686-pc-windows-msvc/release/town_hall_details.dll ./mods/
         mkdir files
         mv target/i686-pc-windows-msvc/release/aimcli.exe ./files
         mv target/i686-pc-windows-msvc/release/cprcli.exe ./files

p3-api/src/class35.rs

@@ -0,0 +1,59 @@
+use std::{ffi::c_void, mem, ptr};
+
+use log::debug;
+
+use crate::{data::p3_ptr::P3Pointer, Point};
+
+const CLASS35_PTR_ADDRESS: *const u32 = 0x006CBDC8 as _;
+
+#[derive(Clone, Debug)]
+pub struct Class35Ptr {
+    pub address: u32,
+}
+
+#[derive(Clone, Debug)]
+#[repr(C)]
+pub struct ShipRoute {
+    pub points: *const c_void,
+    pub len: i32,
+}
+
+#[derive(Clone, Debug)]
+#[repr(C)]
+pub struct ShipRouteArgs {
+    pub args_inner: *const ShipRouteArgsInner,
+    pub route_type: i32,
+}
+
+#[derive(Clone, Debug)]
+#[repr(C)]
+pub struct ShipRouteArgsInner {
+    pub source: Point<i16>,
+    pub destination: Point<i16>,
+}
+
+impl Class35Ptr {
+    pub unsafe fn new() -> Self {
+        Self { address: *CLASS35_PTR_ADDRESS }
+    }
+
+    pub unsafe fn calculate_ship_route(&self, source: Point<i16>, destination: Point<i16>) -> *const ShipRoute {
+        let args_inner = ShipRouteArgsInner { source, destination };
+        let args = ShipRouteArgs {
+            args_inner: &args_inner,
+            route_type: 2,
+        };
+        let mut ship_route: *const ShipRoute = ptr::null_mut();
+        debug!("Calling calculate_ship_route orig");
+        let orig: extern "thiscall" fn(this: u32, route_args: *const ShipRouteArgs, route: *mut *const ShipRoute) -> i32 = mem::transmute(0x00445010);
+        orig(self.address, &args, &mut ship_route);
+        debug!("Calling calculate_ship_route survived! {ship_route:?}");
+        ship_route
+    }
+}
+
+impl P3Pointer for Class35Ptr {
+    fn get_address(&self) -> u32 {
+        self.address
+    }
+}

p3-api/src/lib.rs

@@ -1,6 +1,7 @@
 #![allow(clippy::missing_safety_doc)]
 extern crate num_derive;
 
+pub mod class35;
 pub mod data;
 pub mod facility;
 pub mod game_world;
@@ -14,6 +15,19 @@ pub mod ships;
 pub mod town;
 pub mod ui;
 
+#[derive(Clone, Debug)]
+#[repr(C)]
+pub struct Point<T> {
+    pub x: T,
+    pub y: T,
+}
+
+impl<T> Point<T> {
+    pub const fn new(x: T, y: T) -> Self {
+        Self { x, y }
+    }
+}
+
 // https://stackoverflow.com/a/28175593/1569755
 fn latin1_to_string(s: &[u8]) -> String {
     s.iter().take_while(|c| **c != 0).map(|&c| c as char).collect()

p3-api/src/town/static_town_data.rs

@@ -1,4 +1,7 @@
-use crate::data::p3_ptr::P3Pointer;
+use crate::{
+    data::{enums::TownId, p3_ptr::P3Pointer},
+    Point,
+};
 
 pub const TOWN_DATA_ADDRESS: u32 = 0x006DDB90;
 pub const TOWN_DATA_SIZE: u32 = 0x34;
@@ -9,9 +12,9 @@ pub struct StaticTownDataPtr {
 }
 
 impl StaticTownDataPtr {
-    pub fn new(town_id: u32) -> Self {
+    pub fn new(town_id: TownId) -> Self {
         Self {
-            address: TOWN_DATA_ADDRESS + town_id * TOWN_DATA_SIZE,
+            address: TOWN_DATA_ADDRESS + town_id as u32 * TOWN_DATA_SIZE,
         }
     }
 
@@ -22,6 +25,10 @@ impl StaticTownDataPtr {
     pub unsafe fn get_anfahrt_y_pos(&self) -> i32 {
         self.get(0x24)
     }
+
+    pub unsafe fn get_point_i16(&self) -> Point<i16> {
+        Point::new(self.get_anfahrt_x_pos() as _, self.get_anfahrt_y_pos() as _)
+    }
 }
 
 impl P3Pointer for StaticTownDataPtr {