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

[Fix] Cosmetic changed to fix formatting in Outfit store and shipyard.

Browse Source
This commit is contained in:
Allanis 2013-03-08 00:19:34 +00:00
parent a33bb0624a
commit d1d08da22c
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/land.c
View File

@ -17,7 +17,7 @@
#define COMMODITY_HEIGHT 400 #define COMMODITY_HEIGHT 400
// Outfits. // Outfits.
#define OUTFITS_WIDTH 600 #define OUTFITS_WIDTH 700
#define OUTFITS_HEIGHT 500 #define OUTFITS_HEIGHT 500
// Shipyard. // Shipyard.
@ -111,7 +111,7 @@ static void outfits(void) {
BUTTON_WIDTH, BUTTON_HEIGHT, "btnSellOutfit", BUTTON_WIDTH, BUTTON_HEIGHT, "btnSellOutfit",
"Sell", outfits_sell); "Sell", outfits_sell);
window_addText(secondary_wid, 40+200+40, -80, window_addText(secondary_wid, 40+200+20, -60,
80, 96, 0, "txtSDesc", &gl_smallFont, &cDConsole, 80, 96, 0, "txtSDesc", &gl_smallFont, &cDConsole,
"Name:\n" "Name:\n"
"Type:\n" "Type:\n"
@ -121,7 +121,7 @@ static void outfits(void) {
"Price:\n" "Price:\n"
"Money:\n"); "Money:\n");
window_addText(secondary_wid, 40+200+40+80, -80, window_addText(secondary_wid, 40+200+40+60, -60,
250, 96, 0, "txtDDesc", &gl_smallFont, &cBlack, NULL); 250, 96, 0, "txtDDesc", &gl_smallFont, &cBlack, NULL);
window_addText(secondary_wid, 20+200+40, -200, window_addText(secondary_wid, 20+200+40, -200,
@ -131,7 +131,7 @@ static void outfits(void) {
// Set up the outfits to buy/sell. // Set up the outfits to buy/sell.
outfits = outfit_getAll(&noutfits); outfits = outfit_getAll(&noutfits);
window_addList(secondary_wid, 20, 40, window_addList(secondary_wid, 20, 40,
200, OUTFITS_HEIGHT-120, "lstOutfits", 200, OUTFITS_HEIGHT-80, "lstOutfits",
outfits, noutfits, 0, outfits_update); outfits, noutfits, 0, outfits_update);
// Write the outfits stuff. // Write the outfits stuff.
@ -147,13 +147,13 @@ static void outfits_update(char* str) {
(void)str; (void)str;
char* outfitname; char* outfitname;
Outfit* outfit; Outfit* outfit;
char buf[80], buf2[32], buf3[32]; char buf[80], buf2[16], buf3[16];
outfitname = toolkit_getList(secondary_wid, "lstOutfits"); outfitname = toolkit_getList(secondary_wid, "lstOutfits");
outfit = outfit_get(outfitname); outfit = outfit_get(outfitname);
window_modifyText(secondary_wid, "txtDescription", outfit->description); window_modifyText(secondary_wid, "txtDescription", outfit->description);
credits2str(buf2, outfit->price, -1); credits2str(buf2, outfit->price, 2);
credits2str(buf3, player_credits, 2); credits2str(buf3, player_credits, 2);
snprintf(buf, 80, snprintf(buf, 80,
"%s\n" "%s\n"
@ -230,16 +230,17 @@ static void shipyard(void) {
window_addImage(secondary_wid, -40-128, -50-96, window_addImage(secondary_wid, -40-128, -50-96,
"imgTarget", NULL); "imgTarget", NULL);
window_addText(secondary_wid, 40+200+40, -80, window_addText(secondary_wid, 40+200+40, -55,
80, 96, 0, "txtSDesc", &gl_smallFont, &cDConsole, 80, 96, 0, "txtSDesc", &gl_smallFont, &cDConsole,
"Name:\n" "Name:\n"
"Class:\n" "Class:\n"
"Fabricator:\n" "Fabricator:\n"
"\n" "\n"
"Price:\n"); "Price:\n"
"Money:\n");
window_addText(secondary_wid, 40+200+40+80, -80, window_addText(secondary_wid, 40+200+40+80, -55,
120, 96, 0, "txtDDesc", &gl_smallFont, &cBlack, NULL); 130, 96, 0, "txtDDesc", &gl_smallFont, &cBlack, NULL);
window_addText(secondary_wid, 20+200+40, -160, window_addText(secondary_wid, 20+200+40, -160,
@ -249,7 +250,7 @@ static void shipyard(void) {
// Setup the ships to buy/sell. // Setup the ships to buy/sell.
ships = ship_getAll(&nships); ships = ship_getAll(&nships);
window_addList(secondary_wid, 20, 40, window_addList(secondary_wid, 20, 40,
200, SHIPYARD_HEIGHT-120, "lstShipyard", 200, SHIPYARD_HEIGHT-80, "lstShipyard",
ships, nships, 0, shipyard_update); ships, nships, 0, shipyard_update);
// Write the shipyard stuff. // Write the shipyard stuff.
@ -265,7 +266,7 @@ static void shipyard_update(char* str) {
(void)str; (void)str;
char* shipname; char* shipname;
Ship* ship; Ship* ship;
char buf[80], buf2[32]; char buf[80], buf2[16], buf3[16];
shipname = toolkit_getList(secondary_wid, "lstShipyard"); shipname = toolkit_getList(secondary_wid, "lstShipyard");
ship = ship_get(shipname); ship = ship_get(shipname);
@ -273,17 +274,20 @@ static void shipyard_update(char* str) {
window_modifyText(secondary_wid, "txtDescription", ship->description); window_modifyText(secondary_wid, "txtDescription", ship->description);
window_modifyImage(secondary_wid, "imgTarget", ship->gfx_target); window_modifyImage(secondary_wid, "imgTarget", ship->gfx_target);
credits2str(buf2, ship->price, 0); credits2str(buf2, ship->price, 2);
credits2str(buf3, player_credits, 2);
snprintf(buf, 80, snprintf(buf, 80,
"%s\n" "%s\n"
"%s\n" "%s\n"
"%s\n" "%s\n"
"\n" "\n"
"%s SCred\n"
"%s SCred\n", "%s SCred\n",
ship->name, ship->name,
ship_class(ship), ship_class(ship),
ship->fabricator, ship->fabricator,
buf2); buf2,
buf3);
window_modifyText(secondary_wid, "txtDDesc", buf); window_modifyText(secondary_wid, "txtDDesc", buf);