swars: Reamde update_flic_mods()

Author: mefistotelis

src/febrief.c

@@ -244,10 +244,12 @@ void purple_unkn2_data_to_screen(void)
 
 void load_netscan_map(ushort mapno)
 {
+    char locstr[DISKPATH_SIZE];
+    PathInfo *pinfo;
     TbFileHandle fh;
-    char locstr[52];
 
-    sprintf(locstr, "maps/map%03d.scn", mapno);
+    pinfo = &game_dirs[DirPlace_Maps];
+    snprintf(locstr, DISKPATH_SIZE-1, "%s/map%03d.scn", pinfo->directory, mapno);
     fh = LbFileOpen(locstr, Lb_FILE_MODE_READ_ONLY);
     if (fh != INVALID_FILE) {
         LbFileRead(fh, SCANNER_data, SCANNER_MAPDATA_WIDTH * SCANNER_MAPDATA_HEIGHT);

src/fecryo.c

@@ -953,8 +953,44 @@ ubyte cryo_blokey_mod_level(ubyte ordpart)
 
 void update_flic_mods(ubyte *mods)
 {
+#if 0
     asm volatile ("call ASM_update_flic_mods\n"
         : : "a" (mods));
+#endif
+    short plagent, i;
+    ubyte lv;
+
+    plagent = selected_agent;
+    if (plagent < 4)
+    {
+        mods[0] = cybmod_chest_level(&cryo_agents.Mods[plagent]);
+        mods[1] = cybmod_brain_level(&cryo_agents.Mods[plagent]);
+        mods[2] = cybmod_arms_level(&cryo_agents.Mods[plagent]);
+        mods[3] = cybmod_legs_level(&cryo_agents.Mods[plagent]);
+        return;
+    }
+
+    for (i = 0; i < 4; i++)
+        mods[i] = 3;
+
+    for (plagent = 0; plagent < 4; plagent++)
+    {
+        lv = cybmod_chest_level(&cryo_agents.Mods[plagent]);
+        if (lv < mods[0])
+            mods[0] = lv;
+
+        lv = cybmod_brain_level(&cryo_agents.Mods[plagent]);
+        if (lv < mods[1])
+            mods[1] = lv;
+
+        lv = cybmod_arms_level(&cryo_agents.Mods[plagent]);
+        if (lv < mods[2])
+            mods[2] = lv;
+
+        lv = cybmod_legs_level(&cryo_agents.Mods[plagent]);
+        if (lv < mods[3])
+            mods[3] = lv;
+    }
 }
 
 /** Draws body mods, either images or anims, on pre-drawn background.

src/lvfiles.c

@@ -1395,12 +1395,14 @@ void prepare_map_dat_to_play(void)
 
 TbResult load_map_mad(ushort mapno)
 {
-    char mad_fname[52];
+    char mad_fname[DISKPATH_SIZE];
+    PathInfo *pinfo;
     long fsize;
 
     next_local_mat = 1;
 
-    sprintf(mad_fname, "%s/map%03d.mad", "maps", mapno);
+    pinfo = &game_dirs[DirPlace_Maps];
+    snprintf(mad_fname, DISKPATH_SIZE-1, "%s/map%03d.mad", pinfo->directory, mapno);
     fsize = LbFileLoadAt(mad_fname, scratch_malloc_mem);
     if (fsize == Lb_FAIL)
         return Lb_FAIL;
@@ -1414,11 +1416,11 @@ TbResult load_map_mad(ushort mapno)
     return Lb_SUCCESS;
 }
 
-void load_map_bnb(int a1)
+void load_map_bnb(ushort mapno)
 {
 #if 0
     asm volatile ("call ASM_load_map_bnb\n"
-        : : "a" (a1));
+        : : "a" (mapno));
 #endif
     char locstr[DISKPATH_SIZE];
     PathInfo *pinfo;
@@ -1427,7 +1429,7 @@ void load_map_bnb(int a1)
     ubyte Bmin, Bmax;
 
     pinfo = &game_dirs[DirPlace_Maps];
-    snprintf(locstr, DISKPATH_SIZE-1, "%s/map%03d.b&b", pinfo->directory, a1);
+    snprintf(locstr, DISKPATH_SIZE-1, "%s/map%03d.b&b", pinfo->directory, mapno);
     fh = LbFileOpen(locstr, Lb_FILE_MODE_READ_ONLY);
     if (fh == INVALID_FILE)
     {