--- a/src/waypoint.cpp	Wed Feb 06 23:08:49 2008 +0000
+++ b/src/waypoint.cpp	Thu Feb 07 01:56:39 2008 +0000
@@ -197,7 +197,7 @@
 
 		wp_auto_delete = wp;
 
-		wp->town_index = 0;
+		wp->town_index = INVALID_TOWN;
 		wp->name = NULL;
 		wp->town_cn = 0;
 	} else if (flags & DC_EXEC) {
@@ -241,7 +241,7 @@
 		wp->deleted = 0;
 		wp->build_date = _date;
 
-		if (wp->town_index == 0) MakeDefaultWaypointName(wp);
+		if (wp->town_index == INVALID_TOWN) MakeDefaultWaypointName(wp);
 
 		UpdateWaypointSign(wp);
 		RedrawWaypointSign(wp);