? diff ? barbarian_type1.diff ? moves_left1.diff ? diff2 ? client/gui-gtk/stZo2QSL ? common/bool.h Index: ai/aiunit.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/ai/aiunit.c,v retrieving revision 1.166 diff -u -r1.166 aiunit.c --- ai/aiunit.c 2002/02/11 13:55:44 1.166 +++ ai/aiunit.c 2002/02/11 19:51:06 @@ -1825,7 +1825,7 @@ **************************************************************************/ static int unit_can_be_retired(struct unit *punit) { - if( punit->fuel ) { /* fuel abused for barbarian life span */ + if (punit->fuel > 0) { /* fuel abused for barbarian life span */ punit->fuel--; return 0; } @@ -2235,7 +2235,7 @@ } /* Disappearance - 33% chance on coast, when older than barbarian life span */ - if( is_at_coast(leader->x, leader->y) && !leader->fuel) { + if (is_at_coast(leader->x, leader->y) && leader->fuel == 0) { if(myrand(3) == 0) { freelog(LOG_DEBUG, "Barbarian leader disappeared at %d %d", leader->x, leader->y); wipe_unit(leader); Index: client/gui-mui/citydlg.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/gui-mui/citydlg.c,v retrieving revision 1.40 diff -u -r1.40 citydlg.c --- client/gui-mui/citydlg.c 2002/01/14 17:17:11 1.40 +++ client/gui-mui/citydlg.c 2002/02/11 19:51:11 @@ -492,7 +492,7 @@ /* from unit.h get_unit_name() */ struct unit_type *ptype; ptype = get_unit_type(which); - if (ptype->fuel) + if (ptype->fuel > 0) my_snprintf(info, sizeof(info), "%d/%d/%d(%d)", ptype->attack_strength, ptype->defense_strength, ptype->move_rate / 3, (ptype->move_rate / 3) * ptype->fuel); Index: client/gui-mui/worklistclass.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/gui-mui/worklistclass.c,v retrieving revision 1.17 diff -u -r1.17 worklistclass.c --- client/gui-mui/worklistclass.c 2002/01/14 17:17:12 1.17 +++ client/gui-mui/worklistclass.c 2002/02/11 19:51:11 @@ -117,7 +117,7 @@ static char info[64]; struct unit_type *ptype = get_unit_type(id); - if (ptype->fuel) + if (ptype->fuel > 0) { my_snprintf(info, sizeof(info), "%d/%d/%d(%d)", ptype->attack_strength, ptype->defense_strength, Index: client/gui-win32/citydlg.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/client/gui-win32/citydlg.c,v retrieving revision 1.9 diff -u -r1.9 citydlg.c --- client/gui-win32/citydlg.c 2002/01/14 17:17:13 1.9 +++ client/gui-win32/citydlg.c 2002/02/11 19:51:13 @@ -1214,7 +1214,7 @@ /* from unit.h get_unit_name() */ ptype = get_unit_type(i); - if (ptype->fuel) + if (ptype->fuel > 0) my_snprintf(buf[1], sizeof(buf[1]), "%d/%d/%d(%d)", ptype->attack_strength, ptype->defense_strength, ptype->move_rate / 3, (ptype->move_rate / 3) * ptype->fuel); Index: common/city.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/common/city.c,v retrieving revision 1.137 diff -u -r1.137 city.c --- common/city.c 2002/02/11 13:55:49 1.137 +++ common/city.c 2002/02/11 19:51:14 @@ -1372,7 +1372,7 @@ /* from unit.h get_unit_name() */ ptype = get_unit_type(id); - if (ptype->fuel) { + if (ptype->fuel > 0) { my_snprintf(buf[1], column_size, "%d/%d/%d(%d)", ptype->attack_strength, ptype->defense_strength, ptype->move_rate / 3, Index: common/packets.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/common/packets.c,v retrieving revision 1.177 diff -u -r1.177 packets.c --- common/packets.c 2002/02/11 10:38:05 1.177 +++ common/packets.c 2002/02/11 19:51:22 @@ -2247,7 +2247,7 @@ cptr=put_uint16(cptr, req->info_city_id); cptr=put_uint16(cptr, req->serial_num); - if(req->fuel) cptr=put_uint8(cptr, req->fuel); + if(req->fuel > 0) cptr=put_uint8(cptr, req->fuel); put_uint16(buffer, cptr-buffer); return send_packet_data(pc, buffer, cptr-buffer); Index: common/unittype.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/common/unittype.c,v retrieving revision 1.10 diff -u -r1.10 unittype.c --- common/unittype.c 2002/02/10 19:26:30 1.10 +++ common/unittype.c 2002/02/11 19:51:28 @@ -219,7 +219,7 @@ struct unit_type *ptype; static char buffer[256]; ptype =get_unit_type(id); - if (ptype->fuel) { + if (ptype->fuel > 0) { my_snprintf(buffer, sizeof(buffer), "%s [%d/%d/%d(%d)]", ptype->name, ptype->attack_strength, ptype->defense_strength, Index: server/unittools.c =================================================================== RCS file: /home/freeciv/CVS/freeciv/server/unittools.c,v retrieving revision 1.154 diff -u -r1.154 unittools.c --- server/unittools.c 2002/02/11 13:55:53 1.154 +++ server/unittools.c 2002/02/11 19:51:52 @@ -393,7 +393,7 @@ * refuel as many missiles as possible */ unit_list_iterate(missile_carriers, punit) { - while(punit->fuel) { + while(punit->fuel > 0) { punit_to_refuel= find_best_air_unit_to_refuel( pplayer, punit->x, punit->y, TRUE /*missile */); if (!punit_to_refuel) @@ -406,7 +406,7 @@ /* Now refuel air units from carriers (also not yet refuelled missiles) */ unit_list_iterate(carriers, punit) { - while(punit->fuel) { + while(punit->fuel > 0) { punit_to_refuel= find_best_air_unit_to_refuel( pplayer, punit->x, punit->y, FALSE /* any */); if (!punit_to_refuel)