[Freeciv-Dev] Re: (PR#4083) barbarian leader

["Raimar Falke" <rf13@xxxxxxxxxxxxxxxxx>]

On Thu, May 01, 2003 at 05:49:23PM -0700, Breno Ramalho Lemes wrote:
> >
> >
> >>It's possible to bribe a barbarian leader, then upgrade it to settlers 
> >>or engineers.
> >>    
> >>
> >
> >What version of freeciv?
> >  
> >
> 1.14.0 (maybe cvs-Apr-19 also, but I'm not sure)

Uhhh. The building is prevented but not the bribing. I'm not sure how
we can explain that barbarians can not be bribed. Can you please test
the attached patch? It compiles but is untested. A savegame for the
records would also be nice.

        Raimar

-- 
 email: rf13@xxxxxxxxxxxxxxxxx
 "The BeOS takes the best features from the major operating systems. 
  It's got the power and flexibility of Unix, the interface and ease 
  of use of the MacOS, and Minesweeper from Windows."

Index: server/diplomats.c
===================================================================
RCS file: /home/freeciv/CVS/freeciv/server/diplomats.c,v
retrieving revision 1.37
diff -u -u -r1.37 diplomats.c
--- server/diplomats.c  2003/04/30 21:14:35     1.37
+++ server/diplomats.c  2003/05/02 09:00:50
@@ -1319,6 +1319,10 @@
   int dist;
   int default_hp = unit_type(punit)->hp;
 
+  if (unit_owner(punit)->ai.barbarian_type != NOT_A_BARBARIAN) {
+    return FC_INFINITY;
+  }
+
   cost = unit_owner(punit)->economic.gold + 750;
   capital = find_palace(unit_owner(punit));
   if (capital) {