License upgrade to GPL version 3 or later

[empserver] / src / lib / commands / newe.c

diff --git a/src/lib/commands/newe.c b/src/lib/commands/newe.c
index 43c0eedacdd8afa063f3b19fc7e19641ad7e17d3..2efe2873f0b7f04bb2520182709446321499403f 100644 (file)
--- a/src/lib/commands/newe.c
+++ b/src/lib/commands/newe.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2010, 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/>.
  *
  *  ---
  *
@@ -79,7 +78,6 @@ newe(void)
                if (twork > bwork) {
                    twork = bwork;
                }
-               work -= twork;
                bwork -= twork;
                eff -= twork * 4;
                if (eff <= 0) {
@@ -103,7 +101,6 @@ newe(void)
                    if (twork > hcms)
                        twork = hcms;
                }
-               work -= twork;
                eff += twork;
            } else if (eff < 100) {
                twork = 100 - eff;
@@ -122,7 +119,6 @@ newe(void)
                    if (twork > hcms)
                        twork = hcms;
                }
-               work -= twork;
                eff += twork;
            }
        } else {
@@ -133,7 +129,7 @@ newe(void)
            pr("EFFICIENCY SIMULATION\n");
            pr("   sect  des    projected eff\n");
        }
-       prxy("%4d,%-4d", nstr.x, nstr.y, player->cnum);
+       prxy("%4d,%-4d", nstr.x, nstr.y);
        pr(" %c", dchr[type].d_mnem);
        pr("    %3d%%\n", eff);
     }