License upgrade to GPL version 3 or later

[empserver] / src / lib / update / human.c

diff --git a/src/lib/update/human.c b/src/lib/update/human.c
index 8b8a23cf8fe4e222a78be87ba992fb0343e527a3..53ffff1631a40968f4ee9d233e8406787853f9da 100644 (file)
--- a/src/lib/update/human.c
+++ b/src/lib/update/human.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -30,7 +29,7 @@
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Steve McClure, 1996
- *     Markus Armbruster, 2004-2008
+ *     Markus Armbruster, 2004-2009
  */
 
 #include <config.h>
@@ -61,6 +60,7 @@ do_feed(struct sctstr *sp, struct natstr *np, short *vec,
     int starved, sctwork;
     int needed;
     int maxpop;
+    int manna;
 
     /* grow people & stuff */
     sctwork = sp->sct_work;
@@ -72,19 +72,16 @@ do_feed(struct sctstr *sp, struct natstr *np, short *vec,
                                     maxpop));
 
     if (sp->sct_type != SCT_SANCT) {
+       manna = 0;
        if (opt_NOFOOD == 0) {
            needed = (int)ceil(food_needed(vec, etu));
            if (vec[I_FOOD] < needed) {
                /* need to grow "emergency rations" */
                work_avail -= 2 * growfood(sp, vec, work_avail / 2, etu);
                /* It's twice as hard to grow those than norm */
-           }
-           if (vec[I_FOOD] < needed && sp->sct_own == sp->sct_oldown) {
-               /* steal food from warehouses, headquarters,
-                  supply ships in port, or supply units */
-               vec[I_FOOD] = supply_commod(sp->sct_own,
-                                           sp->sct_x, sp->sct_y,
-                                           I_FOOD, needed);
+               if (vec[I_FOOD] == 0)
+                   /* Conjure up 1f to make life easier for the player */
+                   manna = vec[I_FOOD] = 1;
            }
        }
        starved = feed_people(vec, etu);
@@ -109,7 +106,13 @@ do_feed(struct sctstr *sp, struct natstr *np, short *vec,
            if (!player->simulation)
                sp->sct_work = sctwork;
            grow_people(sp, etu, np, &work_avail, sctwork, vec);
+           /* age che */
+           if (!player->simulation)
+               sp->sct_che = age_people(sp->sct_che, etu);
        }
+       if (manna)
+           /* Take away food we conjured up */
+           vec[I_FOOD] = 0;
     } else
        sctwork = sp->sct_work = 100;
     /* Here is where we truncate extra people, always */
@@ -141,13 +144,7 @@ growfood(struct sctstr *sp, short *vec, int work, int etu)
     food = MIN(food_workers, food_fertil);
     if (food > ITEM_MAX - vec[I_FOOD])
        food = ITEM_MAX - vec[I_FOOD];
-    /*
-     * Be nice; grow minimum one food unit.
-     * This makes life simpler for the player.
-     */
     vec[I_FOOD] += food;
-    if (vec[I_FOOD] == 0)
-       vec[I_FOOD] = 1;
     work_used = food / fcrate;
     return work_used;
 }
@@ -215,8 +212,7 @@ starve_some(short *vec, i_type whom, int num)
  * Truncate any extra people that may be around
  */
 static void
-trunc_people(struct sctstr *sp, struct natstr *np,
-            short *vec)
+trunc_people(struct sctstr *sp, struct natstr *np, short *vec)
 {
     int maxpop = max_pop(np->nat_level[NAT_RLEV], sp);