diff --git a/s/runtests b/s/runtests index d0b3432e8..2f22402dc 100755 --- a/s/runtests +++ b/s/runtests @@ -20,6 +20,6 @@ $ROOT/$BUILD/eressea/eressea -v0 scripts/run-tests.lua $ROOT/$BUILD/eressea/eressea -v0 scripts/run-tests-e2.lua $ROOT/$BUILD/eressea/eressea -v0 scripts/run-tests-e3.lua $ROOT/$BUILD/eressea/eressea -v0 scripts/run-tests-e4.lua -rm -rf data reports orders.txt score score.alliances +rm -rf data reports orders.txt score score.alliances datum turn cd $OLDWPD diff --git a/src/kernel/save.c b/src/kernel/save.c index bffc339f9..b9b522794 100644 --- a/src/kernel/save.c +++ b/src/kernel/save.c @@ -1858,12 +1858,6 @@ static void clear_npc_orders(faction *f) } } -int version_no(const char *str) { - int maj = 0, min = 0, bld = 0; - sscanf(str, "%d.%d.%d", &maj, &min, &bld); - return (maj << 16) | (min << 8) | bld; -} - int writegame(const char *filename) { int n; diff --git a/src/kernel/save.h b/src/kernel/save.h index 27dd56661..3cd443926 100644 --- a/src/kernel/save.h +++ b/src/kernel/save.h @@ -79,7 +79,6 @@ extern "C" { int write_game(struct gamedata *data); int read_game(struct gamedata *data); - int version_no(const char *str); /* test-only functions that give access to internal implementation details (BAD) */ void _test_write_password(struct gamedata *data, const struct faction *f); diff --git a/src/kernel/save.test.c b/src/kernel/save.test.c index 95acbd4c0..00b5ff96c 100644 --- a/src/kernel/save.test.c +++ b/src/kernel/save.test.c @@ -5,6 +5,7 @@ #include #include "save.h" +#include "version.h" #include "unit.h" #include "group.h" #include "ally.h" diff --git a/src/kernel/version.c b/src/kernel/version.c index 95d61f014..ffc8177b1 100644 --- a/src/kernel/version.c +++ b/src/kernel/version.c @@ -1,5 +1,7 @@ #include "version.h" +#include + #ifndef ERESSEA_VERSION // the version number, if it was not passed to make with -D #define ERESSEA_VERSION "3.10.0-devel" @@ -8,3 +10,9 @@ const char *eressea_version(void) { return ERESSEA_VERSION; } + +int version_no(const char *str) { + int maj = 0, min = 0, bld = 0; + sscanf(str, "%d.%d.%d", &maj, &min, &bld); + return (maj << 16) | (min << 8) | bld; +} diff --git a/src/kernel/version.h b/src/kernel/version.h index f71177f9f..c268e7bac 100644 --- a/src/kernel/version.h +++ b/src/kernel/version.h @@ -1,13 +1,17 @@ +#pragma once /* +-------------------+ | | Enno Rehling | Eressea PBEM host | Katja Zedel - | (c) 1998 - 2007 | Christian Schlittchen - | | + | (c) 1998 - 2016 | Christian Schlittchen + | | https://github.com/eressea/server +-------------------+ - - This program may not be used, modified or distributed - without prior permission by the authors of Eressea. */ +#ifndef H_KERNEL_VERSION +#define H_KERNEL_VERSION + const char *eressea_version(void); +int version_no(const char *str); + +#endif