part way through changing player.cpp to add_msg_action
finished modifiying player.cpp
converted melee.cpp over to add_msg_action
fixed ranged.cpp
updated disease.cpp with add_msg stuff
updated iuse.cpp with new add_msg stuff
merged with latest code
merged with latest version; compiles
fixed small bug
Convert ammotype from an enum to a std::string to allow more values.
Change ammo type identifiers to lower case.
Merge player or npc message display.
Refactor handling messages about player or NPCs to be more i18n friendly.
Fix player info menu word wrapping.
Merge branch 'wwfix' of github.com:utunnels/Cataclysm-DDA into wwfix
Use only right alt key to input alt+number combinations.
Intelligence dependent skill rust
Prevent dynamic spawning creatures inside houses.
Made salt more common.
Make counterattacks a free action to avoid counter-locking the player.