License upgrade to GPL version 3 or later

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

diff --git a/src/lib/update/revolt.c b/src/lib/update/revolt.c
index 747333138687a7b497ba717701378ec5ff491bfd..95acd20e5ec8d8d32c885fb378aa874571e07757 100644 (file)
--- a/src/lib/update/revolt.c
+++ b/src/lib/update/revolt.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/>.
  *
  *  ---
  *
@@ -346,7 +345,7 @@ guerrilla(struct sctstr *sp)
        uw -= n;
        sp->sct_item[I_UW] = uw;
     }
-  domove:
+domove:
     if (move && che > 0) {
        struct sctstr *nicest_sp = NULL;
        if (convert)
@@ -399,8 +398,7 @@ guerrilla(struct sctstr *sp)
        if (sp->sct_own == target)
            wu(0, target, "  body count: troops: %d, rebels: %d\n", mc, cc);
        else
-           wu(0, target,
-              "  rebels murder %d military\n", mc);
+           wu(0, target, "  rebels murder %d military\n", mc);
        nreport(actor, N_FREEDOM_FIGHT, victim, 1);
     }
     if (sp->sct_own != victim)