Update copyright notice

[empserver] / src / lib / subs / move.c

diff --git a/src/lib/subs/move.c b/src/lib/subs/move.c
index ac06d7d2cfe9d4d3e8bbe084df6ff2a5401f8e3a..4c0d53a6f98deb25676ce4923e88dc9b42e8f81e 100644 (file)
--- a/src/lib/subs/move.c
+++ b/src/lib/subs/move.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2013, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2014, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -27,12 +27,13 @@
  *  move.c: Move something somewhere.
  *
  *  Known contributors to this file:
- *     Markus Armbruster, 2004-2011
+ *     Markus Armbruster, 2004-2012
  */
 
 #include <config.h>
 
 #include <ctype.h>
+#include "chance.h"
 #include "damage.h"
 #include "file.h"
 #include "map.h"
@@ -64,7 +65,6 @@ move_ground(struct sctstr *start, struct sctstr *end,
     int dir;
     char scanspace[1024];
     char *argp[128];
-    int intcost;
     int takedam = *dam;
     int out = 0;
     char prompt[128];
@@ -255,16 +255,11 @@ move_ground(struct sctstr *start, struct sctstr *end,
            break;
     }
     *end = sect;
-    intcost = (int)total_mcost;
-    if (intcost < 0)
-       return -1;
     if ((start->sct_x == end->sct_x) && (start->sct_y == end->sct_y)
        && !out)
        return -1;
 
-    if (chance(total_mcost - intcost))
-       intcost++;
-    return intcost;
+    return roundavg(total_mcost);
 }