swars: Remade do_net_protocol_select()

Author: mefistotelis

src/fenet.c

@@ -532,10 +532,117 @@ ubyte show_net_comms_box(struct ScreenBox *box)
 
 ubyte do_net_protocol_select(ubyte click)
 {
+#if 0
     ubyte ret;
     asm volatile ("call ASM_do_net_protocol_select\n"
         : "=r" (ret) : "a" (click));
     return ret;
+#endif
+    const char *text;
+    int i;
+    short proto;
+    short pos_x;
+
+    if (byte_1C4A7C)
+    {
+      LbNetworkReset();
+      byte_1C4A7C = 0;
+    }
+
+    pos_x = net_protocol_select_button.X - 12 + net_protocol_select_button.Width + 4;
+
+    proto = nsvc.I.Type;
+    if (click)
+    {
+        proto--;
+        if (proto <= NetSvc_NONE)
+        {
+            proto = NetSvc_COM4;
+            if (data_1c4a70)
+            {
+                net_protocol_select_button.X -= 12;
+                net_unkn40_button.X = pos_x;
+                byte_1C4A6F = 1;
+            }
+        }
+        else if (proto == NetSvc_IPX) // IPX needs to be accepted
+        {
+            if (byte_1C4A6F)
+            {
+                byte_1C4A6F = 0;
+                proto = NetSvc_COM4;
+                net_protocol_select_button.X += 12;
+            }
+        }
+        nsvc.I.Type = proto;
+    }
+    else
+    {
+        proto++;
+        if (proto > NetSvc_COM4)
+        {
+            if (byte_1C4A6F || !data_1c4a70)
+            {
+                proto = NetSvc_IPX;
+                if (byte_1C4A6F)
+                {
+                    byte_1C4A6F = 0;
+                    net_protocol_select_button.X += 12;
+                }
+            }
+            else
+            {
+                proto = NetSvc_COM1;
+                net_protocol_select_button.X -= 12;
+                net_unkn40_button.X = pos_x;
+                byte_1C4A6F = 1;
+            }
+        }
+        nsvc.I.Type = proto;
+    }
+
+    switch (nsvc.I.Type)
+    {
+    case NetSvc_NONE:
+    default:
+        break;
+    case NetSvc_IPX:
+        net_protocol_select_button.Text = gui_strings[497 + NetSvc_IPX];
+
+        memset(unkstruct04_arr, 0, sizeof(unkstruct04_arr));
+        byte_1C6D48 = 0;
+        for (i = 0; i < 8; i++)
+            unkn2_names[i][0] = '\0';
+        if (LbNetworkServiceStart(&nsvc.I) != Lb_SUCCESS)
+        {
+            nsvc.I.Type = NetSvc_COM1;
+            net_protocol_select_button.Text = gui_strings[499];
+            net_protocol_option_button.Text = net_baudrate_text;
+            net_protocol_option_button.CallBackFn = ac_do_serial_speed_switch;
+
+            alert_box_text_fmt("%s", gui_strings[568]);
+            break;
+        }
+        byte_1C4A7C = 1;
+        byte_15516C = -1;
+        net_protocol_option_button.Text = net_proto_param_text;
+        net_protocol_option_button.CallBackFn = ac_do_net_protocol_option;
+        break;
+    case NetSvc_COM1:
+    case NetSvc_COM2:
+    case NetSvc_COM3:
+    case NetSvc_COM4:
+        net_protocol_option_button.Text = net_baudrate_text;
+        if (byte_1C4A6F)
+            text = gui_strings[522 + nsvc.I.Type];
+        else
+            text = gui_strings[497 + nsvc.I.Type];
+        net_protocol_option_button.CallBackFn = ac_do_serial_speed_switch;
+        net_protocol_select_button.Text = text;
+        byte_15516C = 0;
+        break;
+    }
+    return 1;
 }
 
 ubyte show_net_protocol_box(struct ScreenBox *box)

src/network.c

@@ -1341,13 +1341,13 @@ TbResult LbModemRingType(ushort dev_id, ubyte rtyp)
     return Lb_SUCCESS;
 }
 
-TbResult LbNetworkServiceStart(struct NetworkServiceInfo *nsvc)
+TbResult LbNetworkServiceStart(struct NetworkServiceInfo *p_nsvc)
 {
     TbResult ret;
     ulong k;
 
     ret = Lb_FAIL;
-    memcpy(&NetworkServicePtr.I, nsvc, sizeof(struct NetworkServiceInfo));
+    memcpy(&NetworkServicePtr.I, p_nsvc, sizeof(struct NetworkServiceInfo));
     switch (NetworkServicePtr.I.Type)
     {
     case NetSvc_IPX:
@@ -1361,8 +1361,8 @@ TbResult LbNetworkServiceStart(struct NetworkServiceInfo *nsvc)
         }
         memset(&IPXPlayer.Header, 0, sizeof(struct TbIPXPlayerHeader));
         memset(&IPXPlayer.Data, 0, sizeof(struct TbIPXPlayerData));
-        IPXPlayer.Header.field_2 = nsvc->GameId;
-        k = (nsvc->Flags >> 16) + 0x4545;
+        IPXPlayer.Header.field_2 = p_nsvc->GameId;
+        k = p_nsvc->Param + 0x4545;
         NetworkServicePtr.I.Id = &IPXPlayer.Header;
         if (k > 0x4FFF)
             k = 0x4FFF;
@@ -1382,7 +1382,7 @@ TbResult LbNetworkServiceStart(struct NetworkServiceInfo *nsvc)
         ret = Lb_SUCCESS;
         break;
     case NetSvc_RADICA:
-        ret = radica_service_init(nsvc);
+        ret = radica_service_init(p_nsvc);
         if (ret != Lb_SUCCESS) {
             LOGERR("RADICA service init failed");
             ret = Lb_FAIL;