client: Unbreak standalone build

[empserver] / include / commodity.h

diff --git a/include/commodity.h b/include/commodity.h
index 512f1d0f3948051fb699cb482ae6148d11dd74ad..8e3a7f20d019cf38aacee65abef2ae9fce6e72fa 100644 (file)
--- a/include/commodity.h
+++ b/include/commodity.h
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2021, 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,32 +14,40 @@
  *  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/>.
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  commodity.h: Definitions for buy/market/sell commands in a time delay
  *               market
- * 
+ *
  *  Known contributors to this file:
  *     Pat Loney, 1992
  *     Steve McClure, 1996
  */
 
-#ifndef _COMMODITY_H_
-#define _COMMODITY_H_
+#ifndef COMMODITY_H
+#define COMMODITY_H
+
+#include "file.h"
+#include "types.h"
+#include "item.h"
 
 struct comstr {
-    short ef_type;
+    /* initial part must match struct empobj */
+    signed ef_type: 8;
+    unsigned com_seqno: 12;
+    unsigned com_generation: 12;
+    int com_uid;
+    time_t com_timestamp;
     natid com_owner;
-    short com_uid;
+    /* end of part matching struct empobj */
     i_type com_type;
     int com_amount;
     float com_price;
@@ -51,9 +59,7 @@ struct comstr {
     coord sell_y;
 };
 
-#define getcomm(n, p) \
-       ef_read(EF_COMM, n, p)
-#define putcomm(n, p) \
-       ef_write(EF_COMM, n, p)
+#define getcomm(n, p) ef_read(EF_COMM, (n), (p))
+#define putcomm(n, p) ef_write(EF_COMM, (n), (p))
 
-#endif /* _COMMODITY_H_ */
+#endif