merged AL-races

src/characters.h

@@ -9,11 +9,14 @@
 #include <vector>
 #include <string>
 #include <memory>
+#include <math.h>
+
 #include "constants.h"
 #include "position.h"
 #include "layer.h"
 #include "objects.h"
 #include "rng.h"
+
 // #include "inventory.h" // Reserved for later
 
 class character; // forward declaration
@@ -77,7 +80,7 @@ protected:
         int gold; // characters spawn with gold
         // inventory inventory; // Reserved
 
-        float base_hitrate; // requires: between [0,1]
+        float base_hit_rate; // requires: between [0,1]
 
         bool hostile;
 };
@@ -86,4 +89,7 @@ protected:
 position_list remove_from_list(const position_list &sorted_positions,
                                position_list excluded);
 
+
+int calc_dmg(const int ATK, const int DEF);
+
 #endif