Move melee_attack properties to attack

Moves some artefact properties I thought I wasn't going to need for the general
attack class from melee_attack into attack since any attacking weapon could
potentially be an attacking weapon.

1 files changed, 8 insertions, 0 deletions

diff --git a/crawl-ref/source/attack.h b/crawl-ref/source/attack.h
index ada558babc..2179445513 100644
--- a/crawl-ref/source/attack.h
+++ b/crawl-ref/source/attack.h
@@ -1,6 +1,7 @@
 #ifndef ATTACK_H
 #define ATTACK_H
 
+#include "artefact.h"
 #include "itemprop-enum.h"
 
 // Used throughout inheriting classes, define them here for universal access
@@ -62,6 +63,13 @@ public:
     hands_reqd_type hands;
     bool            hand_half_bonus;
 
+    // If weapon is an artefact, its properties.
+    artefact_properties_t art_props;
+
+    // If a weapon is an unrandart, its unrandart entry.
+    // TODO: replace with *weapon references in attack
+    unrandart_entry *unrand_entry;
+
     int     attacker_to_hit_penalty;
 
     // Attack messages