Extend the common header of struct empobj to include uid

[empserver] / include / commodity.h

diff --git a/include/commodity.h b/include/commodity.h
index 730ab083cda37d96a19d34e5bbffa9cf575d1095..46a038eb8c96f3b111abb9be244d56954c3cfe46 100644 (file)
--- a/include/commodity.h
+++ b/include/commodity.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
@@ -33,14 +33,20 @@
  *     Steve McClure, 1996
  */
 
-#ifndef _COMMODITY_H_
-#define _COMMODITY_H_
+#ifndef COMMODITY_H
+#define COMMODITY_H
+
+#include <time.h>
+#include "types.h"
+#include "item.h"
 
 struct comstr {
+    /* initial part must match struct empobj */
     short ef_type;
-    natid com_owner;
     short com_uid;
-    int com_type;
+    natid com_owner;
+    /* end of part matching struct empobj */
+    i_type com_type;
     int com_amount;
     float com_price;
     int com_maxbidder;
@@ -51,9 +57,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