<URL: http://bugs.freeciv.org/Ticket/Display.html?id=40434 >

 When old code is replaced with search and replace, resulting code can
be amusing. Attached patch simplifies tile_activity_base_time() to
trivial form. This also means one less direct reference to
BASE_FORTRESS & BASE_AIRBASE.


 - ML

diff -Nurd -X.diff_ignore freeciv/common/tile.c freeciv/common/tile.c
--- freeciv/common/tile.c       2008-08-12 17:57:20.000000000 +0300
+++ freeciv/common/tile.c       2008-08-12 17:58:10.000000000 +0300
@@ -374,13 +374,7 @@
 int tile_activity_base_time(const struct tile *ptile,
                             enum base_type_id base)
 {
-  if (base == BASE_AIRBASE) {
-    return base_by_number(BASE_AIRBASE)->build_time * ACTIVITY_FACTOR;
-  } else {
-    return base_by_number(BASE_FORTRESS)->build_time * ACTIVITY_FACTOR;
-  }
-
-  return 0;
+  return base_by_number(base)->build_time * ACTIVITY_FACTOR;
 }
 
 /****************************************************************************
_______________________________________________
Freeciv-dev mailing list
Freeciv-dev@gna.org
https://mail.gna.org/listinfo/freeciv-dev

Reply via email to