From 7e6c387db805f791f7bd8bb7c538a444f0d39b20 Mon Sep 17 00:00:00 2001 From: Enno Rehling Date: Wed, 14 Feb 2001 20:09:49 +0000 Subject: [PATCH] const bugfix --- src/common/kernel/battle.c | 6 +++--- src/common/kernel/battle.h | 2 +- src/eressea/main.c | 3 ++- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/common/kernel/battle.c b/src/common/kernel/battle.c index 3b0c3017f..fd763bbd2 100644 --- a/src/common/kernel/battle.c +++ b/src/common/kernel/battle.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: battle.c,v 1.14 2001/02/14 09:17:56 enno Exp $ + * $Id: battle.c,v 1.15 2001/02/14 20:09:48 enno Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -443,7 +443,7 @@ tactics_bonus(troop at, troop dt, boolean attacking) #endif /* NEW_TACTICS */ int -get_unitrow(const fighter * af) +get_unitrow(fighter * af) { static boolean * counted = NULL; static size_t csize = 0; @@ -514,7 +514,7 @@ get_unitrow(const fighter * af) } static int -sort_fighterrow(const fighter ** elem1, const fighter ** elem2) +sort_fighterrow(fighter ** elem1, fighter ** elem2) { int a, b; diff --git a/src/common/kernel/battle.h b/src/common/kernel/battle.h index e2722a707..d61839758 100644 --- a/src/common/kernel/battle.h +++ b/src/common/kernel/battle.h @@ -223,7 +223,7 @@ extern int hits(troop at, troop dt, weapon * awp); extern void damage_building(struct battle *b, struct building *bldg, int damage_abs); extern struct cvector * fighters(struct battle *b, struct fighter *af, int minrow, int maxrow, int mask); extern int countallies(struct side * as); -extern int get_unitrow(const struct fighter * af); +extern int get_unitrow(struct fighter * af); extern boolean helping(struct side * as, struct side * ds); extern void rmtroop(struct troop dt); extern struct region * fleeregion(const struct unit * u); diff --git a/src/eressea/main.c b/src/eressea/main.c index c4598d811..d37d4070f 100644 --- a/src/eressea/main.c +++ b/src/eressea/main.c @@ -1,6 +1,6 @@ /* vi: set ts=2: * - * $Id: main.c,v 1.16 2001/02/14 01:38:51 enno Exp $ + * $Id: main.c,v 1.17 2001/02/14 20:09:49 enno Exp $ * Eressea PB(E)M host Copyright (C) 1998-2000 * Christian Schlittchen (corwin@amber.kn-bremen.de) * Katja Zedel (katze@felidae.kn-bremen.de) @@ -459,6 +459,7 @@ read_args(int argc, char **argv) if (strcmp(argv[i]+1, "nocr")==0) nocr = true; else if (strcmp(argv[i]+2, "nosave")==0) nowrite = true; else if (strcmp(argv[i]+2, "nonr")==0) nonr = true; + else if (strcmp(argv[i]+2, "nocr")==0) nocr = true; else if (strcmp(argv[i]+2, "nomsg")==0) nomsg = true; else if (strcmp(argv[i]+2, "nobattle")==0) nobattle = true; else if (strcmp(argv[i]+2, "nodebug")==0) nobattledebug = true;