Merge pull request #7 from wito/master

Configurable difficulty level, groundwork for a severe rewrite of how names are handled.
CleverRaven · Jan 15, 2013 · b02078f · b02078f
2 parents cd4f2b7 + 3d86c51
commit b02078f
Show file tree

Hide file tree

Showing 19 changed files with 1,518 additions and 375 deletions.
diff --git a/action.cpp b/action.cpp
@@ -135,6 +135,8 @@ std::string action_ident(action_id act)
    return "organize";
   case ACTION_USE:
    return "apply";
+  case ACTION_USE_WIELDED:
+   return "apply_wielded";
   case ACTION_WEAR:
    return "wear";
   case ACTION_TAKE_OFF:
@@ -172,7 +174,7 @@ std::string action_ident(action_id act)
   case ACTION_CONSTRUCT:
    return "construct";
   case ACTION_DISASSEMBLE:
-   return "disassemble";   
+   return "disassemble";
   case ACTION_SLEEP:
    return "sleep";
   case ACTION_TOGGLE_SAFEMODE:
@@ -269,6 +271,8 @@ std::string action_name(action_id act)
    return "Swap Inventory Letters";
   case ACTION_USE:
    return "Apply or Use Item";
+  case ACTION_USE_WIELDED:
+   return "Apply or Use Wielded Item";
   case ACTION_WEAR:
    return "Wear Item";
   case ACTION_TAKE_OFF:

diff --git a/action.h b/action.h
@@ -29,6 +29,7 @@ ACTION_PEEK,
 ACTION_INVENTORY,
 ACTION_ORGANIZE,
 ACTION_USE,
+ACTION_USE_WIELDED,
 ACTION_WEAR,
 ACTION_TAKE_OFF,
 ACTION_EAT,

diff --git a/data/NAMES_FEMALE b/data/NAMES_FEMALE
diff --git a/data/NAMES_LAST b/data/NAMES_LAST
diff --git a/data/NAMES_MALE b/data/NAMES_MALE