From ee2234b03fdc201045261d13b4c9101befbe074d Mon Sep 17 00:00:00 2001 From: Bardur Arantsson Date: Sat, 7 Mar 2015 17:27:02 +0100 Subject: Move PICT* macros from defines.h to spells1.cc --- src/spells1.cc | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'src/spells1.cc') diff --git a/src/spells1.cc b/src/spells1.cc index 594c2e73..dbbf4e24 100644 --- a/src/spells1.cc +++ b/src/spells1.cc @@ -50,6 +50,25 @@ using std::chrono::milliseconds; /* Maximum number of tries for teleporting */ #define MAX_TRIES 100 +/* + * Convert an "attr"/"char" pair into a "pict" (P) + */ +#define PICT(A,C) \ + ((((u16b)(A)) << 8) | ((byte)(C))) + +/* + * Convert a "pict" (P) into an "attr" (A) + */ +#define PICT_A(P) \ + ((byte)((P) >> 8)) + +/* + * Convert a "pict" (P) into an "char" (C) + */ +#define PICT_C(P) \ + ((char)((byte)(P))) + + /* * Helper function -- return a "nearby" race for polymorphing * -- cgit v1.2.3