Complete.Org: Mailing Lists: Archives: freeciv-dev: September 2003:
[Freeciv-Dev] (PR#6262) remove the cma assert
Home

[Freeciv-Dev] (PR#6262) remove the cma assert

[Top] [All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: undisclosed-recipients: ;
Subject: [Freeciv-Dev] (PR#6262) remove the cma assert
From: "Per I. Mathisen" <per@xxxxxxxxxxx>
Date: Tue, 23 Sep 2003 22:22:32 -0700
Reply-to: rt@xxxxxxxxxxxxxx

This patch removes the infamous CMA assert and replaces it with an
informative error freelog.

Any care to guess what caused the latest CMA bug? I get this one often
now.

  - Per

Index: client/agents/cma_core.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/client/agents/cma_core.c,v
retrieving revision 1.47
diff -u -r1.47 cma_core.c
--- client/agents/cma_core.c    2003/07/31 21:05:36     1.47
+++ client/agents/cma_core.c    2003/09/24 05:20:34
@@ -571,18 +571,14 @@
 
     create_event(pcity->x, pcity->y, E_CITY_CMA_RELEASE,
                 _("CMA: %s has changed multiple times. This may be "
-                  "an error in Freeciv or bad luck. Please contact "
-                  "<freeciv-dev@xxxxxxxxxxx>. The CMA will detach "
+                  "an error in Freeciv or bad luck. The CMA will detach "
                   "itself from the city now."), pcity->name);
 
     cma_release_city(pcity);
 
-#if (IS_DEVEL_VERSION || IS_BETA_VERSION)
-    die("CMA: %s has changed multiple times. This may be "
-       "an error in Freeciv or bad luck. Please contact "
-       "<freeciv-dev@xxxxxxxxxxx>. The CMA will detach "
-       "itself from the city now.", pcity->name);
-#endif
+    freelog(LOG_ERROR, "CMA: %s has changed multiple times due to "
+            "an error in Freeciv. Please send a savegame that can reproduce "
+            "this bug to <bugs@xxxxxxxxxxxxxxxxxxx>. Thank you.", pcity->name);
   }
 
   freelog(HANDLE_CITY_LOG_LEVEL2, "END handle city=(%d)", city_id);

[Prev in Thread] Current Thread [Next in Thread]
  • [Freeciv-Dev] (PR#6262) remove the cma assert, Per I. Mathisen <=