Author: sveinung
Date: Mon Jul 7 02:39:27 2014
New Revision: 25410
URL: http://svn.gna.org/viewcvs/freeciv?rev=25410&view=rev
Log:
Coding style: rename maxTileUnits to max_tile_units
The rest of the Freeciv C code use K&R style variable names in stead of camel
case.
See patch #4903
Modified:
trunk/client/helpdata.c
trunk/common/fc_types.h
trunk/common/requirements.c
trunk/server/cityturn.c
Modified: trunk/client/helpdata.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/client/helpdata.c?rev=25410&r1=25409&r2=25410&view=diff
==============================================================================
--- trunk/client/helpdata.c (original)
+++ trunk/client/helpdata.c Mon Jul 7 02:39:27 2014
@@ -1604,16 +1604,16 @@
cat_snprintf(buf, bufsz,
PL_("At most %d unit may be present on the tile.\n",
"At most %d units may be present on the tile.\n",
- preq->source.value.maxTileUnits),
- preq->source.value.maxTileUnits);
+ preq->source.value.max_tile_units),
+ preq->source.value.max_tile_units);
} else {
cat_snprintf(buf, bufsz,
PL_("There must be more than %d unit present on "
"the tile.\n",
"There must be more than %d units present on "
"the tile.\n",
- preq->source.value.maxTileUnits),
- preq->source.value.maxTileUnits);
+ preq->source.value.max_tile_units),
+ preq->source.value.max_tile_units);
}
return TRUE;
case REQ_RANGE_CADJACENT:
@@ -1623,16 +1623,16 @@
"must have %d unit or fewer.\n",
"The tile or at least one cardinally adjacent tile "
"must have %d units or fewer.\n",
- preq->source.value.maxTileUnits),
- preq->source.value.maxTileUnits);
+ preq->source.value.max_tile_units),
+ preq->source.value.max_tile_units);
} else {
cat_snprintf(buf, bufsz,
PL_("The tile and all cardinally adjacent tiles must "
"have more than %d unit each.\n",
"The tile and all cardinally adjacent tiles must "
"have more than %d units each.\n",
- preq->source.value.maxTileUnits),
- preq->source.value.maxTileUnits);
+ preq->source.value.max_tile_units),
+ preq->source.value.max_tile_units);
}
return TRUE;
case REQ_RANGE_ADJACENT:
@@ -1642,16 +1642,16 @@
"%d unit or fewer.\n",
"The tile or at least one adjacent tile must have "
"%d units or fewer.\n",
- preq->source.value.maxTileUnits),
- preq->source.value.maxTileUnits);
+ preq->source.value.max_tile_units),
+ preq->source.value.max_tile_units);
} else {
cat_snprintf(buf, bufsz,
PL_("The tile and all adjacent tiles must have more "
"than %d unit each.\n",
"The tile and all adjacent tiles must have more "
"than %d units each.\n",
- preq->source.value.maxTileUnits),
- preq->source.value.maxTileUnits);
+ preq->source.value.max_tile_units),
+ preq->source.value.max_tile_units);
}
return TRUE;
case REQ_RANGE_CITY:
Modified: trunk/common/fc_types.h
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/fc_types.h?rev=25410&r1=25409&r2=25410&view=diff
==============================================================================
--- trunk/common/fc_types.h (original)
+++ trunk/common/fc_types.h Mon Jul 7 02:39:27 2014
@@ -311,7 +311,7 @@
int roadflag; /* enum road_flag_id */
int diplrel; /* enum diplstate_type or
enum diplrel_asym */
- int maxTileUnits;
+ int max_tile_units;
} universals_u;
/* The kind of universals_u (value_union_type was req_source_type).
Modified: trunk/common/requirements.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/requirements.c?rev=25410&r1=25409&r2=25410&view=diff
==============================================================================
--- trunk/common/requirements.c (original)
+++ trunk/common/requirements.c Mon Jul 7 02:39:27 2014
@@ -195,8 +195,8 @@
}
break;
case VUT_MAXTILEUNITS:
- source.value.maxTileUnits = atoi(value);
- if (0 <= source.value.maxTileUnits) {
+ source.value.max_tile_units = atoi(value);
+ if (0 <= source.value.max_tile_units) {
return source;
}
break;
@@ -365,7 +365,7 @@
source.value.ai_level = value;
return source;
case VUT_MAXTILEUNITS:
- source.value.maxTileUnits = value;
+ source.value.max_tile_units = value;
return source;
case VUT_TERRAINCLASS:
source.value.terrainclass = value;
@@ -461,7 +461,7 @@
case VUT_AI_LEVEL:
return source->value.ai_level;
case VUT_MAXTILEUNITS:
- return source->value.maxTileUnits;
+ return source->value.max_tile_units;
case VUT_TERRAINCLASS:
return source->value.terrainclass;
case VUT_BASEFLAG:
@@ -2077,7 +2077,7 @@
break;
case VUT_MAXTILEUNITS:
eval = is_tile_units_in_range(target_tile, req->range,
- req->source.value.maxTileUnits);
+ req->source.value.max_tile_units);
break;
case VUT_TERRAINCLASS:
eval = is_terrain_class_in_range(target_tile, target_city,
@@ -2288,7 +2288,7 @@
case VUT_AI_LEVEL:
return psource1->value.ai_level == psource2->value.ai_level;
case VUT_MAXTILEUNITS:
- return psource1->value.maxTileUnits == psource2->value.maxTileUnits;
+ return psource1->value.max_tile_units == psource2->value.max_tile_units;
case VUT_TERRAINCLASS:
return psource1->value.terrainclass == psource2->value.terrainclass;
case VUT_BASEFLAG:
@@ -2379,7 +2379,7 @@
case VUT_AI_LEVEL:
return ai_level_name(psource->value.ai_level);
case VUT_MAXTILEUNITS:
- fc_snprintf(buffer, sizeof(buffer), "%d", psource->value.maxTileUnits);
+ fc_snprintf(buffer, sizeof(buffer), "%d", psource->value.max_tile_units);
return buffer;
case VUT_TERRAINCLASS:
return terrain_class_name(psource->value.terrainclass);
@@ -2502,8 +2502,8 @@
case VUT_MAXTILEUNITS:
/* TRANS: here <= means 'less than or equal' */
cat_snprintf(buf, bufsz, PL_("<=%d unit",
- "<=%d units", psource->value.maxTileUnits),
- psource->value.maxTileUnits);
+ "<=%d units", psource->value.max_tile_units),
+ psource->value.max_tile_units);
return buf;
case VUT_TERRAINCLASS:
/* TRANS: Terrain class: "Land terrain" */
Modified: trunk/server/cityturn.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/cityturn.c?rev=25410&r1=25409&r2=25410&view=diff
==============================================================================
--- trunk/server/cityturn.c (original)
+++ trunk/server/cityturn.c Mon Jul 7 02:39:27 2014
@@ -1464,11 +1464,11 @@
"%s can't build %s from the worklist; "
"more than %d units on tile."
" Postponing...",
- preq->source.value.maxTileUnits),
+ preq->source.value.max_tile_units),
city_link(pcity),
city_improvement_name_translation(pcity,
ptarget),
- preq->source.value.maxTileUnits);
+ preq->source.value.max_tile_units);
script_server_signal_emit("building_cant_be_built", 3,
API_TYPE_BUILDING_TYPE, ptarget,
API_TYPE_CITY, pcity,
@@ -1482,11 +1482,11 @@
"%s can't build %s from the worklist; "
"fewer than %d units on tile."
" Postponing...",
- preq->source.value.maxTileUnits+1),
+ preq->source.value.max_tile_units + 1),
city_link(pcity),
city_improvement_name_translation(pcity,
ptarget),
- preq->source.value.maxTileUnits+1);
+ preq->source.value.max_tile_units + 1);
script_server_signal_emit("building_cant_be_built", 3,
API_TYPE_BUILDING_TYPE, ptarget,
API_TYPE_CITY, pcity,
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
