cpp/openttd-patchpack/source Changeset - r1295:3a780f54853b

Changeset - r1295:3a780f54853b

Parent rev.

Child rev.

[Not reviewed]

master

0 4 0

celestar - 20 years ago 2005-02-05 12:10:09
celestar@openttd.org

(svn r1799) -Codechange: [ Multistop ] Added debug class "ms" and more debugging
output for multistops

4 files changed with 13 insertions and 5 deletions:

roadveh_cmd.c

station_cmd.c

ttd.c

variables.h

0 comments (0 inline, 0 general)

roadveh_cmd.c

➞

Show inline comments

@@ @@ -1206,6 +1206,7 @@ static const byte _roadveh_data_2[4] = { @@
 static inline void ClearSlot(Vehicle *v, RoadStop *rs)
+{
 	DEBUG(ms, 3) ("Multistop: Clearing slot %d at 0x%x", v->u.road.slotindex, rs->xy);
 	v->u.road.slot = NULL;
 	v->u.road.slot_age = 0;
 	rs->slot[v->u.road.slotindex] = INVALID_SLOT;
@@ @@ -1513,7 +1514,7 @@ again: @@
 			//we have arrived at the wrong station
 			//XXX The question is .. what to do? Actually we shouldn't be here
 			//but I guess we need to clear the slot
- 			DEBUG(misc, 1) ("Multistop: Wrong station, force a slot clearing. Vehicle %d at 0x%x, should go to 0x%x of station %d (%x), destination 0x%x", v->unitnumber, v->tile, v->u.road.slot->xy, st->index, st->xy, v->dest_tile);
+ 			DEBUG(ms, 1) ("Multistop: Wrong station, force a slot clearing. Vehicle %d at 0x%x, should go to 0x%x of station %d (%x), destination 0x%x", v->unitnumber, v->tile, v->u.road.slot->xy, st->index, st->xy, v->dest_tile);
 			ClearSlot(v, v->u.road.slot);
+		}
@@ @@ -1696,6 +1697,7 @@ void OnNewDay_RoadVeh(Vehicle *v) @@
 			if ( rs == NULL )
 				goto no_stop;
 			DEBUG(ms, 2) ("Multistop: Attempting to obtain a slot for vehicle %d at station %d (0x%x)", v->unitnumber, st->index, st->xy);
 			do {
 				stop->dist = 0xFFFFFFFF;
@@ @@ -1703,6 +1705,7 @@ void OnNewDay_RoadVeh(Vehicle *v) @@
 				//to one tile BEFORE the stop in question and doesn't
 				//regard the direction of the exit
 				stop->dist = RoadFindPathToStation(v, rs->xy);
 				DEBUG(ms, 3) ("Multistop: Distance to stop at 0x%x is %d", rs->xy, stop->dist);
 				stop->rs = rs;
 				if (stop->dist < mindist) {
@@ @@ -1724,6 +1727,7 @@ void OnNewDay_RoadVeh(Vehicle *v) @@
 						if ((stop->rs->slot[i] == INVALID_SLOT) && (stop->dist < 120)) {
 							//Hooray we found a free slot. Assign it
 							DEBUG(ms, 1) ("Multistop: Slot %d at 0x%x assigned to vehicle %d", i, stop->rs->xy, v->unitnumber);
 							stop->rs->slot[i] = v->index;
 							v->u.road.slot = stop->rs;
@@ @@ -1742,8 +1746,10 @@ void OnNewDay_RoadVeh(Vehicle *v) @@
 have_slot:
 		//now we couldn't assign a slot for one reason or another.
 		//so we just go to the nearest station
 		if (v->u.road.slot == NULL)
 			v->dest_tile = firststop->rs->xy;
 			if (v->u.road.slot == NULL) {
 				DEBUG(ms, 1) ("Multistop: No free slot found for vehicle %d, going to default station", v->unitnumber);
 				v->dest_tile = firststop->rs->xy;
+			}
+		}
 		free(firststop);

station_cmd.c

➞

Show inline comments

@@ @@ -2441,7 +2441,7 @@ static void StationHandleBigTick(Station @@
 					Vehicle *v = GetVehicle(rs->slot[k]);
 					if (v->u.road.slot != rs) {
-						DEBUG(misc, 1) ("Bus Slot Desync! cleaning up (Don't panic)");
+						DEBUG(ms, 0) ("Multistop: Bus Slot Desync! cleaning up (Don't panic)");
 						v->u.road.slot = NULL;
 						v->u.road.slot_age = 0;
 						rs->slot[k] = INVALID_SLOT;
@@ @@ -2457,7 +2457,7 @@ static void StationHandleBigTick(Station @@
 					Vehicle *v = GetVehicle(rs->slot[k]);
 					if (v->u.road.slot != rs) {
-						DEBUG(misc, 1) ("Truck Slot Desync! cleaning up (Don't panic)");
+						DEBUG(ms, 0) ("Multistop: Truck Slot Desync! cleaning up (Don't panic)");
 						v->u.road.slot = NULL;
 						v->u.road.slot_age = 0;
 						rs->slot[k] = INVALID_SLOT;

ttd.c

➞

Show inline comments

@@ @@ -468,6 +468,7 @@ void SetDebugString(const char *s) @@
 		else if IS_LVL("ai") p = &_debug_ai_level;
 		else if IS_LVL("net") p = &_debug_net_level;
 		else if IS_LVL("map") p = &_debug_map_level;
 		else if IS_LVL("ms") p = &_debug_ms_level;
 		else {
 			ShowInfoF("Unknown debug level '%.*s'", s-t, t);
 			return;

variables.h

➞

Show inline comments

@@ @@ -459,6 +459,7 @@ VARDEF int _debug_grf_level; @@
 VARDEF int _debug_ai_level;
 VARDEF int _debug_net_level;
 VARDEF int _debug_map_level;
 VARDEF int _debug_ms_level;
 /* Forking stuff */
 VARDEF bool _dedicated_forks;

0 comments (0 inline, 0 general)