/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2020, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure, Markus Armbruster
*
* Empire is free software: you can redistribute it and/or modify
*
* Known contributors to this file:
* Dave Pare, 1989
- * Markus Armbruster, 2009-2011
+ * Markus Armbruster, 2009-2020
*/
#include <config.h>
#include "player.h"
#include "xy.h"
#include "nsc.h"
-#include "file.h"
#include "prototypes.h"
#include "unit.h"
/*
* Initialize @np to iterate over the items of type @type in a carrier.
- * The carrier has file type @carrier_type and uid @carrier_uid.
+ * The carrier has file type @carrier_type and UID @carrier_uid.
* Note: you can take an item gotten with nxtitem() off its carrier
* without disturbing the iterator. Whether the iterator will pick up
* stuff you load onto the carrier during iteration is unspecified.
if (!player->condarg)
return 1;
- n = nstr_comp(np->cond, sizeof(np->cond) / sizeof(*np->cond),
+ n = nstr_comp(np->cond, ARRAY_SIZE(np->cond),
np->type, player->condarg);
if (n < 0)
return 0;