1191 w -= 3; |
1191 w -= 3; |
1192 } |
1192 } |
1193 |
1193 |
1194 /* Draw the rectangle if 'tranparent station signs' is off, |
1194 /* Draw the rectangle if 'tranparent station signs' is off, |
1195 * or if we are drawing a general text sign (STR_2806) */ |
1195 * or if we are drawing a general text sign (STR_2806) */ |
1196 if (!(_display_opt & DO_TRANS_SIGNS) || ss->string == STR_2806) |
1196 if (!HASBIT(_transparent_opt, TO_SIGNS) || ss->string == STR_2806) { |
1197 DrawFrameRect( |
1197 DrawFrameRect( |
1198 x, y, x + w, bottom, ss->color, |
1198 x, y, x + w, bottom, ss->color, |
1199 (_display_opt & DO_TRANS_BUILDINGS) ? FR_TRANSPARENT : FR_NONE |
1199 HASBIT(_transparent_opt, TO_SIGNS) ? FR_TRANSPARENT : FR_NONE |
1200 ); |
1200 ); |
|
1201 } |
1201 } |
1202 } |
1202 |
1203 |
1203 SetDParam(0, ss->params[0]); |
1204 SetDParam(0, ss->params[0]); |
1204 SetDParam(1, ss->params[1]); |
1205 SetDParam(1, ss->params[1]); |
1205 /* if we didn't draw a rectangle, or if transparant building is on, |
1206 /* if we didn't draw a rectangle, or if transparant building is on, |
1206 * draw the text in the color the rectangle would have */ |
1207 * draw the text in the color the rectangle would have */ |
1207 if (( |
1208 if (( |
1208 (_display_opt & DO_TRANS_BUILDINGS) || |
1209 HASBIT(_transparent_opt, TO_BUILDINGS) || |
1209 (_display_opt & DO_TRANS_SIGNS && ss->string != STR_2806) |
1210 (HASBIT(_transparent_opt, TO_SIGNS) && ss->string != STR_2806) |
1210 ) && ss->width != 0) { |
1211 ) && ss->width != 0) { |
1211 /* Real colors need the IS_PALETTE_COLOR flag |
1212 /* Real colors need the IS_PALETTE_COLOR flag |
1212 * otherwise colors from _string_colormap are assumed. */ |
1213 * otherwise colors from _string_colormap are assumed. */ |
1213 colour = _colour_gradient[ss->color][6] | IS_PALETTE_COLOR; |
1214 colour = _colour_gradient[ss->color][6] | IS_PALETTE_COLOR; |
1214 } else { |
1215 } else { |