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

(nsc_type): New member NSC_HIDDEN.

Browse source 
(meta_type): Add its entry.
(setnum, nstr_promote, nstr_exec_val): Deal with it.  nstr_exec_val()
implements opt_HIDDEN by mapping unknown values to -1.
(natstr, nat_ca): Use it for member nat_relate.  This also halves its
size.  Fixes very minor leak: before, player could see relations to
all countries, regardless of contact.
(nation_relations): Add entry for -1.
This commit is contained in:
Markus Armbruster 2006-05-18 19:02:04 +00:00
parent 6844c94b4a
commit 75604d817c
6 changed files with 23 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/lib/subs/nstr.c
View file

@ -40,6 +40,7 @@
#include "file.h"
#include "match.h"
#include "nsc.h"
#include "optlist.h"
#include "prototypes.h"
static char *nstr_parse_val(char *, struct valstr *);
@ -500,6 +501,7 @@ nstr_promote(int valtype)
case NSC_INT:
case NSC_XCOORD:
case NSC_YCOORD:
case NSC_HIDDEN:
case NSC_TIME:
valtype = NSC_LONG;
break;
@ -562,9 +564,10 @@ nstr_coerce_val(struct valstr *val, nsc_type to, char *str)
}
if (val->val_cat == NSC_VAL) {
/* coord literals don't occur, conversion not implemented */
/* unimplemented conversions; don't currently occur here */
CANT_HAPPEN(val->val_type == NSC_XCOORD
|| val->val_type == NSC_YCOORD);
|| val->val_type == NSC_YCOORD
|| val->val_type == NSC_HIDDEN);
val->val_type = to;
}
@ -587,6 +590,7 @@ nstr_exec_val(struct valstr *val, natid cnum, void *ptr, nsc_type want)
char *memb_ptr;
nsc_type valtype;
int idx;
struct natstr *natp;
switch (val->val_cat) {
default:
@ -625,6 +629,16 @@ nstr_exec_val(struct valstr *val, natid cnum, void *ptr, nsc_type want)
case NSC_YCOORD:
val->val_as.lng = yrel(getnatp(cnum), ((short *)memb_ptr)[idx]);
break;
case NSC_HIDDEN:
val->val_as.lng = -1;
if (CANT_HAPPEN(((struct natstr *)ptr)->ef_type != EF_NATION))
break;
natp = getnatp(cnum);
if (!opt_HIDDEN
|| natp->nat_stat == STAT_GOD
|| (getcontact(natp, idx) && getcontact(ptr, idx)))
val->val_as.lng = ((unsigned char *)memb_ptr)[idx];
break;
case NSC_FLOAT:
val->val_as.dbl = ((float *)memb_ptr)[idx];
valtype = NSC_DOUBLE;