SBARINFO plus HIRESTEX issues

[wildweasel]

Alright, I'm working on the fullscreen HUD for wwhc-diaz and I'm noticing some inconsistency in the way the HUD handles HIRESTEX-defined images.

I'm defining a high-res ammo icon like so, in HIRESTEX:

Code: Select all

define ISMGAMMO 16 6

And displaying it in SBARINFO thusly:

Code: Select all

IsSelected "SMG37"
	{
		drawbar "BSMGFULL", "BSMGEMPT", SMGClip, horizontal, reverse, 208, 184;
		drawimage "ISMGAMMO", 312, 180;
		drawnumber 2, STATUSFONT, black, ammo2, 307, 175;
		drawnumber 2, STATUSFONT, white, ammo2, 306, 174;
	}

This particular setup seems to completely ignore the HIRESTEX lump and displays the clip image at normal size, i.e. friggin' huge. BUT, if I change it to this instead:

Code: Select all

IsSelected "SMG37"
	{
		drawbar "BSMGFULL", "BSMGEMPT", SMGClip, horizontal, reverse, 208, 184;
		drawimage ammoicon2, 312, 180;
		drawnumber 2, STATUSFONT, black, ammo2, 307, 175;
		drawnumber 2, STATUSFONT, white, ammo2, 306, 174;
	}

The clip displays at its proper scaled size. Is this a bug, or something I'm overlooking? For the record, I'm using GZDoom SVN r101M.

[Graf Zahl]

The HIRESTEX 'define' keyword is somewhat broken and needs some rewriting to make it work again. Currently it just inserts the scaled texture but if there's already something defined by the same graphics lump it should just change its scaling info.

I'll try to address this ASAP.