diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/server/unitfunc.c freeciv/server/unitfunc.c --- FreecivCVS/server/unitfunc.c Sun Feb 6 00:26:19 2000 +++ freeciv/server/unitfunc.c Sat Feb 26 11:32:55 2000 @@ -2167,9 +2167,6 @@ advances[i].name, get_nation_name_plural(target->nation)); - do_conquer_cost(pplayer); - found_new_tech(pplayer,i,0,1); - notify_player(pplayer, _("Game: You acquired %s from %s."), advances[i].name, target->name); notify_player(target, _("Game: %s discovered %s in the city."), pplayer->name, @@ -2178,6 +2175,9 @@ get_nation_name_plural(pplayer->nation), advances[i].name, get_nation_name_plural(target->nation)); + + do_conquer_cost(pplayer); + found_new_tech(pplayer,i,0,1); } /************************************************************************** diff -ru -X /home/jjm/cvs/no.freeciv FreecivCVS/server/unithand.c freeciv/server/unithand.c --- FreecivCVS/server/unithand.c Tue Feb 15 09:40:35 2000 +++ freeciv/server/unithand.c Sat Feb 26 11:31:58 2000 @@ -1183,7 +1183,6 @@ return; } city_auto_remove_worker(pcity); - get_a_tech(pplayer, cplayer); coins=cplayer->economic.gold; coins=myrand((coins/20)+1)+(coins*(pcity->size))/200; pplayer->economic.gold+=coins; @@ -1221,6 +1220,7 @@ get_nation_name_plural(pplayer->nation)); } + get_a_tech(pplayer, cplayer); pnewcity=fc_malloc(sizeof(struct city)); make_partisans(pcity);