Update copyright notice

[empserver] / src / lib / update / bp.c

diff --git a/src/lib/update/bp.c b/src/lib/update/bp.c
index 43534566f04924d1a490f35cee915dc4e361ae1f..f743c6bfdb6e8beb33ea72429108154d65bf502e 100644 (file)
--- a/src/lib/update/bp.c
+++ b/src/lib/update/bp.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2007, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2014, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire 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
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  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
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,7 +25,7 @@
  *  ---
  *
  *  bp.c: The `build pointer' (bp) map
- * 
+ *
  *  Known contributors to this file:
  *     Ville Virrankoski, 1996
  *     Markus Armbruster, 2007
@@ -71,7 +70,7 @@ static enum bp_item_idx bud_key[I_MAX + 1] = {
 static struct bp *
 bp_ref(struct bp *bp, struct sctstr *sp)
 {
-    return &bp[sp->sct_x + sp->sct_y * WORLD_X];
+    return &bp[sp->sct_uid];
 }
 
 /*
@@ -98,6 +97,21 @@ bp_put_item(struct bp *bp, struct sctstr *sp, i_type comm, int amount)
        bp_ref(bp, sp)->bp_item[idx] = amount;
 }
 
+/* Set the item values tracked in BP for sector SP from VEC.  */
+void
+bp_put_items(struct bp *bp, struct sctstr *sp, short *vec)
+{
+    enum bp_item_idx idx;
+    struct bp *p = bp_ref(bp, sp);
+    i_type i;
+
+    for (i = I_NONE + 1; i <= I_MAX; i++) {
+       idx = bud_key[i];
+       if (idx >= 0)
+           p->bp_item[idx] = vec[i];
+    }
+}
+
 /* Return avail tracked in BP for sector SP.  */
 int
 bp_get_avail(struct bp *bp, struct sctstr *sp)
@@ -116,16 +130,8 @@ bp_put_avail(struct bp *bp, struct sctstr *sp, int amount)
 void
 bp_set_from_sect(struct bp *bp, struct sctstr *sp)
 {
-    enum bp_item_idx idx;
-    struct bp *p = bp_ref(bp, sp);
-    i_type i;
-
-    for (i = I_NONE + 1; i <= I_MAX; i++) {
-       idx = bud_key[i];
-       if (idx >= 0)
-           p->bp_item[idx] = sp->sct_item[i];
-    }
-    p->bp_avail = sp->sct_avail;
+    bp_put_items(bp, sp, sp->sct_item);
+    bp_put_avail(bp, sp, sp->sct_avail);
 }
 
 /*
@@ -135,5 +141,5 @@ bp_set_from_sect(struct bp *bp, struct sctstr *sp)
 struct bp *
 bp_alloc(void)
 {
-    return calloc(WORLD_X * WORLD_Y, sizeof(struct bp));
+    return calloc(WORLD_SZ(), sizeof(struct bp));
 }