Update copyright notice

[empserver] / src / lib / common / nstreval.c

diff --git a/src/lib/common/nstreval.c b/src/lib/common/nstreval.c
index 424efb18a68ab73ab0a7c0147684efb784615603..b7663d81e9737a01c4433ec995b9b45ffff1c402 100644 (file)
--- a/src/lib/common/nstreval.c
+++ b/src/lib/common/nstreval.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  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
@@ -26,7 +26,7 @@
  *  ---
  *
  *  nstreval.c: evaluate compiled values
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
  *     Steve McClure, 1997
@@ -61,12 +61,12 @@ nstr_mksymval(struct valstr *val, struct castr *ca, int idx)
 /*
  * Evaluate VAL.
  * If VAL is symbolic, evaluate it into a promoted value type.
- * Use country CNUM's coordinate system and access control.
+ * Translate it for country CNUM (coordinate system and contact
+ * status), except when CNUM is NATID_BAD.
  * PTR points to a context object of the type that was used to compile
  * the value.
  * Unless WANT is NSC_NOTYPE, coerce the value to promoted value type
- * WANT.  VAL must be coercible.  That's the case if a previous
- * nstr_coerce_val(VAL, WANT, STR) succeeded.
+ * WANT.  VAL must be coercible.
  */
 struct valstr *
 nstr_exec_val(struct valstr *val, natid cnum, void *ptr, enum nsc_type want)
@@ -74,6 +74,7 @@ nstr_exec_val(struct valstr *val, natid cnum, void *ptr, enum nsc_type want)
     char *memb_ptr;
     enum nsc_type valtype;
     int idx;
+    coord c;
     struct natstr *natp;
 
     if (CANT_HAPPEN(want != NSC_NOTYPE && !NSC_IS_PROMOTED(want)))
@@ -85,8 +86,9 @@ nstr_exec_val(struct valstr *val, natid cnum, void *ptr, enum nsc_type want)
        break;
     case NSC_OFF:
        if (val->val_as.sym.get) {
+           natp = getnatp(cnum);
            do {
-               ptr = val->val_as.sym.get(val, cnum, ptr);
+               ptr = val->val_as.sym.get(val, natp, ptr);
            } while (ptr && val->val_as.sym.get);
            if (!ptr) {
                valtype = val->val_type;
@@ -119,20 +121,36 @@ nstr_exec_val(struct valstr *val, natid cnum, void *ptr, enum nsc_type want)
            val->val_as.lng = ((long *)memb_ptr)[idx];
            break;
        case NSC_XCOORD:
-           val->val_as.lng = xrel(getnatp(cnum), ((short *)memb_ptr)[idx]);
+           c = ((short *)memb_ptr)[idx];
+           if (cnum == NATID_BAD) {
+               /* FIXME use variant of xrel() that takes orig instead of nation */
+               if (c >= WORLD_X / 2)
+                   c -= WORLD_X;
+           } else
+               c = xrel(getnatp(cnum), c);
+           val->val_as.lng = c;
            break;
        case NSC_YCOORD:
-           val->val_as.lng = yrel(getnatp(cnum), ((short *)memb_ptr)[idx]);
+           c = ((short *)memb_ptr)[idx];
+           if (cnum == NATID_BAD) {
+               /* FIXME use variant of yrel() that takes orig instead of nation */
+               if (c >= WORLD_Y / 2)
+                   c -= WORLD_Y;
+           } else
+               c = yrel(getnatp(cnum), c);
+           val->val_as.lng = c;
            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];
+           if (opt_HIDDEN && cnum != NATID_BAD) {
+               natp = getnatp(cnum);
+               if (natp->nat_stat != STAT_GOD
+                   && !(getcontact(natp, idx) && getcontact(ptr, idx)))
+                   break;
+           }
+           val->val_as.lng = ((unsigned char *)memb_ptr)[idx];
            break;
        case NSC_FLOAT:
            val->val_as.dbl = ((float *)memb_ptr)[idx];
@@ -167,6 +185,7 @@ nstr_exec_val(struct valstr *val, natid cnum, void *ptr, enum nsc_type want)
        valtype = NSC_NOTYPE;
     }
 
+    /* coerce */
     if (valtype == want)
        ;
     else if (want == NSC_DOUBLE) {
@@ -174,8 +193,7 @@ nstr_exec_val(struct valstr *val, natid cnum, void *ptr, enum nsc_type want)
            valtype = want;
            val->val_as.dbl = val->val_as.lng;
        }
-    } else if (want == NSC_STRING)
-       CANT_REACH();           /* FIXME implement */
+    }
 
     if (CANT_HAPPEN(valtype != want && want != NSC_NOTYPE)) {
        /* make up an error value */