diff --git a/src/monsters.c b/src/monsters.c index 0b1bb7902..01ebbe8cd 100644 --- a/src/monsters.c +++ b/src/monsters.c @@ -495,7 +495,7 @@ static order *make_movement_order(unit * u, const region * target, int moves, { region *r = u->region; region **plan; - int bytes, position = 0; + int position = 0; char zOrder[128], *bufp = zOrder; size_t size = sizeof(zOrder) - 1; @@ -507,6 +507,7 @@ static order *make_movement_order(unit * u, const region * target, int moves, return NULL; while (position != moves && plan[position + 1]) { + int bytes; region *prev = plan[position]; region *next = plan[++position]; direction_t dir = reldirection(prev, next); diff --git a/src/util/lists.c b/src/util/lists.c index 9e4b3a493..81f9c9ab2 100644 --- a/src/util/lists.c +++ b/src/util/lists.c @@ -12,7 +12,7 @@ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN -ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +ACTION OF CONTRACT, NEGLIGENCE OR OTH19ER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. **/ diff --git a/src/util/lists.h b/src/util/lists.h index 75920c5d4..7fd0ca034 100644 --- a/src/util/lists.h +++ b/src/util/lists.h @@ -22,8 +22,6 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. extern "C" { #endif -#include - typedef struct strlist { struct strlist *next; char *s; diff --git a/src/util/log.c b/src/util/log.c index a007a3b2b..5d95d0ea7 100644 --- a/src/util/log.c +++ b/src/util/log.c @@ -10,10 +10,7 @@ This program may not be used, modified or distributed without prior permission by the authors of Eressea. */ #include - -#include "bsdstring.h" #include "log.h" -#include "path.h" #include "unicode.h" #include diff --git a/src/util/message.c b/src/util/message.c index a502f833f..831ab23f8 100644 --- a/src/util/message.c +++ b/src/util/message.c @@ -11,7 +11,6 @@ */ -#include #include "message.h" #include "strings.h" diff --git a/src/util/variant.c b/src/util/variant.c index af5d690f4..dd8b16151 100644 --- a/src/util/variant.c +++ b/src/util/variant.c @@ -1,7 +1,5 @@ -#include #include "variant.h" -#include #include #include