[Freeciv-Dev] Re: (PR#13522) cvs borked by last commit

["Jason Short" <jdorje@xxxxxxxxxxxxxxxxxxxxx>]

<URL: http://bugs.freeciv.org/Ticket/Display.html?id=13522 >

Per I. Mathisen wrote:
> <URL: http://bugs.freeciv.org/Ticket/Display.html?id=13522 >
> 
> Two issues...

Looks like a DEBUG issue.  This patch should fix it.  I'll commit as
soon as I finish compiling.

-jason

Index: ai/aitools.h
===================================================================
RCS file: /home/freeciv/CVS/freeciv/ai/aitools.h,v
retrieving revision 1.57
diff -p -u -r1.57 aitools.h
--- ai/aitools.h        22 Jul 2005 16:18:04 -0000      1.57
+++ ai/aitools.h        23 Jul 2005 23:55:59 -0000
@@ -32,7 +32,7 @@ struct pft_amphibious;
 #ifdef DEBUG
 #define CHECK_UNIT(punit)                                                   \
   (assert(punit != NULL),                                                  \
-   assert(punit->type < U_LAST),                                           \
+   assert(punit->type != NULL),                                            \
    assert(punit->owner != NULL),                                           \
    assert(&game.players[punit->owner->player_no] == punit->owner),         \
    assert(find_unit_by_id(punit->id) != NULL))
Index: server/barbarian.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/barbarian.c,v
retrieving revision 1.97
diff -p -u -r1.97 barbarian.c
--- server/barbarian.c  22 Jul 2005 16:18:06 -0000      1.97
+++ server/barbarian.c  23 Jul 2005 23:55:59 -0000
@@ -433,7 +433,7 @@ static void try_summon_barbarians(void)
        = find_a_unit_type(L_BARBARIAN, L_BARBARIAN_TECH);
 
       (void) create_unit(barbarians, utile, punittype, 0, 0, -1);
-      freelog(LOG_DEBUG, "Created barbarian unit %s", unit->name);
+      freelog(LOG_DEBUG, "Created barbarian unit %s", punittype->name);
     }
     (void) create_unit(barbarians, utile,
                       get_role_unit(L_BARBARIAN_LEADER, 0), 0, 0, -1);