Update copyright notice

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

diff --git a/src/lib/update/bp.c b/src/lib/update/bp.c
index b2dcf94112b42427a9f2c70ee1878972d91e4a2b..1aee7989994cdf09306b193b6fae6a22a46f61dd 100644 (file)
--- a/src/lib/update/bp.c
+++ b/src/lib/update/bp.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -41,8 +41,12 @@
 #include <config.h>
 
 #include <stdlib.h>
+#include "empobj.h"
 #include "optlist.h"
+#include "player.h"
+#include "prototypes.h"
 #include "update.h"
+#include "xy.h"
 
 /* Item types we want to track. */
 enum bp_item_idx {
@@ -51,6 +55,12 @@ enum bp_item_idx {
     BP_MAX = BP_HCM
 };
 
+enum bp_status {
+    BP_UNUSED,                 /* not tracked, values are invalid */
+    BP_WANTED,                 /* tracked, values are still invalid */
+    BP_USED                    /* tracked, values are valid */
+};
+
 /*
  * Stuff to track for a sector.
  * A bp map is an array of these.
@@ -58,7 +68,7 @@ enum bp_item_idx {
 struct bp {
     short bp_item[BP_MAX + 1];
     short bp_avail;
-    unsigned char bp_tracked;
+    unsigned char bp_status;
 };
 
 /* Map i_type to enum bp_item_idx. */
@@ -68,6 +78,33 @@ static enum bp_item_idx bud_key[I_MAX + 1] = {
     BP_LCM, BP_HCM, BP_NONE, BP_NONE
 };
 
+/* Return true when @bp doesn't track @sp. */
+int
+bp_skip_sect(struct bp *bp, struct sctstr *sp)
+{
+    return bp && bp[sp->sct_uid].bp_status == BP_UNUSED;
+}
+
+/* Return true when @bp doesn't track @unit's sector. */
+int
+bp_skip_unit(struct bp *bp, struct empobj *unit)
+{
+    return bp && bp[XYOFFSET(unit->x, unit->y)].bp_status == BP_UNUSED;
+}
+
+/* If @unit belongs to the player, start tracking its sector in @bp. */
+void
+bp_consider_unit(struct bp *bp, struct empobj *unit)
+{
+    int id;
+
+    if (!bp || unit->own != player->cnum)
+       return;
+    id = XYOFFSET(unit->x, unit->y);
+    if (bp[id].bp_status == BP_UNUSED)
+       bp[id].bp_status = BP_WANTED;
+}
+
 /* Set the values tracked in @bp for sector @sp to the values in @sp. */
 void
 bp_set_from_sect(struct bp *bp, struct sctstr *sp)
@@ -83,11 +120,11 @@ bp_set_from_sect(struct bp *bp, struct sctstr *sp)
            bp[sp->sct_uid].bp_item[idx] = sp->sct_item[i];
     }
     bp[sp->sct_uid].bp_avail = sp->sct_avail;
-    bp[sp->sct_uid].bp_tracked = 1;
+    bp[sp->sct_uid].bp_status = BP_USED;
 }
 
 /*
- * Copy the values tracked in @bp for sector @sp back to @sp.
+ * Copy the values tracked in @bp for sector @sp back to it.
  * Values must have been set with bp_set_from_sect().
  */
 void
@@ -96,7 +133,7 @@ bp_to_sect(struct bp *bp, struct sctstr *sp)
     i_type i;
     enum bp_item_idx idx;
 
-    if (CANT_HAPPEN(!bp[sp->sct_uid].bp_tracked))
+    if (CANT_HAPPEN(bp[sp->sct_uid].bp_status != BP_USED))
        return;
 
     for (i = I_NONE + 1; i <= I_MAX; i++) {
@@ -110,6 +147,7 @@ bp_to_sect(struct bp *bp, struct sctstr *sp)
 /*
  * Return a new bp map.
  * Caller should pass it to free() when done with it.
+ * The map initially tracks the sectors belonging to the player.
  */
 struct bp *
 bp_alloc(void)
@@ -119,6 +157,8 @@ bp_alloc(void)
     int i;
 
     for (i = 0; i < n; i++)
-       bp[i].bp_tracked = 0;
+       bp[i].bp_status = getsectid(i)->sct_own == player->cnum
+           ? BP_WANTED : BP_UNUSED;
+
     return bp;
 }