swars: Remade load_map_bnb()

Also removed load_packet() from ASM.

Author: mefistotelis

src/bat.c

@@ -581,4 +581,12 @@ void BAT_play(void)
 #endif
 }
 
+void BAT_unknsub_20(int a1, int a2, int a3, int a4, ubyte *p_screen)
+{
+    asm volatile (
+      "push %4\n"
+      "call ASM_BAT_unknsub_20\n"
+        : : "a" (a1), "d" (a2), "b" (a3), "c" (a4), "g" (p_screen));
+}
+
 /******************************************************************************/

src/bat.h

@@ -27,12 +27,13 @@ extern "C" {
 /******************************************************************************/
 #pragma pack(1)
 
-
 #pragma pack()
 /******************************************************************************/
 
 void BAT_play(void);
 
+void BAT_unknsub_20(int a1, int a2, int a3, int a4, ubyte *p_screen);
+
 /******************************************************************************/
 #ifdef __cplusplus
 }

src/game.c

@@ -173,7 +173,7 @@ extern unsigned short unkn2_pos_x;
 extern unsigned short unkn2_pos_y;
 extern unsigned short unkn2_pos_z;
 extern int data_1c8428;
-extern const char *primvehobj_fname;
+const char *primvehobj_fname = "qdata/primveh.obj";
 extern unsigned char textwalk_data[640];
 
 extern short word_1C6E08;
@@ -2291,14 +2291,6 @@ void setup_debug_obj_trace(void)
     debug_trace_place(0);
 }
 
-void BAT_unknsub_20(int a1, int a2, int a3, int a4, ubyte *a5)
-{
-    asm volatile (
-      "push %4\n"
-      "call ASM_BAT_unknsub_20\n"
-        : : "a" (a1), "d" (a2), "b" (a3), "c" (a4), "g" (a5));
-}
-
 TbResult prep_multicolor_sprites(void)
 {
     PathInfo *pinfo;
@@ -6838,10 +6830,6 @@ void input_mission_concluded(void)
 
 void load_packet(void)
 {
-#if 0
-    asm volatile ("call ASM_load_packet\n"
-        :  :  : "eax" );
-#else
     PlayerInfo *p_locplayer;
     struct Packet *p_pckt;
     int did_actn;
@@ -6947,7 +6935,6 @@ void load_packet(void)
             PacketRecord_Write(p_pckt);
         }
     }
-#endif
 }
 
 void joy_input(void)

src/lvfiles.c

@@ -24,6 +24,7 @@
 #include "bfmath.h"
 #include "bfmemut.h"
 
+#include "bat.h"
 #include "triangls.h"
 #include "trpoints.h"
 #include "trstate.h"
@@ -55,6 +56,17 @@
 #include "weapon.h"
 #include "swlog.h"
 /******************************************************************************/
+#pragma pack(1)
+
+struct BillboardNBreakout {
+  ubyte field_0;
+  ubyte field_1;
+  ubyte field_2;
+  ubyte field_3;
+};
+
+#pragma pack()
+/******************************************************************************/
 
 TbBool level_deep_fix = false;
 
@@ -94,6 +106,9 @@ struct QuickLoad quick_load_pc[] = {
 
 ushort next_used_lvl_objective = 1;
 
+extern uint dword_177790;
+extern struct BillboardNBreakout map_bnb;
+
 void debug_level(const char *text, int player)
 {
     ThingIdx thing;
@@ -1401,8 +1416,45 @@ TbResult load_map_mad(ushort mapno)
 
 void load_map_bnb(int a1)
 {
+#if 0
     asm volatile ("call ASM_load_map_bnb\n"
         : : "a" (a1));
+#endif
+    char locstr[52];
+    TbFileHandle fh;
+    ubyte Amin, Amax;
+    ubyte Bmin, Bmax;
+
+    sprintf(locstr, "%s/map%03d.b&b", "maps", a1);
+    fh = LbFileOpen(locstr, 2u);
+    if (fh == INVALID_FILE)
+    {
+        map_bnb.field_0 = 0;
+        map_bnb.field_1 = 0;
+        map_bnb.field_2 = 0;
+        map_bnb.field_3 = 0;
+        dword_177790 = 0;
+    }
+    else
+    {
+        LbFileRead(fh, &map_bnb, 4);
+        LbFileClose(fh);
+        dword_177790 = 2;
+    }
+    Amin = map_bnb.field_0;
+    if (map_bnb.field_0 >= map_bnb.field_2)
+        Amin = map_bnb.field_2;
+    Bmin = map_bnb.field_1;
+    if (map_bnb.field_1 >= map_bnb.field_3)
+        Bmin = map_bnb.field_3;
+    Amax = map_bnb.field_0;
+    if (map_bnb.field_0 <= map_bnb.field_2)
+        Amax = map_bnb.field_2;
+    Bmax = map_bnb.field_1;
+    if (map_bnb.field_1 <= map_bnb.field_3)
+        Bmax = map_bnb.field_3;
+
+    BAT_unknsub_20(Amin, Bmin, Amax, Bmax, vec_tmap[4] + 0xA040);
 }
 
 TbResult load_mad_pc(ushort mapno)