diff --git a/src/g_shared/shared_hud.cpp b/src/g_shared/shared_hud.cpp
index bd4410fcb5..8b19660870 100644
--- a/src/g_shared/shared_hud.cpp
+++ b/src/g_shared/shared_hud.cpp
@@ -266,68 +266,17 @@ static int DrawAmmo(player_t *CPlayer, int x, int y)
 }
 
 
-static void DrawOneWeapon(player_t * CPlayer, int x, int & y, AInventory * weapon)
-{
-	double trans;
-
-	// Powered up weapons and inherited sister weapons are not displayed.
-	if (weapon->IntVar(NAME_WeaponFlags) & WIF_POWERED_UP) return;
-	auto SisterWeapon = weapon->PointerVar<AInventory>(NAME_SisterWeapon);
-	if (SisterWeapon && weapon->IsKindOf(SisterWeapon->GetClass())) return;
-
-	trans=0.4;
-	if (CPlayer->ReadyWeapon)
-	{
-		if (weapon==CPlayer->ReadyWeapon || SisterWeapon == CPlayer->ReadyWeapon) trans = 0.85;
-	}
-
-	FTextureID picnum = GetInventoryIcon(weapon, DI_ALTICONFIRST);
-
-	if (picnum.isValid())
-	{
-		FTexture * tex = TexMan[picnum];
-		int w = tex->GetWidth();
-		int h = tex->GetHeight();
-		int rh;
-		if (w>h) rh=8;
-		else rh=16,y-=8;		// don't draw tall sprites too small!
-		DrawImageToBox(tex, x-24, y, 20, rh, trans);
-		y-=10;
-	}
-}
-
-
 static void DrawWeapons(player_t *CPlayer, int x, int y)
 {
-	int k,j;
-	AInventory *inv;
-
-	// First draw all weapons in the inventory that are not assigned to a weapon slot
-	for(inv = CPlayer->mo->Inventory; inv; inv = inv->Inventory)
+	IFVM(AltHud, DrawWeapons)
 	{
-		if (inv->IsKindOf(NAME_Weapon) && 
-			!CPlayer->weapons.LocateWeapon(inv->GetClass(), NULL, NULL))
-		{
-			DrawOneWeapon(CPlayer, x, y, inv);
-		}
-	}
-
-	// And now everything in the weapon slots back to front
-	for (k = NUM_WEAPON_SLOTS - 1; k >= 0; k--) for(j = CPlayer->weapons.SlotSize(k) - 1; j >= 0; j--)
-	{
-		PClassActor *weap = CPlayer->weapons.GetWeapon(k, j);
-		if (weap) 
-		{
-			inv=CPlayer->mo->FindInventory(weap);
-			if (inv) 
-			{
-				DrawOneWeapon(CPlayer, x, y, inv);
-			}
-		}
+		VMValue params[] = { althud, CPlayer, x, y };
+		VMCall(func, params, countof(params), nullptr, 0);
 	}
 }
 
 
+
 //---------------------------------------------------------------------------
 //
 // Draw the Inventory
diff --git a/wadsrc/static/zscript/statusbar/alt_hud.txt b/wadsrc/static/zscript/statusbar/alt_hud.txt
index b016677a24..acb5f4e17e 100644
--- a/wadsrc/static/zscript/statusbar/alt_hud.txt
+++ b/wadsrc/static/zscript/statusbar/alt_hud.txt
@@ -40,7 +40,7 @@ static FTexture * invgems[2];				// Inventory arrows
 DVector2 AM_GetPosition();
 */
 
-class AltHud
+class AltHud ui
 {
 	TextureID healthPic, berserkPic;
 	TextureID tnt1a0;
@@ -527,5 +527,78 @@ class AltHud
 		return y;
 	}
 
-	
+	//---------------------------------------------------------------------------
+	//
+	// Drawing weapons
+	//
+	//---------------------------------------------------------------------------
+
+	void DrawOneWeapon(PlayerInfo CPlayer, int x, in out int y, Weapon weapon)
+	{
+		double trans;
+
+		// Powered up weapons and inherited sister weapons are not displayed.
+		if (weapon.bPOWERED_UP) return;
+		let SisterWeapon = weapon.SisterWeapon;
+		if (SisterWeapon && (weapon is SisterWeapon.GetClass())) return;
+
+		trans=0.4;
+		let ReadyWeapon = CPlayer.ReadyWeapon;
+		if (ReadyWeapon)
+		{
+			if (weapon == CPlayer.ReadyWeapon || SisterWeapon == CPlayer.ReadyWeapon) trans = 0.85;
+		}
+
+		TextureID picnum = StatusBar.GetInventoryIcon(weapon, StatusBar.DI_ALTICONFIRST);
+
+		if (picnum.isValid())
+		{
+			// don't draw tall sprites too small.
+			int w, h;
+			[w, h] = TexMan.GetSize(picnum);
+			int rh;
+			if (w > h) rh = 8;
+			else 
+			{
+				rh = 16;
+				y -= 8;	
+			}
+			DrawImageToBox(picnum, x-24, y, 20, rh, trans);
+			y-=10;
+		}
+	}
+
+
+	void DrawWeapons(PlayerInfo CPlayer, int x, int y)
+	{
+		int k,j;
+		Inventory inv;
+
+		// First draw all weapons in the inventory that are not assigned to a weapon slot
+		for(inv = CPlayer.mo.Inv; inv; inv = inv.Inv)
+		{
+			let weap = Weapon(inv);
+			if (weap && 
+				!CPlayer.weapons.LocateWeapon(weap.GetClass()))
+			{
+				DrawOneWeapon(CPlayer, x, y, weap);
+			}
+		}
+
+		// And now everything in the weapon slots back to front
+		for (k = PlayerPawn.NUM_WEAPON_SLOTS - 1; k >= 0; k--) for(j = CPlayer.weapons.SlotSize(k) - 1; j >= 0; j--)
+		{
+			let weap = CPlayer.weapons.GetWeapon(k, j);
+			if (weap) 
+			{
+				let weapitem = Weapon(CPlayer.mo.FindInventory(weap));
+				if (weapitem) 
+				{
+					DrawOneWeapon(CPlayer, x, y, weapitem);
+				}
+			}
+		}
+	}
+
+
 }
\ No newline at end of file