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, 2 insertions, 10 deletions

diff --git a/crawl-ref/source/player.h b/crawl-ref/source/player.h
index d44e5dbfe7..687615a6eb 100644
--- a/crawl-ref/source/player.h
+++ b/crawl-ref/source/player.h
@@ -10,6 +10,7 @@
 
 #include "actor.h"
 #include "itemprop.h"
+#include "species.h"
 
 #ifdef USE_TILE
 // This used to be in tiles.h. (jpeg)
@@ -335,7 +336,7 @@ public:
     bool      extra_balanced() const;
     bool      can_pass_through_feat(dungeon_feature_type grid) const;
     bool      is_habitable_feat(dungeon_feature_type actual_grid) const;
-    size_type body_size(int psize = PSIZE_TORSO, bool base = false) const;
+    size_type body_size(size_part_type psize = PSIZE_TORSO, bool base = false) const;
     int       body_weight() const;
     int       total_weight() const;
     int       damage_brand(int which_attack = -1);
@@ -496,14 +497,6 @@ struct player_save_info
 class monsters;
 struct item_def;
 
-enum genus_type
-{
-    GENPC_DRACONIAN,                   //    0
-    GENPC_ELVEN,                       //    1
-    GENPC_DWARVEN,                     //    2
-    GENPC_OGRE
-};
-
 bool move_player_to_grid( const coord_def& p, bool stepped, bool allow_shift,
                           bool force, bool swapping = false );
 
@@ -874,7 +867,6 @@ void dec_disease_player();
 bool rot_player(int amount);
 
 bool player_has_spell(spell_type spell);
-size_type player_size(int psize = PSIZE_TORSO, bool base = false);
 
 item_def *player_slot_item(equipment_type eq);