Author: cazfi
Date: Mon Nov 21 07:19:40 2016
New Revision: 34601
URL: http://svn.gna.org/viewcvs/freeciv?rev=34601&view=rev
Log:
Removed road_index()
See patch #8006
Modified:
trunk/client/gui-gtk-2.0/editprop.c
trunk/client/gui-gtk-3.0/editprop.c
trunk/client/gui-gtk-3.22/editprop.c
trunk/common/road.c
trunk/common/road.h
trunk/server/advisors/autosettlers.c
trunk/server/legacysave.c
trunk/server/rssanity.c
trunk/server/ruleset.c
trunk/server/savegame2.c
Modified: trunk/client/gui-gtk-2.0/editprop.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-2.0/editprop.c?rev=34601&r1=34600&r2=34601&view=diff
==============================================================================
--- trunk/client/gui-gtk-2.0/editprop.c (original)
+++ trunk/client/gui-gtk-2.0/editprop.c Mon Nov 21 07:19:40 2016
@@ -1537,7 +1537,7 @@
BV_CLR_ALL(pv->data.v_bv_roads);
extra_type_by_cause_iterate(EC_ROAD, pextra) {
if (tile_has_extra(ptile, pextra)) {
- BV_SET(pv->data.v_bv_roads, road_index(extra_road_get(pextra)));
+ BV_SET(pv->data.v_bv_roads, road_number(extra_road_get(pextra)));
}
} extra_type_by_cause_iterate_end;
break;
@@ -2409,7 +2409,7 @@
return;
case OPID_TILE_ROADS:
extra_type_by_cause_iterate(EC_ROAD, pextra) {
- int ridx = road_index(extra_road_get(pextra));
+ int ridx = road_number(extra_road_get(pextra));
if (BV_ISSET(pv->data.v_bv_roads, ridx)) {
BV_SET(packet->extras, extra_index(pextra));
Modified: trunk/client/gui-gtk-3.0/editprop.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.0/editprop.c?rev=34601&r1=34600&r2=34601&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/editprop.c (original)
+++ trunk/client/gui-gtk-3.0/editprop.c Mon Nov 21 07:19:40 2016
@@ -1541,7 +1541,7 @@
BV_CLR_ALL(pv->data.v_bv_roads);
extra_type_by_cause_iterate(EC_ROAD, pextra) {
if (tile_has_extra(ptile, pextra)) {
- BV_SET(pv->data.v_bv_roads, road_index(extra_road_get(pextra)));
+ BV_SET(pv->data.v_bv_roads, road_number(extra_road_get(pextra)));
}
} extra_type_by_cause_iterate_end;
break;
@@ -2413,7 +2413,7 @@
return;
case OPID_TILE_ROADS:
extra_type_by_cause_iterate(EC_ROAD, pextra) {
- int ridx = road_index(extra_road_get(pextra));
+ int ridx = road_number(extra_road_get(pextra));
if (BV_ISSET(pv->data.v_bv_roads, ridx)) {
BV_SET(packet->extras, extra_index(pextra));
Modified: trunk/client/gui-gtk-3.22/editprop.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/gui-gtk-3.22/editprop.c?rev=34601&r1=34600&r2=34601&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.22/editprop.c (original)
+++ trunk/client/gui-gtk-3.22/editprop.c Mon Nov 21 07:19:40 2016
@@ -1541,7 +1541,7 @@
BV_CLR_ALL(pv->data.v_bv_roads);
extra_type_by_cause_iterate(EC_ROAD, pextra) {
if (tile_has_extra(ptile, pextra)) {
- BV_SET(pv->data.v_bv_roads, road_index(extra_road_get(pextra)));
+ BV_SET(pv->data.v_bv_roads, road_number(extra_road_get(pextra)));
}
} extra_type_by_cause_iterate_end;
break;
@@ -2413,7 +2413,7 @@
return;
case OPID_TILE_ROADS:
extra_type_by_cause_iterate(EC_ROAD, pextra) {
- int ridx = road_index(extra_road_get(pextra));
+ int ridx = road_number(extra_road_get(pextra));
if (BV_ISSET(pv->data.v_bv_roads, ridx)) {
BV_SET(packet->extras, extra_index(pextra));
Modified: trunk/common/road.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/road.c?rev=34601&r1=34600&r2=34601&view=diff
==============================================================================
--- trunk/common/road.c (original)
+++ trunk/common/road.c Mon Nov 21 07:19:40 2016
@@ -37,24 +37,6 @@
}
/**************************************************************************
- Return the road index.
-
- Currently same as road_number(), paired with road_count()
- indicates use as an array index.
-
- FIXME: Get rid of this. _index() makes no sense when they are not
- in an array.
-**************************************************************************/
-Road_type_id road_index(const struct road_type *proad)
-{
- fc_assert_ret_val(NULL != proad, -1);
-
- /* FIXME: */
- /* return proad - roads; */
- return road_number(proad);
-}
-
-/**************************************************************************
Return extra that road is.
**************************************************************************/
struct extra_type *road_extra_get(const struct road_type *proad)
@@ -136,7 +118,8 @@
extra_type_list_append(proad->integrators, pextra);
extra_type_by_cause_iterate(EC_ROAD, oextra) {
struct road_type *oroad = extra_road_get(oextra);
- if (BV_ISSET(proad->integrates, road_index(oroad))) {
+
+ if (BV_ISSET(proad->integrates, road_number(oroad))) {
extra_type_list_append(proad->integrators, oextra);
}
} extra_type_by_cause_iterate_end;
Modified: trunk/common/road.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/road.h?rev=34601&r1=34600&r2=34601&view=diff
==============================================================================
--- trunk/common/road.h (original)
+++ trunk/common/road.h Mon Nov 21 07:19:40 2016
@@ -1,4 +1,4 @@
-/**********************************************************************
+/***********************************************************************
Freeciv - Copyright (C) 1996 - A Kjeldberg, L Gregersen, P Unold
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@ -86,7 +86,6 @@
/* General road type accessor functions. */
Road_type_id road_count(void);
-Road_type_id road_index(const struct road_type *proad);
Road_type_id road_number(const struct road_type *proad);
struct road_type *road_by_number(Road_type_id id);
Modified: trunk/server/advisors/autosettlers.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/advisors/autosettlers.c?rev=34601&r1=34600&r2=34601&view=diff
==============================================================================
--- trunk/server/advisors/autosettlers.c (original)
+++ trunk/server/advisors/autosettlers.c Mon Nov 21 07:19:40 2016
@@ -181,7 +181,7 @@
fc_assert(punit->activity_target != NULL);
- build_rnbr = road_index(extra_road_get(punit->activity_target));
+ build_rnbr = road_number(extra_road_get(punit->activity_target));
if (build_rnbr == rnbr) {
real_road[i] = TRUE;
Modified: trunk/server/legacysave.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/legacysave.c?rev=34601&r1=34600&r2=34601&view=diff
==============================================================================
--- trunk/server/legacysave.c (original)
+++ trunk/server/legacysave.c Mon Nov 21 07:19:40 2016
@@ -1534,8 +1534,8 @@
/* load the unit orders */
if (has_capability("orders", savefile_options)) {
- int road_idx = road_index(road_by_compat_special(ROCO_ROAD));
- int rail_idx = road_index(road_by_compat_special(ROCO_RAILROAD));
+ int road_idx = road_number(road_by_compat_special(ROCO_ROAD));
+ int rail_idx = road_number(road_by_compat_special(ROCO_RAILROAD));
int len = secfile_lookup_int_default(file, 0,
"player%d.u%d.orders_length", plrno, i);
Modified: trunk/server/rssanity.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/rssanity.c?rev=34601&r1=34600&r2=34601&view=diff
==============================================================================
--- trunk/server/rssanity.c (original)
+++ trunk/server/rssanity.c Mon Nov 21 07:19:40 2016
@@ -867,9 +867,10 @@
extra_type_list_iterate(proad->integrators, iextra) {
struct road_type *iroad = extra_road_get(iextra);
-
- if (road_index(proad) != road_index(iroad)
- && !BV_ISSET(iroad->integrates, road_index(proad))) {
+ int pnbr = road_number(proad);
+
+ if (pnbr != road_number(iroad)
+ && !BV_ISSET(iroad->integrates, pnbr)) {
/* We don't support non-symmetric integrator relationships yet. */
ruleset_error(LOG_ERROR,
"Road '%s' integrates with '%s' but not vice versa!",
Modified: trunk/server/ruleset.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/ruleset.c?rev=34601&r1=34600&r2=34601&view=diff
==============================================================================
--- trunk/server/ruleset.c (original)
+++ trunk/server/ruleset.c Mon Nov 21 07:19:40 2016
@@ -3428,7 +3428,7 @@
if (ok) {
extra_type_by_cause_iterate(EC_ROAD, pextra) {
struct road_type *proad = extra_road_get(pextra);
- const char *section = &road_sections[road_index(proad) *
MAX_SECTION_LABEL];
+ const char *section = &road_sections[road_number(proad) *
MAX_SECTION_LABEL];
const char **slist;
const char *special;
const char *modestr;
@@ -3523,7 +3523,7 @@
ok = FALSE;
break;
} else {
- BV_SET(proad->integrates, road_index(top));
+ BV_SET(proad->integrates, road_number(top));
}
}
free(slist);
Modified: trunk/server/savegame2.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/savegame2.c?rev=34601&r1=34600&r2=34601&view=diff
==============================================================================
--- trunk/server/savegame2.c (original)
+++ trunk/server/savegame2.c Mon Nov 21 07:19:40 2016
@@ -3961,12 +3961,12 @@
if (cfspe == S_OLD_ROAD) {
proad = road_by_compat_special(ROCO_ROAD);
if (proad) {
- road_id = road_index(proad);
+ road_id = road_number(proad);
}
} else if (cfspe == S_OLD_RAILROAD) {
proad = road_by_compat_special(ROCO_RAILROAD);
if (proad) {
- road_id = road_index(proad);
+ road_id = road_number(proad);
}
}
}
@@ -4144,8 +4144,8 @@
const char *tgt_unitstr;
const char *base_unitstr = NULL;
const char *road_unitstr = NULL;
- int road_idx = road_index(road_by_compat_special(ROCO_ROAD));
- int rail_idx = road_index(road_by_compat_special(ROCO_RAILROAD));
+ int road_idx = road_number(road_by_compat_special(ROCO_ROAD));
+ int rail_idx = road_number(road_by_compat_special(ROCO_RAILROAD));
punit->orders.list = fc_malloc(len * sizeof(*(punit->orders.list)));
punit->orders.length = len;
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
