From 394fb595f6d03fa9d266ed28726975e0b59bc798 Mon Sep 17 00:00:00 2001 From: Robert Vollmert Date: Sat, 24 Oct 2009 12:42:13 +0200 Subject: 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. --- crawl-ref/source/itemprop.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'crawl-ref/source/itemprop.cc') diff --git a/crawl-ref/source/itemprop.cc b/crawl-ref/source/itemprop.cc index b6f4ea7e9e..58b421ab80 100644 --- a/crawl-ref/source/itemprop.cc +++ b/crawl-ref/source/itemprop.cc @@ -2121,7 +2121,7 @@ int get_inv_hand_tool( void ) // assuring that bad "shape" weapons aren't in hand ASSERT( check_weapon_shape( you.inv[tool], false ) ); - if (!check_weapon_tool_size( you.inv[tool], player_size() )) + if (!check_weapon_tool_size( you.inv[tool], you.body_size() )) return (-1); } */ @@ -2799,7 +2799,7 @@ bool is_shield_incompatible(const item_def &weapon, const item_def *shield) if (!shield && !(shield = player_shield())) return (false); - hands_reqd_type hand = hands_reqd(weapon, player_size()); + hands_reqd_type hand = hands_reqd(weapon, you.body_size()); return (hand == HANDS_TWO && !item_is_rod(weapon) && !is_range_weapon(weapon)); -- cgit v1.2.3-54-g00ecf