Fix 2041934: auto-swapping rings and amulets was taking twice as long

as manually swapping (two double-speed turns plus one bogus normal-speed
turn.) This also applied to weapon swapping after butchery.
This fix is rather hackish, better solutions appreciated.


git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@7213 c06c8d41-db1a-0410-9941-cceddc491573

1 files changed, 3 insertions, 5 deletions

diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index 6518045d02..314b1bad7f 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -57,11 +57,9 @@
 #include "view.h"
 #include "xom.h"
 
-#define HIT_WEAK 7
-#define HIT_MED 18
-#define HIT_STRONG 36
-// ... was 5, 12, 21
-// how these are used will be replaced by a function in a second ... :P {dlb}
+const int HIT_WEAK   = 7;
+const int HIT_MED    = 18;
+const int HIT_STRONG = 36;
 
 static void stab_message(monsters *defender, int stab_bonus);