Extract newgame character restrictions from newgame.cc.

The functions in the new ng-restr.cc are "pure": They don't
access global state; data is passed in via the new and
incomplete newgame_def.

Eventually, new_game should be split into something like
  newgame_def choose_game();
that doesn't access "you", and
  void setup_game(newgame_def);
that sets up the player.

Also get rid of player_size in favour of player::body_size. Rename
player_size_type to size_part_type since it's not really
player-specific (used in actor::body_size). Move parts of
player_genus, player::has_claws, body_size out into species.cc.

1 files changed, 3 insertions, 3 deletions

diff --git a/crawl-ref/source/fight.cc b/crawl-ref/source/fight.cc
index a1d8bbc914..f544fbd617 100644
--- a/crawl-ref/source/fight.cc
+++ b/crawl-ref/source/fight.cc
@@ -4014,7 +4014,7 @@ int melee_attack::player_calc_base_weapon_damage()
     // effective.
     if (shield && weapon->base_type == OBJ_WEAPONS
         && weapon_skill(*weapon) == SK_STAVES
-        && hands_reqd(*weapon, player_size()) == HANDS_HALF)
+        && hands_reqd(*weapon, you.body_size()) == HANDS_HALF)
     {
         damage /= 2;
     }
@@ -5479,7 +5479,7 @@ int weapon_str_weight( object_class_type wpn_class, int wpn_type )
     int  ret;
 
     const int wpn_skill  = weapon_skill( wpn_class, wpn_type );
-    const int hands      = hands_reqd( wpn_class, wpn_type, player_size() );
+    const int hands      = hands_reqd( wpn_class, wpn_type, you.body_size() );
 
     // These are low values, because we'll be adding some bonus to the
     // larger weapons later.  Remember also that 1-1/2-hand weapons get
@@ -5550,7 +5550,7 @@ static inline int player_weapon_str_weight()
 
     int ret = weapon_str_weight(weapon->base_type, weapon->sub_type);
 
-    if (hands_reqd(*weapon, player_size()) == HANDS_HALF && !you.shield())
+    if (hands_reqd(*weapon, you.body_size()) == HANDS_HALF && !you.shield())
         ret += 1;
 
     return (ret);