openttd-ottdgrfs: comparison src/ai/default/default.cpp

equal deleted inserted replaced

-:70d78ac95d6c
+:7bd07f43b0e3
 	index = (p->ai.cur_veh == NULL) ? 0 : p->ai.cur_veh->index + 1;
 	FOR_ALL_VEHICLES_FROM(v, index) {
 		if (v->owner != _current_player) continue;
-		if ((v->type == VEH_Train && v->subtype == 0) ||
+		if ((v->type == VEH_TRAIN && v->subtype == 0) ||
-				v->type == VEH_Road ||
+				v->type == VEH_ROAD ||
-				(v->type == VEH_Aircraft && IsNormalAircraft(v)) ||
+				(v->type == VEH_AIRCRAFT && IsNormalAircraft(v)) ||
-				v->type == VEH_Ship) {
+				v->type == VEH_SHIP) {
 			/* replace engine? */
-			if (v->type == VEH_Train && v->engine_type < 3 &&
+			if (v->type == VEH_TRAIN && v->engine_type < 3 &&
 					(_price.build_railvehicle >> 3) < p->player_money) {
 				p->ai.state = AIS_VEH_CHECK_REPLACE_VEHICLE;
 				p->ai.cur_veh = v;
 				return;
 			}
 {
 	const Vehicle* v = p->ai.cur_veh;
 	if (!IsValidVehicle(v) ||
 			v->owner != _current_player ||
-			v->type > VEH_Ship ||
+			v->type > VEH_SHIP ||
-			_veh_check_replace_proc[v->type - VEH_Train](p, v) == INVALID_ENGINE) {
+			_veh_check_replace_proc[v->type - VEH_TRAIN](p, v) == INVALID_ENGINE) {
 		p->ai.state = AIS_VEH_LOOP;
 	} else {
 		p->ai.state_counter = 0;
 		p->ai.state = AIS_VEH_DO_REPLACE_VEHICLE;
 	}
 	const Vehicle* v = p->ai.cur_veh;
 	p->ai.state = AIS_VEH_LOOP;
 	// vehicle is not owned by the player anymore, something went very wrong.
 	if (!IsValidVehicle(v) || v->owner != _current_player) return;
-	_veh_do_replace_proc[v->type - VEH_Train](p);
+	_veh_do_replace_proc[v->type - VEH_TRAIN](p);
 }
-typedef struct FoundRoute {
+struct FoundRoute {
 	int distance;
 	CargoID cargo;
 	void *from;
 	void *to;
-} FoundRoute;
+};
-static Town *AiFindRandomTown(void)
+static Town *AiFindRandomTown()
 {
 	return GetRandomTown();
 }
-static Industry *AiFindRandomIndustry(void)
+static Industry *AiFindRandomIndustry()
 {
-	return GetRandomIndustry();
+	int num = RandomRange(GetMaxIndustryIndex());
+	if (IsValidIndustry(GetIndustry(num))) return GetIndustry(num);
+	return NULL;
 }
 static void AiFindSubsidyIndustryRoute(FoundRoute *fr)
 {
 	uint i;
 	while (p->mode != 3 || !((--cmd) & 0x80)) p++;
 	return tile + ToTileIndexDiff(p->tileoffs) - TileOffsByDiagDir(*dir = p->attr);
 }
-typedef struct AiRailPathFindData {
+struct AiRailPathFindData {
 	TileIndex tile;
 	TileIndex tile2;
 	int count;
 	bool flag;
-} AiRailPathFindData;
+};
 static bool AiEnumFollowTrack(TileIndex tile, AiRailPathFindData *a, int track, uint length, byte *state)
 {
 	if (a->flag) return true;
 	FollowTrack(p->ai.cur_tile_a + TileOffsByDiagDir(p->ai.cur_dir_a), 0x2000 | TRANSPORT_RAIL, (DiagDirection)(p->ai.cur_dir_a^2),
 		(TPFEnumProc*)AiEnumFollowTrack, NULL, &arpfd);
 	return arpfd.count > 8;
 }
-typedef struct AiRailFinder {
+struct AiRailFinder {
 	TileIndex final_tile;
 	byte final_dir;
 	byte depth;
 	byte recursive_mode;
 	byte cur_best_dir;
 	const byte *best_ptr;
 	uint best_dist;
 	TileIndex cur_best_tile, best_tile;
 	TileIndex bridge_end_tile;
 	Player *player;
-} AiRailFinder;
+};
 static const byte _ai_table_15[4][8] = {
 	{0, 0, 4, 3, 3, 1, 128 + 0, 64},
 	{1, 1, 2, 0, 4, 2, 128 + 1, 65},
 	{0, 2, 2, 3, 5, 1, 128 + 2, 66},
 	// yep, all are done. switch state to the rail building state.
 	p->ai.state = AIS_BUILD_ROAD;
 	p->ai.state_mode = 255;
 }
-typedef struct {
+struct AiRoadFinder {
 	TileIndex final_tile;
 	byte final_dir;
 	byte depth;
 	byte recursive_mode;
 	byte cur_best_dir;
 	const byte *best_ptr;
 	uint best_dist;
 	TileIndex cur_best_tile, best_tile;
 	TileIndex bridge_end_tile;
 	Player *player;
-} AiRoadFinder;
+};
-typedef struct AiRoadEnum {
+struct AiRoadEnum {
 	TileIndex dest;
 	TileIndex best_tile;
 	int best_track;
 	uint best_dist;
-} AiRoadEnum;
+};
 static const byte _dir_by_track[] = {
 	0, 1, 0, 1, 2, 1,
 	0, 0,
 	2, 3, 3, 2, 3, 0,
 static void AiStateSellVeh(Player *p)
 {
 	Vehicle *v = p->ai.cur_veh;
 	if (v->owner == _current_player) {
-		if (v->type == VEH_Train) {
+		if (v->type == VEH_TRAIN) {
 			if (!IsTileDepotType(v->tile, TRANSPORT_RAIL) || v->u.rail.track != 0x80 || !(v->vehstatus&VS_STOPPED)) {
 				if (v->current_order.type != OT_GOTO_DEPOT)
 					DoCommand(0, v->index, 0, DC_EXEC, CMD_SEND_TRAIN_TO_DEPOT);
 				goto going_to_depot;
 			}
 			// Sell whole train
 			DoCommand(v->tile, v->index, 1, DC_EXEC, CMD_SELL_RAIL_WAGON);
-		} else if (v->type == VEH_Road) {
+		} else if (v->type == VEH_ROAD) {
 			if (!IsRoadVehInDepotStopped(v)) {
 				if (v->current_order.type != OT_GOTO_DEPOT)
 					DoCommand(0, v->index, 0, DC_EXEC, CMD_SEND_ROADVEH_TO_DEPOT);
 				goto going_to_depot;
 			}
 			DoCommand(0, v->index, 0, DC_EXEC, CMD_SELL_ROAD_VEH);
-		} else if (v->type == VEH_Aircraft) {
+		} else if (v->type == VEH_AIRCRAFT) {
 			if (!IsAircraftInHangarStopped(v)) {
 				if (v->current_order.type != OT_GOTO_DEPOT)
 					DoCommand(0, v->index, 0, DC_EXEC, CMD_SEND_AIRCRAFT_TO_HANGAR);
 				goto going_to_depot;
 			}
 			DoCommand(0, v->index, 0, DC_EXEC, CMD_SELL_AIRCRAFT);
-			} else if (v->type == VEH_Ship) {
+			} else if (v->type == VEH_SHIP) {
 			// XXX: not implemented
-			error("!v->type == VEH_Ship");
+			error("!v->type == VEH_SHIP");
 		}
 	}
 	goto return_to_loop;
 going_to_depot:;

branch	gamebalance
changeset 9895	7bd07f43b0e3
parent 6432	8fb778a7f2d7
child 9903	dc85aaa556ae