Author: cazfi
Date: Tue Sep 8 19:27:55 2015
New Revision: 29817
URL: http://svn.gna.org/viewcvs/freeciv?rev=29817&view=rev
Log:
Use cached values in is_cardinal_dir() and is_valid_dir()
See patch #6325
Modified:
trunk/common/map.c
Modified: trunk/common/map.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/map.c?rev=29817&r1=29816&r2=29817&view=diff
==============================================================================
--- trunk/common/map.c (original)
+++ trunk/common/map.c Tue Sep 8 19:27:55 2015
@@ -87,6 +87,12 @@
*/
const int DIR_DX[8] = { -1, 0, 1, -1, 1, -1, 0, 1 };
const int DIR_DY[8] = { -1, -1, -1, 0, 0, 1, 1, 1 };
+
+static bool dir_cardinality[8];
+static bool dir_validity[8];
+
+static bool is_valid_dir_calculate(enum direction8 dir);
+static bool is_cardinal_dir_calculate(enum direction8 dir);
static bool restrict_infra(const struct player *pplayer, const struct tile *t1,
const struct tile *t2);
@@ -308,13 +314,19 @@
map.num_valid_dirs = map.num_cardinal_dirs = 0;
for (dir = 0; dir < 8; dir++) {
- if (is_valid_dir(dir)) {
+ if (is_valid_dir_calculate(dir)) {
map.valid_dirs[map.num_valid_dirs] = dir;
map.num_valid_dirs++;
+ dir_validity[dir] = TRUE;
+ } else {
+ dir_validity[dir] = FALSE;
}
- if (is_cardinal_dir(dir)) {
+ if (is_cardinal_dir_calculate(dir)) {
map.cardinal_dirs[map.num_cardinal_dirs] = dir;
map.num_cardinal_dirs++;
+ dir_cardinality[dir] = TRUE;
+ } else {
+ dir_cardinality[dir] = FALSE;
}
}
fc_assert(map.num_valid_dirs > 0 && map.num_valid_dirs <= 8);
@@ -1166,9 +1178,10 @@
}
/**************************************************************************
- Returns TRUE iff the given direction is a valid one.
-**************************************************************************/
-bool is_valid_dir(enum direction8 dir)
+ Returns TRUE iff the given direction is a valid one. Does not use
+ value from the cache, but can be used to calculate the cache.
+**************************************************************************/
+static bool is_valid_dir_calculate(enum direction8 dir)
{
switch (dir) {
case DIR8_SOUTHEAST:
@@ -1190,12 +1203,23 @@
}
/**************************************************************************
- Returns TRUE iff the given direction is a cardinal one.
+ Returns TRUE iff the given direction is a valid one.
+**************************************************************************/
+bool is_valid_dir(enum direction8 dir)
+{
+ fc_assert_ret_val(dir >= 0 && dir < 8, FALSE);
+
+ return dir_validity[dir];
+}
+
+/**************************************************************************
+ Returns TRUE iff the given direction is a cardinal one. Does not use
+ value from the cache, but can be used to calculate the cache.
Cardinal directions are those in which adjacent tiles share an edge not
just a vertex.
**************************************************************************/
-bool is_cardinal_dir(enum direction8 dir)
+static bool is_cardinal_dir_calculate(enum direction8 dir)
{
switch (dir) {
case DIR8_NORTH:
@@ -1216,6 +1240,19 @@
}
/**************************************************************************
+ Returns TRUE iff the given direction is a cardinal one.
+
+ Cardinal directions are those in which adjacent tiles share an edge not
+ just a vertex.
+**************************************************************************/
+bool is_cardinal_dir(enum direction8 dir)
+{
+ fc_assert_ret_val(dir >= 0 && dir < 8, FALSE);
+
+ return dir_cardinality[dir];
+}
+
+/**************************************************************************
Return true and sets dir to the direction of the step if (end_x,
end_y) can be reached from (start_x, start_y) in one step. Return
false otherwise (value of dir is unchanged in this case).
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
