Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Change] Small change to secondary weapon display.

Browse Source
This commit is contained in:
Allanis 2013-02-15 09:24:53 +00:00
parent 36f1936667
commit ef108e9f2e
1 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/player.c
View File

@ -250,6 +250,7 @@ void player_render(void) {
Pilot* p; Pilot* p;
Vec2 v; Vec2 v;
glColour* c; glColour* c;
gl_font* f;
// Render the player target graphics. // Render the player target graphics.
if(player_target != PLAYER_ID) { if(player_target != PLAYER_ID) {
@ -349,20 +350,34 @@ void player_render(void) {
vect_csetmin(&v, VX(gui.pos_weapon) + (gui.weapon.w - i)/2., VY(gui.pos_weapon) - 10 - gl_defFont.h); vect_csetmin(&v, VX(gui.pos_weapon) + (gui.weapon.w - i)/2., VY(gui.pos_weapon) - 10 - gl_defFont.h);
gl_print(&gui.smallFont, &v, &cGrey, "None"); gl_print(&gui.smallFont, &v, &cGrey, "None");
} else { } else {
f = &gl_defFont;
if(player->ammo == NULL) { if(player->ammo == NULL) {
i = gl_printWidth(&gui.smallFont, "%s", player->secondary->outfit->name); i = gl_printWidth(f, "%s", player->secondary->outfit->name);
if(i > gui.weapon.w) {
// Font is too big.
f = &gui.smallFont;
i = gl_printWidth(f, "%s", player->secondary->outfit->name);
}
vect_csetmin(&v, VX(gui.pos_weapon) + (gui.weapon.w - i)/2., vect_csetmin(&v, VX(gui.pos_weapon) + (gui.weapon.w - i)/2.,
VY(gui.pos_weapon) - (gui.weapon.h - gui.smallFont.h)/2.); VY(gui.pos_weapon) - (gui.weapon.h - f->h)/2.);
gl_print(&gui.smallFont, &v, &cConsole, "%s", player->secondary->outfit->name); gl_print(f, &v, &cConsole, "%s", player->secondary->outfit->name);
} else { } else {
i = gl_printWidth(&gui.smallFont, "%s", player->secondary->outfit->name); // Use the ammunitions name.
i = gl_printWidth(f, "%s", player->secondary->outfit->name);
if(i > gui.weapon.w) {
// Font is too big.
f = &gui.smallFont;
i = gl_printWidth(f, "%s", player->ammo->outfit->name);
}
vect_csetmin(&v, VX(gui.pos_weapon) + (gui.weapon.w - i)/2., vect_csetmin(&v, VX(gui.pos_weapon) + (gui.weapon.w - i)/2.,
VY(gui.pos_weapon) - 5); VY(gui.pos_weapon) - 5);
gl_print(&gui.smallFont, &v, NULL, "%s", player->ammo->outfit->name); gl_print(f, &v, NULL, "%s", player->ammo->outfit->name);
i = gl_printWidth(NULL, "%d", player->ammo->quantity);
// Print ammo underneath to the left.
i = gl_printWidth(&gui.smallFont, "%d", player->ammo->quantity);
vect_csetmin(&v, VX(gui.pos_weapon) + (gui.weapon.w - i)/2., vect_csetmin(&v, VX(gui.pos_weapon) + (gui.weapon.w - i)/2.,
VY(gui.pos_weapon) - 10 - gl_defFont.h); VY(gui.pos_weapon) - 10 - gl_defFont.h);
gl_print(NULL, &v, &cConsole, "%d", player->ammo->quantity); gl_print(&gui.smallFont, &v, &cConsole, "%d", player->ammo->quantity);
} }
} }