From 1e64ece1f5a5e7d82e068812766426a79bbb9ff6 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Thu, 31 Dec 2020 05:45:27 +0100 Subject: [PATCH] Drop macros AGREE_FREE, AGREE_PROPOSED, AGREE_SIGNED Commit 555de3100 (v4.3.0) added these macros so xdump tables loan and treaty can share an agreement_statuses table. Treaties are gone since commit a109de948 (v4.3.33). Drop the macros. Signed-off-by: Markus Armbruster --- include/loan.h | 6 +++--- include/misc.h | 4 ---- src/lib/global/symbol.c | 9 +++++---- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/include/loan.h b/include/loan.h index 16f432481..c4819cf65 100644 --- a/include/loan.h +++ b/include/loan.h @@ -58,9 +58,9 @@ struct lonstr { time_t l_duedate; /* date after which interest doubles, etc */ }; -#define LS_FREE AGREE_FREE -#define LS_PROPOSED AGREE_PROPOSED -#define LS_SIGNED AGREE_SIGNED +#define LS_FREE 0 +#define LS_PROPOSED 1 +#define LS_SIGNED 2 extern double loan_owed(struct lonstr *loan, time_t paytime); diff --git a/include/misc.h b/include/misc.h index b580633ae..9f4771b3e 100644 --- a/include/misc.h +++ b/include/misc.h @@ -108,8 +108,4 @@ extern char *ugetstring(char *prompt, char buf[]); extern char *prbuf(char *format, ...) ATTRIBUTE((format (printf, 1, 2))); -#define AGREE_FREE 0 -#define AGREE_PROPOSED 1 -#define AGREE_SIGNED 2 - #endif diff --git a/src/lib/global/symbol.c b/src/lib/global/symbol.c index 24f658d50..9101fa15a 100644 --- a/src/lib/global/symbol.c +++ b/src/lib/global/symbol.c @@ -27,12 +27,13 @@ * symbol.c: Empire symbol tables * * Known contributors to this file: - * Markus Armbruster, 2006-2016 + * Markus Armbruster, 2006-2020 */ #include #include "land.h" +#include "loan.h" #include "misc.h" #include "mission.h" #include "nat.h" @@ -46,9 +47,9 @@ #include "ship.h" struct symbol agreement_statuses[] = { - {AGREE_FREE, "free"}, - {AGREE_PROPOSED, "proposed"}, - {AGREE_SIGNED, "signed"}, + {LS_FREE, "free"}, + {LS_PROPOSED, "proposed"}, + {LS_SIGNED, "signed"}, {0, NULL} }; -- 2.43.0