syndwarsfx: Remade research_allow_weapons_in_cryo()

Also slightly improved some functions.

Author: mefistotelis

src/fepause.c

@@ -638,17 +638,17 @@ TbBool pause_screen_handle(void)
 
         if (affected == &startscr_samplevol)
         {
-            SetSoundMasterVolume(127 * startscr_samplevol / STARTSCR_VOLUME_MAX);
+            sfx_apply_samplevol();
             if (!IsSamplePlaying(0, 80, 0))
-                play_sample_using_heap(0, 80, FULL_VOL, EQUL_PAN, NORM_PTCH, LOOP_NO, 1u);
+                play_sample_using_heap(0, 80, FULL_VOL, EQUL_PAN, NORM_PTCH, LOOP_NO, 1);
         }
         else if (affected == &startscr_midivol)
         {
-            SetMusicMasterVolume(127 * startscr_midivol / STARTSCR_VOLUME_MAX);
+            sfx_apply_midivol();
         }
         else if (affected == &startscr_cdvolume)
         {
-            SetCDVolume(70 * (127 * startscr_cdvolume / STARTSCR_VOLUME_MAX) / 100);
+            sfx_apply_cdvolume();
         }
         else if (affected == &ingame.DetailLevel)
         {

src/feresearch.c

@@ -35,6 +35,7 @@
 #include "guitext.h"
 #include "keyboard.h"
 #include "purpldrw.h"
+#include "player.h"
 #include "weapon.h"
 #include "research.h"
 #include "swlog.h"
@@ -89,8 +90,21 @@ TbBool research_cybmod_daily_progress(void)
  */
 void research_allow_weapons_in_cryo(void)
 {
+#if 0
     asm volatile ("call ASM_research_allow_weapons_in_cryo\n"
         :  :  : "eax" );
+#endif
+    short plagent;
+    WeaponType wtype;
+
+    for (plagent = 0; plagent < AGENTS_SQUAD_MAX_COUNT; plagent++)
+    {
+        for (wtype = WEP_NULL + 1; wtype < WEP_TYPES_COUNT; wtype++)
+        {
+            if (weapons_has_weapon(cryo_agents.Weapons[plagent], wtype) && !is_research_weapon_completed(wtype))
+                research_weapon_allow(wtype);
+        }
+    }
 }
 
 void forward_research_progress_after_mission(int num_days)

src/hud_panel.c

@@ -788,7 +788,7 @@ int count_weapons_in_flags(int *p_ncarr_below, int *p_ncarr_above, ulong weapons
     ncarr_below = 0;
     wepflags = weapons_carried;
 
-    for (nwtype = 1; nwtype < WEP_TYPES_COUNT; nwtype++, wepflags >>= 1)
+    for (nwtype = WEP_NULL + 1; nwtype < WEP_TYPES_COUNT; nwtype++, wepflags >>= 1)
     {
         if (wepflags == 0)
             break;