diff options
| author | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-12-30 02:42:55 +0000 |
|---|---|---|
| committer | dolorous <dolorous@c06c8d41-db1a-0410-9941-cceddc491573> | 2007-12-30 02:42:55 +0000 |
| commit | f1f838b18f17f470004d798383c3acb985a4b10d (patch) | |
| tree | 6c1f90b0890c167d20085063e38e498d62bb2736 /crawl-ref/source | |
| parent | 9b312b48a30cd85b588267130cebd1e529683526 (diff) | |
| download | crawl-ref-f1f838b18f17f470004d798383c3acb985a4b10d.tar.gz crawl-ref-f1f838b18f17f470004d798383c3acb985a4b10d.zip | |
Add comment typo and indentation fixes.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@3145 c06c8d41-db1a-0410-9941-cceddc491573
Diffstat (limited to 'crawl-ref/source')
| -rw-r--r-- | crawl-ref/source/newgame.cc | 6 | ||||
| -rw-r--r-- | crawl-ref/source/traps.cc | 16 |
2 files changed, 12 insertions, 10 deletions
diff --git a/crawl-ref/source/newgame.cc b/crawl-ref/source/newgame.cc index d46f333143..e0697c6d4d 100644 --- a/crawl-ref/source/newgame.cc +++ b/crawl-ref/source/newgame.cc @@ -14,7 +14,7 @@ * some clean-up of init_player() * <13> 1/10/2000 BCR Made ogre berserkers get club * skill, Trolls get unarmed skill - * Halflings can be assasins and + * Halflings can be assassins and * warpers * <12> 12/4/99 jmf Gave Paladins more armour skill + a * long sword (to compensate for @@ -2685,7 +2685,9 @@ static void create_wanderer( void ) } else if (you.skills[SK_SHIELDS] && wpn_skill != SK_STAVES) { - newgame_make_item(4, EQ_SHIELD, OBJ_ARMOUR, ARM_BUCKLER); + newgame_make_item(4, EQ_SHIELD, OBJ_ARMOUR, + (player_genus(GENPC_DRACONIAN) || you.species == SP_OGRE_MAGE) ? + ARM_SHIELD : ARM_BUCKLER); you.inv[3].quantity = 0; // remove potion } else diff --git a/crawl-ref/source/traps.cc b/crawl-ref/source/traps.cc index 258199f2bd..00d5793963 100644 --- a/crawl-ref/source/traps.cc +++ b/crawl-ref/source/traps.cc @@ -810,14 +810,14 @@ void free_self_from_net() void clear_trapping_net() { - if (!you.attribute[ATTR_HELD]) - return; - - const int net = get_trapping_net(you.x_pos, you.y_pos); - if (net != NON_ITEM) - remove_item_stationary(mitm[net]); - - you.attribute[ATTR_HELD] = 0; + if (!you.attribute[ATTR_HELD]) + return; + + const int net = get_trapping_net(you.x_pos, you.y_pos); + if (net != NON_ITEM) + remove_item_stationary(mitm[net]); + + you.attribute[ATTR_HELD] = 0; } bool trap_item(object_class_type base_type, char sub_type, |