Markus Armbruster
0ba61f1714
Member nws_uid is unused since the commit before previous. Remove it. Member nws_seqno is of marginal value, because we write news only through ncache[], and thus aren't prone to the errors sequence numbers can catch. Remove it. Make timestamp selector virtual, computing nws_when + nws_duration, and remove member nws_timestamp. Impact: * In ncache(), the removed timestamp equals nws_when + nws_duration, both for new news and updated news. No change. * delete_old_news() becomes invisible. Before, its move of unexpired news to the beginning of the news file touched all the timestamps. That was unwanted, because the move does not change news, only their storage. Improvement. * empdump no longer flags the imported news changed via the timestamp. This is somewhat unfortunate. Document as bug. With these members removed, struct nwsstr no longer matches struct emptypedstr, so clear news table flag EFF_TYPED and remove union empobj_storage member news. This loses the automatic maintenance of member ef_type via struct emptypedstr. Remove ef_type as well. This shrinks struct nwsstr from 20 to 12 bytes on common 32 bit machines, and from 32 to 16 bytes on common 64 bit machines. Since the server doesn't map the whole news file (EFF_MAP is off), this reduces I/O, while the table's memory use remains the same. Historical note: struct nwsstr is now pretty much what it was back in BSD Empire 1.1. Members ef_type and nws_uid go back to Empire 3 (for C_SYNC?). v4.3.12 added member nws_timestamp, which doubled the size on common 64 bit machines. v4.3.15 added nws_seqno.
107 lines
3.1 KiB
C
107 lines
3.1 KiB
C
/*
|
|
* Empire - A multi-player, client/server Internet based war game.
|
|
* Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
|
|
* Ken Stevens, Steve McClure
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* This program is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with this program; if not, write to the Free Software
|
|
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
|
|
*
|
|
* ---
|
|
*
|
|
* See files README, COPYING and CREDITS in the root of the source
|
|
* tree for related information and legal notices. It is expected
|
|
* that future projects/authors will amend these files as needed.
|
|
*
|
|
* ---
|
|
*
|
|
* empobj.h: General empire objects.
|
|
*
|
|
* Known contributors to this file:
|
|
* Ron Koenderink, 2006
|
|
* Markus Armbruster, 2006-2008
|
|
*/
|
|
|
|
#ifndef EMPOBJ_H
|
|
#define EMPOBJ_H
|
|
|
|
#include "commodity.h"
|
|
#include "game.h"
|
|
#include "land.h"
|
|
#include "loan.h"
|
|
#include "lost.h"
|
|
#include "nat.h"
|
|
#include "news.h"
|
|
#include "nuke.h"
|
|
#include "plane.h"
|
|
#include "sect.h"
|
|
#include "ship.h"
|
|
#include "trade.h"
|
|
#include "treaty.h"
|
|
#include "types.h"
|
|
|
|
struct empobj {
|
|
/*
|
|
* initial part must match struct emptypedstr
|
|
* valid if EFF_TYPED is set in table's flags
|
|
*/
|
|
short ef_type;
|
|
short uid;
|
|
unsigned seqno;
|
|
time_t timestamp;
|
|
/* end of part matching struct emptypedstr */
|
|
natid own; /* valid if EFF_OWNER is in table's flags */
|
|
coord x; /* valid if EFF_XY is in table's flags */
|
|
coord y; /* valid if EFF_XY is in table's flags */
|
|
signed char type; /* valid for sectors and units */
|
|
/* remaining are valid for units */
|
|
signed char effic;
|
|
signed char mobil;
|
|
unsigned char off;
|
|
short tech;
|
|
char group; /* valid if EFF_GROUP is in table's flags */
|
|
coord opx, opy;
|
|
short mission;
|
|
short radius;
|
|
};
|
|
|
|
union empobj_storage {
|
|
short ef_type;
|
|
struct empobj gen;
|
|
struct comstr comm;
|
|
struct gamestr game;
|
|
struct lndstr land;
|
|
struct lonstr loan;
|
|
struct loststr lost;
|
|
struct natstr nat;
|
|
struct nukstr nuke;
|
|
struct plnstr plane;
|
|
struct realmstr realm;
|
|
struct sctstr sect;
|
|
struct shpstr ship;
|
|
struct trdstr trade;
|
|
struct trtstr treaty;
|
|
};
|
|
|
|
struct empobj_chr;
|
|
|
|
#define get_empobj(type, n, p) ef_read((type), (n), (p))
|
|
#define put_empobj(type, n, p) ef_write((type), (n), (p))
|
|
#define get_empobjp(type, n) ((struct empobj *)ef_ptr((type), (n)))
|
|
|
|
extern char *obj_nameof(struct empobj *gp);
|
|
extern struct empobj_chr *get_empobj_chr(struct empobj *gp);
|
|
extern char *empobj_chr_name(struct empobj *gp);
|
|
extern int get_empobj_mob_max(int type);
|
|
|
|
#endif
|