WIP empdump, %a

[empserver] / include / power.h

diff --git a/include/power.h b/include/power.h
index 981cbc96e3c3ffb09be1afdfa19c659acdd59086..41a54ff8a70f5b5eb2fd3dcf546f4c3b9f82d1d5 100644 (file)
--- a/include/power.h
+++ b/include/power.h
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, 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.
  *
  *  ---
  *
@@ -31,8 +31,10 @@
  *     
  */
 
-#ifndef _POWER_H_
-#define _POWER_H_
+#ifndef POWER_H
+#define POWER_H
+
+#include "types.h"
 
 struct powstr {
     natid p_nation;
@@ -55,11 +57,8 @@ struct powstr {
     float p_power;
 };
 
-#define getpower(n, p) \
-       ef_read(EF_POWER, n, p)
-#define putpower(n, p) \
-       ef_write(EF_POWER, n, p)
-#define getpowerp(n) \
-       (struct powstr *) ef_ptr(EF_POWER, n)
+#define getpower(n, p) ef_read(EF_POWER, (n), (p))
+#define putpower(n, p) ef_write(EF_POWER, (n), (p))
+#define getpowerp(n) ((struct powstr *)ef_ptr(EF_POWER, (n)))
 
-#endif /* _POWER_H_ */
+#endif