zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2025-03-03 15:31:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

SW: Left-pin the mini HUD in widescreen

Browse source 
git-svn-id: https://svn.eduke32.com/eduke32@8352 1a8010ca-5511-0410-912e-c29ae57300e0

# Conflicts:
#	source/sw/src/text.cpp
This commit is contained in:
hendricks266 2019-12-05 05:40:30 +00:00 committed by Christoph Oelckers
parent 6f9494435a
commit 1507e9fd15
2 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
source/sw/src/inv.cpp
View file

@ -138,7 +138,8 @@ void UpdateMiniBar(PLAYERp pp)
rotatesprite(x << 16, y << 16, (1 << 16), 0, rotatesprite(x << 16, y << 16, (1 << 16), 0,
MINI_BAR_HEALTH_BOX_PIC, 0, 0, MINI_BAR_HEALTH_BOX_PIC, 0, 0,
ROTATE_SPRITE_SCREEN_CLIP | ROTATE_SPRITE_CORNER, 0, 0, xdim - 1, ydim - 1); ROTATE_SPRITE_SCREEN_CLIP | ROTATE_SPRITE_CORNER | RS_ALIGN_L,
0, 0, xdim - 1, ydim - 1);
x = MINI_BAR_HEALTH_BOX_X+3; x = MINI_BAR_HEALTH_BOX_X+3;
DisplayMiniBarNumber(pp, x, y+5, u->Health); DisplayMiniBarNumber(pp, x, y+5, u->Health);
@ -149,7 +150,8 @@ void UpdateMiniBar(PLAYERp pp)
rotatesprite(x << 16, y << 16, (1 << 16), 0, rotatesprite(x << 16, y << 16, (1 << 16), 0,
MINI_BAR_AMMO_BOX_PIC, 0, 0, MINI_BAR_AMMO_BOX_PIC, 0, 0,
ROTATE_SPRITE_SCREEN_CLIP | ROTATE_SPRITE_CORNER, 0, 0, xdim - 1, ydim - 1); ROTATE_SPRITE_SCREEN_CLIP | ROTATE_SPRITE_CORNER | RS_ALIGN_L,
0, 0, xdim - 1, ydim - 1);
x = MINI_BAR_AMMO_BOX_X+3; x = MINI_BAR_AMMO_BOX_X+3;
DisplayMiniBarNumber(pp, x, y+5, pp->WpnAmmo[u->WeaponNum]); DisplayMiniBarNumber(pp, x, y+5, pp->WpnAmmo[u->WeaponNum]);
@ -163,7 +165,8 @@ void UpdateMiniBar(PLAYERp pp)
rotatesprite(x << 16, y << 16, (1 << 16), 0, rotatesprite(x << 16, y << 16, (1 << 16), 0,
MINI_BAR_INVENTORY_BOX_PIC, 0, 0, MINI_BAR_INVENTORY_BOX_PIC, 0, 0,
ROTATE_SPRITE_SCREEN_CLIP | ROTATE_SPRITE_CORNER, 0, 0, xdim - 1, ydim - 1); ROTATE_SPRITE_SCREEN_CLIP | ROTATE_SPRITE_CORNER | RS_ALIGN_L,
0, 0, xdim - 1, ydim - 1);
id = &InventoryData[pp->InventoryNum]; id = &InventoryData[pp->InventoryNum];
@ -173,7 +176,8 @@ void UpdateMiniBar(PLAYERp pp)
rotatesprite(x << 16, y << 16, (1 << 16), 0, rotatesprite(x << 16, y << 16, (1 << 16), 0,
id->State->picndx, 0, 0, id->State->picndx, 0, 0,
ROTATE_SPRITE_SCREEN_CLIP | ROTATE_SPRITE_CORNER, 0, 0, xdim - 1, ydim - 1); ROTATE_SPRITE_SCREEN_CLIP | ROTATE_SPRITE_CORNER | RS_ALIGN_L,
0, 0, xdim - 1, ydim - 1);
// will update the AUTO and % inventory values // will update the AUTO and % inventory values
PlayerUpdateInventory(pp, pp->InventoryNum); PlayerUpdateInventory(pp, pp->InventoryNum);

6
source/sw/src/text.cpp
View file

@ -284,7 +284,8 @@ void DisplayMiniBarNumber(PLAYERp pp, short xs, short ys, int number)
rotatesprite((long)x << 16, (long)ys << 16, (1 << 16), 0, rotatesprite((long)x << 16, (long)ys << 16, (1 << 16), 0,
pic, 0, 0, pic, 0, 0,
ROTATE_SPRITE_SCREEN_CLIP | ROTATE_SPRITE_CORNER, 0, 0, xdim - 1, ydim - 1); ROTATE_SPRITE_SCREEN_CLIP | ROTATE_SPRITE_CORNER | RS_ALIGN_L,
0, 0, xdim - 1, ydim - 1);
size = tilesiz[PANEL_FONT_G + (*ptr - '0')].x + 1; size = tilesiz[PANEL_FONT_G + (*ptr - '0')].x + 1;
} }
@ -310,7 +311,8 @@ void DisplayMiniBarSmString(PLAYERp pp, short xs, short ys, short pal, const cha
pic = FRAG_FIRST_TILE + (*ptr - FRAG_FIRST_ASCII); pic = FRAG_FIRST_TILE + (*ptr - FRAG_FIRST_ASCII);
rotatesprite((int)x << 16, (int)ys << 16, (1 << 16), 0, pic, 0, pal, rotatesprite((int)x << 16, (int)ys << 16, (1 << 16), 0, pic, 0, pal,
ROTATE_SPRITE_SCREEN_CLIP | ROTATE_SPRITE_CORNER, 0, 0, xdim - 1, ydim - 1); ROTATE_SPRITE_SCREEN_CLIP | ROTATE_SPRITE_CORNER | RS_ALIGN_L,
0, 0, xdim - 1, ydim - 1);
} }
} }