Author: cazfi
Date: Sat Nov 19 23:38:28 2016
New Revision: 34581
URL: http://svn.gna.org/viewcvs/freeciv?rev=34581&view=rev
Log:
Removed base_index()
See patch #7992
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/base.c
trunk/common/base.h
trunk/server/ruleset.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=34581&r1=34580&r2=34581&view=diff
==============================================================================
--- trunk/client/gui-gtk-2.0/editprop.c (original)
+++ trunk/client/gui-gtk-2.0/editprop.c Sat Nov 19 23:38:28 2016
@@ -1545,7 +1545,7 @@
BV_CLR_ALL(pv->data.v_bv_bases);
extra_type_by_cause_iterate(EC_BASE, pextra) {
if (tile_has_extra(ptile, pextra)) {
- BV_SET(pv->data.v_bv_bases, base_index(extra_base_get(pextra)));
+ BV_SET(pv->data.v_bv_bases, base_number(extra_base_get(pextra)));
}
} extra_type_by_cause_iterate_end;
break;
@@ -2420,7 +2420,7 @@
return;
case OPID_TILE_BASES:
extra_type_by_cause_iterate(EC_BASE, pextra) {
- int bidx = base_index(extra_base_get(pextra));
+ int bidx = base_number(extra_base_get(pextra));
if (BV_ISSET(pv->data.v_bv_bases, bidx)) {
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=34581&r1=34580&r2=34581&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.0/editprop.c (original)
+++ trunk/client/gui-gtk-3.0/editprop.c Sat Nov 19 23:38:28 2016
@@ -1549,7 +1549,7 @@
BV_CLR_ALL(pv->data.v_bv_bases);
extra_type_by_cause_iterate(EC_BASE, pextra) {
if (tile_has_extra(ptile, pextra)) {
- BV_SET(pv->data.v_bv_bases, base_index(extra_base_get(pextra)));
+ BV_SET(pv->data.v_bv_bases, base_number(extra_base_get(pextra)));
}
} extra_type_by_cause_iterate_end;
break;
@@ -2424,7 +2424,7 @@
return;
case OPID_TILE_BASES:
extra_type_by_cause_iterate(EC_BASE, pextra) {
- int bidx = base_index(extra_base_get(pextra));
+ int bidx = base_number(extra_base_get(pextra));
if (BV_ISSET(pv->data.v_bv_bases, bidx)) {
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=34581&r1=34580&r2=34581&view=diff
==============================================================================
--- trunk/client/gui-gtk-3.22/editprop.c (original)
+++ trunk/client/gui-gtk-3.22/editprop.c Sat Nov 19 23:38:28 2016
@@ -1549,7 +1549,7 @@
BV_CLR_ALL(pv->data.v_bv_bases);
extra_type_by_cause_iterate(EC_BASE, pextra) {
if (tile_has_extra(ptile, pextra)) {
- BV_SET(pv->data.v_bv_bases, base_index(extra_base_get(pextra)));
+ BV_SET(pv->data.v_bv_bases, base_number(extra_base_get(pextra)));
}
} extra_type_by_cause_iterate_end;
break;
@@ -2424,7 +2424,7 @@
return;
case OPID_TILE_BASES:
extra_type_by_cause_iterate(EC_BASE, pextra) {
- int bidx = base_index(extra_base_get(pextra));
+ int bidx = base_number(extra_base_get(pextra));
if (BV_ISSET(pv->data.v_bv_bases, bidx)) {
BV_SET(packet->extras, extra_index(pextra));
Modified: trunk/common/base.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/base.c?rev=34581&r1=34580&r2=34581&view=diff
==============================================================================
--- trunk/common/base.c (original)
+++ trunk/common/base.c Sat Nov 19 23:38:28 2016
@@ -202,24 +202,6 @@
}
/**************************************************************************
- Return the base index.
-
- Currently same as base_number(), paired with base_count()
- indicates use as an array index.
-
- FIXME: Get rid of this. _index() makes no sense when they are not
- in an array.
-**************************************************************************/
-Base_type_id base_index(const struct base_type *pbase)
-{
- fc_assert_ret_val(NULL != pbase, -1);
-
- /* FIXME: */
- /* return pbase - base_types; */
- return base_number(pbase);
-}
-
-/**************************************************************************
Return extra that base is.
**************************************************************************/
struct extra_type *base_extra_get(const struct base_type *pbase)
Modified: trunk/common/base.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/base.h?rev=34581&r1=34580&r2=34581&view=diff
==============================================================================
--- trunk/common/base.h (original)
+++ trunk/common/base.h Sat Nov 19 23:38:28 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
@@ -78,7 +78,6 @@
/* General base accessor functions. */
Base_type_id base_count(void);
-Base_type_id base_index(const struct base_type *pbase);
Base_type_id base_number(const struct base_type *pbase);
struct base_type *base_by_number(const Base_type_id id);
Modified: trunk/server/ruleset.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/ruleset.c?rev=34581&r1=34580&r2=34581&view=diff
==============================================================================
--- trunk/server/ruleset.c (original)
+++ trunk/server/ruleset.c Sat Nov 19 23:38:28 2016
@@ -3349,7 +3349,7 @@
/* base details */
extra_type_by_cause_iterate(EC_BASE, pextra) {
struct base_type *pbase = extra_base_get(pextra);
- const char *section = &base_sections[base_index(pbase) *
MAX_SECTION_LABEL];
+ const char *section = &base_sections[base_number(pbase) *
MAX_SECTION_LABEL];
int bj;
const char **slist;
const char *gui_str;
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
