Define common get/put macros for empobj

This turns existing functions get_empobjp() and put_empobj() into
equivalent macros.

diff --git a/include/empobj.h b/include/empobj.h
index 364f8e6600642953901688d79e3489e20b0fe6cd..97dc00e5182aabdffb855e7e3a887aa9064f7157 100644 (file)
--- a/include/empobj.h
+++ b/include/empobj.h
@@ -89,9 +89,11 @@ union empobj_storage {
 
 struct empobj_chr;
 
+#define get_empobj(type, n, p) ef_read((type), (n), (p))
+#define put_empobj(type, n, p) ef_write((type), (n), (p))
+#define get_empobjp(type, n) ((struct empobj *)ef_ptr((type), (n)))
+
 extern char *obj_nameof(struct empobj *gp);
-extern struct empobj *get_empobjp(int type, int id);
-extern int put_empobj(int, int, struct empobj *gp);
 extern struct empobj_chr *get_empobj_chr(struct empobj *gp);
 extern char *emp_obj_chr_name(struct empobj *gp);
 extern int get_empobj_mob_max(int type);

diff --git a/src/lib/subs/empobj.c b/src/lib/subs/empobj.c
index 9df8068248f8412fd1425283d4cb1e7b12d29e4c..3fb59adf6b341a469120f79a249a6d523dbd81ab 100644 (file)
--- a/src/lib/subs/empobj.c
+++ b/src/lib/subs/empobj.c
@@ -57,18 +57,6 @@ obj_nameof(struct empobj *gp)
     return "The Beast #666";
 }
 
-struct empobj *
-get_empobjp(int type, int id)
-{
-    return ef_ptr(type, id);
-}
-
-int
-put_empobj(int type, int id, struct empobj *gp)
-{
-    return ef_write(type, id, gp);
-}
-
 struct empobj_chr *
 get_empobj_chr(struct empobj *gp)
 {