merged DT/add-troll-char

src/characters.cc

@@ -201,6 +201,6 @@ result character::move(const direction dir,
         return result::fine;
 }
 
-int calc_dmg(const int ATK, const int DEF) {
+int character::calc_dmg(const int ATK, const int DEF) {
         return ceil((100.0f / (100.0f + DEF)) * ATK);
 }