From 1507e9fd152611e0fafc2d3505c495d923cfa6d8 Mon Sep 17 00:00:00 2001 From: hendricks266 Date: Thu, 5 Dec 2019 05:40:30 +0000 Subject: [PATCH] SW: Left-pin the mini HUD in widescreen git-svn-id: https://svn.eduke32.com/eduke32@8352 1a8010ca-5511-0410-912e-c29ae57300e0 # Conflicts: # source/sw/src/text.cpp --- source/sw/src/inv.cpp | 12 ++++++++---- source/sw/src/text.cpp | 6 ++++-- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/source/sw/src/inv.cpp b/source/sw/src/inv.cpp index 157d51174..5e1fc31f6 100644 --- a/source/sw/src/inv.cpp +++ b/source/sw/src/inv.cpp @@ -138,7 +138,8 @@ void UpdateMiniBar(PLAYERp pp) rotatesprite(x << 16, y << 16, (1 << 16), 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; DisplayMiniBarNumber(pp, x, y+5, u->Health); @@ -149,7 +150,8 @@ void UpdateMiniBar(PLAYERp pp) rotatesprite(x << 16, y << 16, (1 << 16), 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; 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, 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]; @@ -173,7 +176,8 @@ void UpdateMiniBar(PLAYERp pp) rotatesprite(x << 16, y << 16, (1 << 16), 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 PlayerUpdateInventory(pp, pp->InventoryNum); diff --git a/source/sw/src/text.cpp b/source/sw/src/text.cpp index a63b97b58..e65d2aabc 100644 --- a/source/sw/src/text.cpp +++ b/source/sw/src/text.cpp @@ -284,7 +284,8 @@ void DisplayMiniBarNumber(PLAYERp pp, short xs, short ys, int number) rotatesprite((long)x << 16, (long)ys << 16, (1 << 16), 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; } @@ -310,7 +311,8 @@ void DisplayMiniBarSmString(PLAYERp pp, short xs, short ys, short pal, const cha pic = FRAG_FIRST_TILE + (*ptr - FRAG_FIRST_ASCII); 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); } }