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

Document tables EF_COMM, EF_TRADE and EF_COUNTRY have an owner

Browse source 
xdvisible() relies on that.

Set EFF_OWNER in the table definitions.  EFF_OWNER is not actually
used right now, so this doesn't fix anything broken.
This commit is contained in:
Markus Armbruster 2008-02-25 20:37:01 +01:00
parent 0a570bc4bf
commit aef790f7f3
3 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/commodity.h
View file

@ -41,9 +41,11 @@
#include "item.h" #include "item.h"
struct comstr { struct comstr {
/* initial part must match struct empobj */
short ef_type; short ef_type;
natid com_owner; natid com_owner;
short com_uid; short com_uid;
/* end of part matching struct empobj */
i_type com_type; i_type com_type;
int com_amount; int com_amount;
float com_price; float com_price;

2
include/trade.h
View file

@ -41,9 +41,11 @@
#include "types.h" #include "types.h"
struct trdstr { struct trdstr {
/* initial part must match struct empobj */
short ef_type; short ef_type;
natid trd_owner; natid trd_owner;
short trd_uid; short trd_uid;
/* end of part matching struct empobj */
short trd_type; short trd_type;
short trd_unitid; short trd_unitid;
long trd_price; long trd_price;

7
src/lib/global/file.c
View file

@ -131,7 +131,7 @@ struct empfile empfile[] = {
{EF_TREATY, "treaty", "treaty", treaty_ca, {EF_TREATY, "treaty", "treaty", treaty_ca,
UNMAPPED_CACHE(struct trtstr, 0)}, UNMAPPED_CACHE(struct trtstr, 0)},
{EF_TRADE, "trade", "trade", trade_ca, {EF_TRADE, "trade", "trade", trade_ca,
UNMAPPED_CACHE(struct trdstr, 0)}, UNMAPPED_CACHE(struct trdstr, EFF_OWNER)},
{EF_POWER, "pow", "power", NULL, {EF_POWER, "pow", "power", NULL,
UNMAPPED_CACHE(struct powstr, 0)}, UNMAPPED_CACHE(struct powstr, 0)},
{EF_NATION, "nat", "nation", nat_ca, {EF_NATION, "nat", "nation", nat_ca,
@ -143,7 +143,7 @@ struct empfile empfile[] = {
{EF_BMAP, "bmap", "bmap", NULL, {EF_BMAP, "bmap", "bmap", NULL,
0, 0, NULL, 0, 0, 0, 0, -1, NULL, NULL, NULL}, 0, 0, NULL, 0, 0, 0, 0, -1, NULL, NULL, NULL},
{EF_COMM, "commodity", "commodity", commodity_ca, {EF_COMM, "commodity", "commodity", commodity_ca,
UNMAPPED_CACHE(struct comstr, 0)}, UNMAPPED_CACHE(struct comstr, EFF_OWNER)},
{EF_LOST, "lost", "lostitems", lost_ca, {EF_LOST, "lost", "lostitems", lost_ca,
UNMAPPED_CACHE(struct loststr, EFF_OWNER)}, UNMAPPED_CACHE(struct loststr, EFF_OWNER)},
{EF_REALM, "realm", "realms", realm_ca, {EF_REALM, "realm", "realms", realm_ca,
@ -214,7 +214,8 @@ struct empfile empfile[] = {
SYMTAB(EF_TREATY_FLAGS, "treaty-flags", treaty_flags), SYMTAB(EF_TREATY_FLAGS, "treaty-flags", treaty_flags),
/* Views */ /* Views */
{EF_COUNTRY, "country", NULL, cou_ca, UNMAPPED_CACHE(struct natstr, 0)}, {EF_COUNTRY, "country", NULL, cou_ca,
UNMAPPED_CACHE(struct natstr, EFF_OWNER)},
/* Sentinel */ /* Sentinel */
{EF_BAD, NULL, NULL, NULL, 0, 0, NULL, 0, 0, 0, 0, -1, NULL, NULL, NULL}, {EF_BAD, NULL, NULL, NULL, 0, 0, NULL, 0, 0, 0, 0, -1, NULL, NULL, NULL},