Mercurial Mercurial > openttd-ottdgrfs / comparison
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
src/aircraft_gui.cpp
branchcpp_gui
changeset 6285 187e3ef04cc9
parent 6268 4b5241e5dd10
child 6307 f40e88cff863
equal deleted inserted replaced
6284:45d0233e7d79 6285:187e3ef04cc9 
    82 			DrawString(2, 15, STR_A00D_AGE_RUNNING_COST_YR, 0);
 
    82 			DrawString(2, 15, STR_A00D_AGE_RUNNING_COST_YR, 0);
 
    83 		}
 
    83 		}
 
    84 
    84 
    85 		/* Draw max speed */
 
    85 		/* Draw max speed */
 
    86 		{
 
    86 		{
 
    87 			SetDParam(0, v->max_speed * 128 / 10);
 
    87 			SetDParam(0, v->max_speed * 10 / 16);
 
    88 			DrawString(2, 25, STR_A00E_MAX_SPEED, 0);
 
    88 			DrawString(2, 25, STR_A00E_MAX_SPEED, 0);
 
    89 		}
 
    89 		}
 
    90 
    90 
    91 		/* Draw profit */
 
    91 		/* Draw profit */
 
    92 		{
 
    92 		{
 
   104 
   104 
   105 		/* Draw service interval text */
 
   105 		/* Draw service interval text */
 
   106 		{
 
   106 		{
 
   107 			SetDParam(0, v->service_interval);
 
   107 			SetDParam(0, v->service_interval);
 
   108 			SetDParam(1, v->date_of_last_service);
 
   108 			SetDParam(1, v->date_of_last_service);
 
   109 			DrawString(13, 103, _patches.servint_ispercent?STR_SERVICING_INTERVAL_PERCENT:STR_883C_SERVICING_INTERVAL_DAYS, 0);
 
   109 			DrawString(13, 115, _patches.servint_ispercent?STR_SERVICING_INTERVAL_PERCENT:STR_883C_SERVICING_INTERVAL_DAYS, 0);
 
       
   110 		}
 
       
   111 
       
   112 		/* Draw Transfer credits text */
 
       
   113 		{
 
       
   114 			SetDParam(0, v->cargo_feeder_share);
 
       
   115 			DrawString(60, 101, STR_FEEDER_CARGO_VALUE, 0);
 
   110 		}
 
   116 		}
 
   111 
   117 
   112 		DrawAircraftImage(v, 3, 57, INVALID_VEHICLE);
 
   118 		DrawAircraftImage(v, 3, 57, INVALID_VEHICLE);
 
   113 
   119 
   114 		{
 
   120 		{
 
   185 static const OldWidget _aircraft_details_widgets[] = {
 
   191 static const OldWidget _aircraft_details_widgets[] = {
 
   186 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,         STR_018B_CLOSE_WINDOW },
 
   192 {   WWT_CLOSEBOX,   RESIZE_NONE,    14,     0,    10,     0,    13, STR_00C5,         STR_018B_CLOSE_WINDOW },
 
   187 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   349,     0,    13, STR_A00C_DETAILS, STR_018C_WINDOW_TITLE_DRAG_THIS },
 
   193 {    WWT_CAPTION,   RESIZE_NONE,    14,    11,   349,     0,    13, STR_A00C_DETAILS, STR_018C_WINDOW_TITLE_DRAG_THIS },
 
   188 { WWT_PUSHTXTBTN,   RESIZE_NONE,    14,   350,   389,     0,    13, STR_01AA_NAME,    STR_A032_NAME_AIRCRAFT },
 
   194 { WWT_PUSHTXTBTN,   RESIZE_NONE,    14,   350,   389,     0,    13, STR_01AA_NAME,    STR_A032_NAME_AIRCRAFT },
 
   189 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   389,    14,    55, 0x0,              STR_NULL },
 
   195 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   389,    14,    55, 0x0,              STR_NULL },
 
   190 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   389,    56,   101, 0x0,              STR_NULL },
 
   196 {      WWT_PANEL,   RESIZE_NONE,    14,     0,   389,    56,   113, 0x0,              STR_NULL },
 
   191 { WWT_PUSHTXTBTN,   RESIZE_NONE,    14,     0,    10,   102,   107, STR_0188,         STR_884D_INCREASE_SERVICING_INTERVAL },
 
   197 { WWT_PUSHTXTBTN,   RESIZE_NONE,    14,     0,    10,   114,   119, STR_0188,         STR_884D_INCREASE_SERVICING_INTERVAL },
 
   192 { WWT_PUSHTXTBTN,   RESIZE_NONE,    14,     0,    10,   108,   113, STR_0189,         STR_884E_DECREASE_SERVICING_INTERVAL },
 
   198 { WWT_PUSHTXTBTN,   RESIZE_NONE,    14,     0,    10,   120,   125, STR_0189,         STR_884E_DECREASE_SERVICING_INTERVAL },
 
   193 {      WWT_PANEL,   RESIZE_NONE,    14,    11,   389,   102,   113, 0x0,              STR_NULL },
 
   199 {      WWT_PANEL,   RESIZE_NONE,    14,    11,   389,   114,   125, 0x0,              STR_NULL },
 
   194 {   WIDGETS_END},
 
   200 {   WIDGETS_END},
 
   195 };
 
   201 };
 
   196 
   202 
   197 static const WindowDesc _aircraft_details_desc = {
 
   203 static const WindowDesc _aircraft_details_desc = {
 
   198 	WDP_AUTO, WDP_AUTO, 390, 114,
 
   204 	WDP_AUTO, WDP_AUTO, 390, 126,
 
   199 	WC_VEHICLE_DETAILS, WC_VEHICLE_VIEW,
 
   205 	WC_VEHICLE_DETAILS, WC_VEHICLE_VIEW,
 
   200 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
 
   206 	WDF_STD_TOOLTIPS | WDF_STD_BTN | WDF_DEF_WIDGET | WDF_UNCLICK_BUTTONS,
 
   201 	_aircraft_details_widgets,
 
   207 	_aircraft_details_widgets,
 
   202 	AircraftDetailsWndProc
 
   208 	AircraftDetailsWndProc
 
   203 };
 
   209 };
 
   261 			str = STR_8861_STOPPED;
 
   267 			str = STR_8861_STOPPED;
 
   262 		} else {
 
   268 		} else {
 
   263 			switch (v->current_order.type) {
 
   269 			switch (v->current_order.type) {
 
   264 			case OT_GOTO_STATION: {
 
   270 			case OT_GOTO_STATION: {
 
   265 				SetDParam(0, v->current_order.dest);
 
   271 				SetDParam(0, v->current_order.dest);
 
   266 				SetDParam(1, v->cur_speed * 8);
 
   272 				SetDParam(1, v->cur_speed * 10 / 16);
 
   267 				str = STR_HEADING_FOR_STATION + _patches.vehicle_speed;
 
   273 				str = STR_HEADING_FOR_STATION + _patches.vehicle_speed;
 
   268 			} break;
 
   274 			} break;
 
   269 
   275 
   270 			case OT_GOTO_DEPOT: {
 
   276 			case OT_GOTO_DEPOT: {
 
   271 				/* Aircrafts always go to a station, even if you say depot */
 
   277 				/* Aircrafts always go to a station, even if you say depot */
 
   272 				SetDParam(0, v->current_order.dest);
 
   278 				SetDParam(0, v->current_order.dest);
 
   273 				SetDParam(1, v->cur_speed * 8);
 
   279 				SetDParam(1, v->cur_speed * 10 / 16);
 
   274 				if (HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT) && !HASBIT(v->current_order.flags, OFB_PART_OF_ORDERS)) {
 
   280 				if (HASBIT(v->current_order.flags, OFB_HALT_IN_DEPOT) && !HASBIT(v->current_order.flags, OFB_PART_OF_ORDERS)) {
 
   275 					str = STR_HEADING_FOR_HANGAR + _patches.vehicle_speed;
 
   281 					str = STR_HEADING_FOR_HANGAR + _patches.vehicle_speed;
 
   276 				} else {
 
   282 				} else {
 
   277 					str = STR_HEADING_FOR_HANGAR_SERVICE + _patches.vehicle_speed;
 
   283 					str = STR_HEADING_FOR_HANGAR_SERVICE + _patches.vehicle_speed;
 
   278 				}
 
   284 				}
 
   283 				break;
 
   289 				break;
 
   284 
   290 
   285 			default:
 
   291 			default:
 
   286 				if (v->num_orders == 0) {
 
   292 				if (v->num_orders == 0) {
 
   287 					str = STR_NO_ORDERS + _patches.vehicle_speed;
 
   293 					str = STR_NO_ORDERS + _patches.vehicle_speed;
 
   288 					SetDParam(0, v->cur_speed * 8);
 
   294 					SetDParam(0, v->cur_speed * 10 / 16);
 
   289 				} else {
 
   295 				} else {
 
   290 					str = STR_EMPTY;
 
   296 					str = STR_EMPTY;
 
   291 				}
 
   297 				}
 
   292 				break;
 
   298 				break;
 
   293 			}
 
   299 			}
openttd-ottdgrfs