Merge remote-tracking branch 'eduke32/master'

clipmove · May 15, 2024 · 71fc98c · 71fc98c
2 parents e811bb9 + 4929213
commit 71fc98c
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/platform/Windows/mimalloc.vcxproj b/platform/Windows/mimalloc.vcxproj
@@ -47,8 +47,12 @@
     <ClCompile Include="..\..\source\mimalloc\src\alloc.c" />
     <ClCompile Include="..\..\source\mimalloc\src\arena.c" />
     <ClCompile Include="..\..\source\mimalloc\src\bitmap.c" />
+    <ClCompile Include="..\..\source\mimalloc\src\free.c">
+      <ExcludedFromBuild>true</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="..\..\source\mimalloc\src\heap.c" />
     <ClCompile Include="..\..\source\mimalloc\src\init.c" />
+    <ClCompile Include="..\..\source\mimalloc\src\libc.c" />
     <ClCompile Include="..\..\source\mimalloc\src\options.c" />
     <ClCompile Include="..\..\source\mimalloc\src\os.c" />
     <ClCompile Include="..\..\source\mimalloc\src\page-queue.c">

diff --git a/platform/Windows/mimalloc.vcxproj.filters b/platform/Windows/mimalloc.vcxproj.filters
@@ -58,12 +58,18 @@
     <ClCompile Include="..\..\source\mimalloc\src\bitmap.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\source\mimalloc\src\free.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\source\mimalloc\src\heap.c">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="..\..\source\mimalloc\src\init.c">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\source\mimalloc\src\libc.c">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\source\mimalloc\src\options.c">
       <Filter>Source Files</Filter>
     </ClCompile>

diff --git a/source/duke3d/src/sbar.cpp b/source/duke3d/src/sbar.cpp
@@ -295,10 +295,16 @@ static void G_DrawWeapAmounts(const DukePlayer_t *p, int32_t x, int32_t y, int32
     {
         if (u != -1) G_PatchStatusBar(158, 190, 162+29, 190+6); //original code: (166,190,166+8,190+6);
 
-        G_DrawWeapNum(-1, x+70, y+12,
-            p->ammo_amount[FREEZE_WEAPON], p->max_ammo_amount[FREEZE_WEAPON],
-            (((p->gotweapon & (1<<FREEZE_WEAPON)) == 0)*9)+12-18*
-            (cw == FREEZE_WEAPON));
+        if (p->subweapon&(1<<FLAMETHROWER_WEAPON))
+            G_DrawWeapNum(-1, x+70, y+12,
+                p->ammo_amount[FLAMETHROWER_WEAPON], p->max_ammo_amount[FLAMETHROWER_WEAPON],
+                (((p->gotweapon & (1<<FLAMETHROWER_WEAPON)) == 0)*9)+12-18*
+                (cw == FLAMETHROWER_WEAPON));
+        else
+            G_DrawWeapNum(-1, x+70, y+12,
+                p->ammo_amount[FREEZE_WEAPON], p->max_ammo_amount[FREEZE_WEAPON],
+                (((p->gotweapon & (1<<FREEZE_WEAPON)) == 0)*9)+12-18*
+                (cw == FREEZE_WEAPON));
     }
 }