src/newgrf_gui.cpp
changeset 5638 ee1871005c80
parent 5635 9464b3edb2ea
child 5643 b373887faf8b
equal deleted inserted replaced
5637:aa922e570f9a 5638:ee1871005c80
    73 	/* Show flags */
    73 	/* Show flags */
    74 	if (HASBIT(c->flags, GCF_NOT_FOUND)) y += DrawStringMultiLine(x, y, STR_NEWGRF_NOT_FOUND, w);
    74 	if (HASBIT(c->flags, GCF_NOT_FOUND)) y += DrawStringMultiLine(x, y, STR_NEWGRF_NOT_FOUND, w);
    75 	if (HASBIT(c->flags, GCF_DISABLED))  y += DrawStringMultiLine(x, y, STR_NEWGRF_DISABLED, w);
    75 	if (HASBIT(c->flags, GCF_DISABLED))  y += DrawStringMultiLine(x, y, STR_NEWGRF_DISABLED, w);
    76 
    76 
    77 	/* Draw GRF info if it exists */
    77 	/* Draw GRF info if it exists */
    78 	if (c->info != NULL && strlen(c->info) != 0) {
    78 	if (c->info != NULL && !StrEmpty(c->info)) {
    79 		SetDParamStr(0, c->info);
    79 		SetDParamStr(0, c->info);
    80 		y += DrawStringMultiLine(x, y, STR_02BD, w);
    80 		y += DrawStringMultiLine(x, y, STR_02BD, w);
    81 	} else {
    81 	} else {
    82 		y += DrawStringMultiLine(x, y, STR_NEWGRF_NO_INFO, w);
    82 		y += DrawStringMultiLine(x, y, STR_NEWGRF_NO_INFO, w);
    83 	}
    83 	}
   114 			y = w->widget[3].top + 1;
   114 			y = w->widget[3].top + 1;
   115 
   115 
   116 			for (c = _all_grfs; c != NULL; c = c->next) {
   116 			for (c = _all_grfs; c != NULL; c = c->next) {
   117 				if (n >= w->vscroll.pos && n < w->vscroll.pos + w->vscroll.cap) {
   117 				if (n >= w->vscroll.pos && n < w->vscroll.pos + w->vscroll.cap) {
   118 					bool h = c == WP(w, newgrf_add_d).sel;
   118 					bool h = c == WP(w, newgrf_add_d).sel;
   119 					const char *text = (c->name != NULL && strlen(c->name) != 0) ? c->name : c->filename;
   119 					const char *text = (c->name != NULL && !StrEmpty(c->name)) ? c->name : c->filename;
   120 
   120 
   121 					/* Draw selection background */
   121 					/* Draw selection background */
   122 					if (h) GfxFillRect(3, y, w->width - 15, y + 9, 156);
   122 					if (h) GfxFillRect(3, y, w->width - 15, y + 9, 156);
   123 					DoDrawStringTruncated(text, 4, y, h ? 0xC : 0x6, w->width - 18);
   123 					DoDrawStringTruncated(text, 4, y, h ? 0xC : 0x6, w->width - 18);
   124 					y += 10;
   124 					y += 10;
   308 
   308 
   309 			/* Draw NewGRF list */
   309 			/* Draw NewGRF list */
   310 			y = w->widget[SNGRFS_FILE_LIST].top;
   310 			y = w->widget[SNGRFS_FILE_LIST].top;
   311 			for (c = *WP(w, newgrf_d).list, i = 0; c != NULL; c = c->next, i++) {
   311 			for (c = *WP(w, newgrf_d).list, i = 0; c != NULL; c = c->next, i++) {
   312 				if (i >= w->vscroll.pos && i < w->vscroll.pos + w->vscroll.cap) {
   312 				if (i >= w->vscroll.pos && i < w->vscroll.pos + w->vscroll.cap) {
   313 					const char *text = (c->name != NULL && strlen(c->name) != 0) ? c->name : c->filename;
   313 					const char *text = (c->name != NULL && !StrEmpty(c->name)) ? c->name : c->filename;
   314 					PalSpriteID pal;
   314 					PalSpriteID pal;
   315 
   315 
   316 					/* Pick a colour */
   316 					/* Pick a colour */
   317 					if (HASBIT(c->flags, GCF_NOT_FOUND) || HASBIT(c->flags, GCF_DISABLED)) {
   317 					if (HASBIT(c->flags, GCF_NOT_FOUND) || HASBIT(c->flags, GCF_DISABLED)) {
   318 						pal = PALETTE_TO_RED;
   318 						pal = PALETTE_TO_RED;