openttd-mini: comparison aircraft

equal deleted inserted replaced

-:614bba52258d
+:0a7025304867
 		// the AI doesn't click on a tile to build airplanes, so the below code will
 		// never work. Therefore just assume the AI's planes always come from Hangar0
 		// On hold for NewAI
 		v->u.air.pos = (!_patches.ainew_active && _is_ai_player) ? 0:MAX_ELEMENTS;
 		/* When we click on hangar we know the tile (it is in var 'tile')it is on. By that we know
 			its position in the array of depots the airport has.....we can search
 			->layout for #th position of depot. Since layout must start with depots, it is simple
 		*/
 		{
 			Station *st;
 			const AirportFTAClass *Airport;
 	if ((v->next_order & (OT_MASK | OF_FULL_LOAD)) == (OT_GOTO_DEPOT | OF_FULL_LOAD))
 		return;
 	if (_patches.gotodepot && ScheduleHasDepotOrders(v->schedule_ptr))
 		return;
 	st = DEREF_STATION(v->next_order_param);
 	// only goto depot if the target airport has terminals (eg. it is airport)
 	if (st->xy != 0 && st->airport_tile != 0 && GetAirport(st->airport_type)->nofterminals != 0) {
 //		printf("targetairport = %d, st->index = %d\n", v->u.air.targetairport, st->index);
 //		v->u.air.targetairport = st->index;
 	u = v->next->next;
 	if (u->vehstatus & VS_HIDDEN)
 		return;
 	// if true, helicopter rotors do not rotate. This should only be the case if a helicopter is
 	// loading/unloading at a terminal or stopped
 	if ((v->next_order&OT_MASK) == OT_LOADING || (v->vehstatus&VS_STOPPED)) {
 		if (u->cur_speed != 0) {
 			u->cur_speed++;
 			if (u->cur_speed >= 0x80 && u->cur_image == 0xF40) {
 	uint spd = v->acceleration * 2;
 	byte t;
 	v->subspeed = (t=v->subspeed) + (byte)spd;
 	spd = min( v->cur_speed + (spd >> 8) + (v->subspeed < t), v->max_speed);
 	// adjust speed for broken vehicles
 	if(v->vehstatus&VS_AIRCRAFT_BROKEN) spd = min(spd, 27);
 	//updates statusbar only if speed have changed to save CPU time
 	if (spd != v->cur_speed) {
 		if (v->cur_speed > 12)
 			v->cur_speed = 12;
 		// Change direction smoothly to final direction.
 		dirdiff = amd->direction - v->direction;
 		// if distance is 0, and plane points in right direction, no point in calling
 		// UpdateAircraftSpeed(). So do it only afterwards
 		if (dirdiff == 0) {
 			v->cur_speed = 0;
 			return true;
 		}
 	// OT_GOTO_DEPOT, OT_LOADING
 	if ((v->next_order & OT_MASK) >= OT_GOTO_DEPOT && (v->next_order & OT_MASK) <= OT_LOADING) {
 		if ((v->next_order & (OT_MASK|OF_UNLOAD)) != (OT_GOTO_DEPOT|OF_UNLOAD))
 			return;
 	}
 	if ((v->next_order & (OT_MASK|OF_UNLOAD|OF_FULL_LOAD)) == (OT_GOTO_DEPOT|OF_UNLOAD|OF_FULL_LOAD) &&
 			SERVICE_INTERVAL) {
 		v->cur_order_index++;
 	}
 static void AircraftEnterHangar(Vehicle *v)
 {
 	byte old_order;
 	ServiceAircraft(v);
 	MaybeRenewVehicle(v, EstimateAircraftCost(v->engine_type));
 	if ((v->next_order & OT_MASK) == OT_GOTO_DEPOT) {
 		InvalidateWindow(WC_VEHICLE_VIEW, v->index);
 		old_order = v->next_order;
 		v->next_order = OT_NOTHING;
 			if (old_order & OF_UNLOAD) { v->cur_order_index++; }
 			else if (old_order & OF_FULL_LOAD) { // force depot visit
 			v->vehstatus |= VS_STOPPED;
 			if (v->owner == _local_player) {
 				SET_DPARAM16(0, v->unitnumber);
 		}
 	}
 	return false;
 }
 static bool AirportFindFreeTerminal(Vehicle *v, const AirportFTAClass *Airport)
 {
 	byte nofterminalspergroup, i;
 	AirportFTA *temp;
 	Station *st;
 	/* example of more terminalgroups
 		{0,HANGAR,NOTHING_block,1}, {0,255,TERM_GROUP1_block,0}, {0,255,TERM_GROUP2_ENTER_block,1}, {0,0,N,1},
 		Heading 255 denotes a group. We see 2 groups here:
 		1. group 0 -- TERM_GROUP1_block (check block)
 		2. group 1 -- TERM_GROUP2_ENTER_block (check block)
 		First in line is checked first, group 0. If the block (TERM_GROUP1_block) is free, it
 		looks	at the corresponding terminals of that group. If no free ones are found, other
 		possible groups are checked	(in this case group 1, since that is after group 0). If that
 		fails, then attempt fails and plane waits
 	*/
 	if (Airport->nofterminalgroups > 1) {
 		st = DEREF_STATION(v->u.air.targetairport);
 		nofterminalspergroup = Airport->nofterminals / Airport->nofterminalgroups;
 	// if there is only 1 terminalgroup, all terminals are checked (starting from 0 to max)
 	return FreeTerminal(v, 0, Airport->nofterminals);
 }
 static bool AirportFindFreeHelipad(Vehicle *v, const AirportFTAClass *Airport)
 {
 Station *st;
 byte nofhelipadspergroup,  i;
 AirportFTA *temp;
 			v_oldstyle->vehstatus &= ~VS_STOPPED; // make airplane moving
 			v_oldstyle->u.air.state = FLYING;
 			AircraftNextAirportPos_and_Order(v_oldstyle); // move it to the entry point of the airport
 			GetNewVehiclePos(v_oldstyle, &gp); // get the position of the plane (to be used for setting)
 			v_oldstyle->tile = 0; // aircraft in air is tile=0
 			// correct speed of helicopter-rotors
 			if (v_oldstyle->subtype == 0) {v_oldstyle->next->next->cur_speed = 32;}
 			// set new position x,y,z
 			SetAircraftPosition(v_oldstyle, gp.x, gp.y, GetAircraftFlyingAltitude(v_oldstyle));
 		}
 	}
 }
 void UpdateAirplanesOnNewStation(Station *st)
 {
 	GetNewVehiclePosResult gp;
 	Vehicle *v;
 	byte takeofftype;
 	uint16 cnt;

changeset 193	0a7025304867
parent 164	0cbdf3c9bde1
child 337	cbe0c766c947