roadveh_cmd.c
changeset 3630 13278b8ed023
parent 3612 ca06e611ff3b
child 3645 7f950533d510
--- a/roadveh_cmd.c	Sat Apr 22 13:42:09 2006 +0000
+++ b/roadveh_cmd.c	Sat Apr 22 13:56:16 2006 +0000
@@ -240,7 +240,7 @@
 	assert(rs->num_vehicles != 0);
 	rs->num_vehicles--;
 
-	DEBUG(ms, 3) ("Multistop: Clearing slot at 0x%x", rs->xy);
+	DEBUG(ms, 3) ("Multistop: Clearing slot at 0x%X", rs->xy);
 }
 
 /** Sell a road vehicle.
@@ -1459,10 +1459,10 @@
 			//but I guess we need to clear the slot
 			DEBUG(ms, 0) ("Multistop: Vehicle %d (index %d) arrived at wrong stop.", v->unitnumber, v->index);
 			if (v->tile != v->dest_tile) {
-				DEBUG(ms, 0) ("Multistop: -- Current tile 0x%x is not destination tile 0x%x. Route problem", v->tile, v->dest_tile);
+				DEBUG(ms, 0) ("Multistop: -- Current tile 0x%X is not destination tile 0x%X. Route problem", v->tile, v->dest_tile);
 			}
 			if (v->dest_tile != v->u.road.slot->xy) {
-				DEBUG(ms, 0) ("Multistop: -- Stop tile 0x%x is not destination tile 0x%x. Multistop desync", v->u.road.slot->xy, v->dest_tile);
+				DEBUG(ms, 0) ("Multistop: -- Stop tile 0x%X is not destination tile 0x%X. Multistop desync", v->u.road.slot->xy, v->dest_tile);
 			}
 			if (v->current_order.type != OT_GOTO_STATION) {
 				DEBUG(ms, 0) ("Multistop: -- Current order type (%d) is not OT_GOTO_STATION.", v->current_order.type);
@@ -1604,7 +1604,7 @@
 
 	//Current slot has expired
 	if (v->current_order.type == OT_GOTO_STATION && v->u.road.slot != NULL && v->u.road.slot_age-- == 0) {
-		DEBUG(ms, 2) ("Multistop: Slot expired for vehicle %d (index %d) at stop 0x%x",
+		DEBUG(ms, 2) ("Multistop: Slot expired for vehicle %d (index %d) at stop 0x%X",
 			v->unitnumber, v->index, v->u.road.slot->xy);
 		ClearSlot(v);
 	}
@@ -1624,18 +1624,18 @@
 				uint dist, badness;
 				uint minbadness = UINT_MAX;
 
-				DEBUG(ms, 2) ("Multistop: Attempting to obtain a slot for vehicle %d (index %d) at station %d (0x%x)", v->unitnumber,
+				DEBUG(ms, 2) ("Multistop: Attempting to obtain a slot for vehicle %d (index %d) at station %d (0x%X)", v->unitnumber,
 						v->index, st->index, st->xy);
 				/* Now we find the nearest road stop that has a free slot */
 				for (; rs != NULL; rs = rs->next) {
 					dist = RoadFindPathToStop(v, rs->xy);
 					if (dist == UINT_MAX) {
-						DEBUG(ms, 4) (" ---- stop 0x%x is not reachable, not treating further", rs->xy);
+						DEBUG(ms, 4) (" ---- stop 0x%X is not reachable, not treating further", rs->xy);
 						continue;
 					}
 					badness = (rs->num_vehicles + 1) * (rs->num_vehicles + 1) + dist / NPF_TILE_LENGTH;
 
-					DEBUG(ms, 4) (" ---- stop 0x%x has %d vehicle%s waiting", rs->xy, rs->num_vehicles, rs->num_vehicles == 1 ? "":"s");
+					DEBUG(ms, 4) (" ---- stop 0x%X has %d vehicle%s waiting", rs->xy, rs->num_vehicles, rs->num_vehicles == 1 ? "":"s");
 					DEBUG(ms, 4) (" ---- Distance is %u", dist);
 					DEBUG(ms, 4) (" -- Badness %u", badness);
 
@@ -1647,7 +1647,7 @@
 
 				if (best != NULL) {
 					best->num_vehicles++;
-					DEBUG(ms, 3) (" -- Assigned to stop 0x%x", best->xy);
+					DEBUG(ms, 3) (" -- Assigned to stop 0x%X", best->xy);
 
 					v->u.road.slot = best;
 					v->dest_tile = best->xy;
@@ -1656,11 +1656,11 @@
 					DEBUG(ms, 3) (" -- Could not find a suitable stop");
 				}
 			} else {
-				DEBUG(ms, 5) ("Multistop: --- Distance from station too far. Postponing slotting for vehicle %d (index %d) at station %d, (0x%x)",
+				DEBUG(ms, 5) ("Multistop: --- Distance from station too far. Postponing slotting for vehicle %d (index %d) at station %d, (0x%X)",
 						v->unitnumber, v->index, st->index, st->xy);
 			}
 		} else {
-			DEBUG(ms, 4) ("Multistop: No road stop for vehicle %d (index %d) at station %d (0x%x)",
+			DEBUG(ms, 4) ("Multistop: No road stop for vehicle %d (index %d) at station %d (0x%X)",
 					v->unitnumber, v->index, st->index, st->xy);
 		}
 	}