Index: server/cityturn.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/cityturn.c,v
retrieving revision 1.223
diff -u -r1.223 cityturn.c
--- server/cityturn.c	20 Sep 2003 19:24:54 -0000	1.223
+++ server/cityturn.c	21 Sep 2003 09:13:33 -0000
@@ -144,7 +144,7 @@
 /**************************************************************************
   Hard check that the numbers of city workers/specialists add up.
 **************************************************************************/
-void sanity_check_city(struct city *pcity)
+void real_sanity_check_city(struct city *pcity, const char *file, int line)
 {
   int worker = 0;
 
@@ -154,9 +154,9 @@
     }
   } city_map_iterate_end;
   if (worker + city_specialists(pcity) != pcity->size + 1) {
-    die("%s is illegal (size%d w%d e%d t%d s%d)",
+    die("%s is illegal (size%d w%d e%d t%d s%d) in %s line %d",
         pcity->name, pcity->size, worker, pcity->ppl_elvis,
-        pcity->ppl_taxman, pcity->ppl_scientist);
+        pcity->ppl_taxman, pcity->ppl_scientist, file, line);
   }
 }
 
Index: server/cityturn.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/cityturn.h,v
retrieving revision 1.31
diff -u -r1.31 cityturn.h
--- server/cityturn.h	20 Sep 2003 19:24:54 -0000	1.31
+++ server/cityturn.h	21 Sep 2003 09:13:33 -0000
@@ -21,7 +21,8 @@
 struct unit;
 struct conn_list;
 
-void sanity_check_city(struct city *pcity);
+#define sanity_check_city(x) real_sanity_check_city(x, __FILE__, __LINE__)
+void real_sanity_check_city(struct city *pcity, const char *file, int line);
 
 void city_refresh(struct city *pcity);          /* call if city has changed */
 void global_city_refresh(struct player *pplayer); /* tax/govt changed */