Skip to content

Commit 1960723

Browse files
committed
Merge pull request #453 from Yarn366/target_font_height_fix
Target bracket line height fix
2 parents 1cb08e0 + 69f9d9f commit 1960723

File tree

1 file changed

+6
-4
lines changed

1 file changed

+6
-4
lines changed

code/hud/hudbrackets.cpp

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,7 @@ void HudGaugeBrackets::renderBoundingBrackets(int x1, int y1, int x2, int y2, in
951951
}
952952

953953
if (num_attacking > k) {
954-
int i, num_blips;
954+
int i, w, h, num_blips;
955955

956956
num_blips = num_attacking-k;
957957
if (num_blips > 4) {
@@ -960,18 +960,20 @@ void HudGaugeBrackets::renderBoundingBrackets(int x1, int y1, int x2, int y2, in
960960

961961
//int bitmap = get_blip_bitmap();
962962

963+
bm_get_info(attacking_dot, &w, &h);
964+
963965
if (attacking_dot >= 0) {
964966
if (num_blips > 3)
965967
y1 -= 3;
966968

967969
for (i=0; i<num_blips; i++) {
968-
GR_AABITMAP(attacking_dot, x2+3, y1+i*7);
970+
GR_AABITMAP(attacking_dot, x2+3, y1+i*(h+2));
969971
}
970972
}
971973

972974
// Increment for the position of ship name/class.
973975
// DEPENDANT ON ATTACKER SIZE (X)
974-
x2 += 7;
976+
x2 += w + 2;
975977
}
976978
}
977979

@@ -1037,7 +1039,7 @@ void HudGaugeBrackets::renderBoundingBrackets(int x1, int y1, int x2, int y2, in
10371039
gr_string(x2+3, y1, tinfo_name);
10381040
}
10391041
if(tinfo_class && (flags & TARGET_DISPLAY_CLASS)) {
1040-
gr_string(x2+3, y1+9, tinfo_class);
1042+
gr_string(x2+3, y1+gr_get_font_height(), tinfo_class);
10411043
}
10421044
}
10431045

0 commit comments

Comments
 (0)