Author: cazfi
Date: Wed Dec 31 04:35:21 2014
New Revision: 27455
URL: http://svn.gna.org/viewcvs/freeciv?rev=27455&view=rev
Log:
Support using virtual tiles in same_pos()
See patch #5621
Modified:
trunk/common/map.c
Modified: trunk/common/map.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/common/map.c?rev=27455&r1=27454&r2=27455&view=diff
==============================================================================
--- trunk/common/map.c (original)
+++ trunk/common/map.c Wed Dec 31 04:35:21 2014
@@ -836,7 +836,10 @@
bool same_pos(const struct tile *tile1, const struct tile *tile2)
{
fc_assert_ret_val(tile1 != NULL && tile2 != NULL, FALSE);
- return (tile1 == tile2);
+
+ /* In case of virtual tile, tile1 can be different from tile2,
+ * but they have same index */
+ return (tile1->index == tile2->index);
}
/***************************************************************
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
