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

[Fix] Planets with 0 tech won't segfault anymore. :/

Browse Source
This commit is contained in:
Allanis 2013-08-30 16:31:59 +01:00
parent b387cf0da7
commit e4b72c0302
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/land.c
View File

@ -567,6 +567,13 @@ static void shipyard_open(void) {
/* Setup the ships to buy/sell. */ /* Setup the ships to buy/sell. */
ships = ship_getTech(&nships, land_planet->tech, PLANET_TECH_MAX); ships = ship_getTech(&nships, land_planet->tech, PLANET_TECH_MAX);
if(nships <= 0) {
ships = malloc(sizeof(char*));
ships[0] = strdup("None");
nships = 1;
}
window_addList(secondary_wid, 20, 40, window_addList(secondary_wid, 20, 40,
200, SHIPYARD_HEIGHT-80, "lstShipyard", 200, SHIPYARD_HEIGHT-80, "lstShipyard",
ships, nships, 0, shipyard_update); ships, nships, 0, shipyard_update);
@ -593,6 +600,23 @@ static void shipyard_update(char* str) {
char buf[80], buf2[16], buf3[16]; char buf[80], buf2[16], buf3[16];
shipname = toolkit_getList(secondary_wid, "lstShipyard"); shipname = toolkit_getList(secondary_wid, "lstShipyard");
/* No ships. */
if(strcmp(shipname, "None")==0) {
window_modifyImage(secondary_wid, "imgTarget", NULL);
window_disableButton(secondary_wid, "btnBuyShip");
window_disableButton(secondary_wid, "btnInfoShip");
snprintf(buf, 80,
"None\n"
"NA\n"
"NA\n"
"\n"
"NA\n"
"NA\n");
window_modifyText(secondary_wid, "txtDDesc", buf);
return;
}
ship = ship_get(shipname); ship = ship_get(shipname);
if(player_nships()==0) window_disableButton(secondary_wid, "btnYourShips"); if(player_nships()==0) window_disableButton(secondary_wid, "btnYourShips");