empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Drop macros AGREE_FREE, AGREE_PROPOSED, AGREE_SIGNED

Browse source 
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 <armbru@pond.sub.org>
This commit is contained in:
Markus Armbruster 2020-12-31 05:45:27 +01:00
parent 7714a8cb82
commit 87952c7f7c
3 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

6
include/loan.h
View file

@ -58,9 +58,9 @@ struct lonstr {
time_t l_duedate; /* date after which interest doubles, etc */ time_t l_duedate; /* date after which interest doubles, etc */
}; };
#define LS_FREE AGREE_FREE #define LS_FREE 0
#define LS_PROPOSED AGREE_PROPOSED #define LS_PROPOSED 1
#define LS_SIGNED AGREE_SIGNED #define LS_SIGNED 2
extern double loan_owed(struct lonstr *loan, time_t paytime); extern double loan_owed(struct lonstr *loan, time_t paytime);

4
include/misc.h
View file

@ -108,8 +108,4 @@ extern char *ugetstring(char *prompt, char buf[]);
extern char *prbuf(char *format, ...) extern char *prbuf(char *format, ...)
ATTRIBUTE((format (printf, 1, 2))); ATTRIBUTE((format (printf, 1, 2)));
#define AGREE_FREE 0
#define AGREE_PROPOSED 1
#define AGREE_SIGNED 2
#endif #endif

9
src/lib/global/symbol.c
View file

@ -27,12 +27,13 @@
* symbol.c: Empire symbol tables * symbol.c: Empire symbol tables
* *
* Known contributors to this file: * Known contributors to this file:
* Markus Armbruster, 2006-2016 * Markus Armbruster, 2006-2020
*/ */
#include <config.h> #include <config.h>
#include "land.h" #include "land.h"
#include "loan.h"
#include "misc.h" #include "misc.h"
#include "mission.h" #include "mission.h"
#include "nat.h" #include "nat.h"
@ -46,9 +47,9 @@
#include "ship.h" #include "ship.h"
struct symbol agreement_statuses[] = { struct symbol agreement_statuses[] = {
{AGREE_FREE, "free"}, {LS_FREE, "free"},
{AGREE_PROPOSED, "proposed"}, {LS_PROPOSED, "proposed"},
{AGREE_SIGNED, "signed"}, {LS_SIGNED, "signed"},
{0, NULL} {0, NULL}
}; };