diff options
| author | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-08-19 18:26:48 +0000 |
|---|---|---|
| committer | dshaligram <dshaligram@c06c8d41-db1a-0410-9941-cceddc491573> | 2006-08-19 18:26:48 +0000 |
| commit | 70073b396f31922f847436e53895ceb3245bb8b4 (patch) | |
| tree | 5ec51f2aae4a08940f843edca1abfa7a2cc86ecf | |
| parent | 12ec4715196925cb313b3025498f5ac011b48789 (diff) | |
| download | crawl-ref-70073b396f31922f847436e53895ceb3245bb8b4.tar.gz crawl-ref-70073b396f31922f847436e53895ceb3245bb8b4.zip | |
r72@ODIN: dshaligram | 2006-08-19 23:57:41 +051800
Sigh. Fixed lochaber axe wieldable by small humanoids.
git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/branches/stone_soup@25 c06c8d41-db1a-0410-9941-cceddc491573
| -rw-r--r-- | crawl-ref/source/effects.cc | 1 | ||||
| -rw-r--r-- | crawl-ref/source/item_use.cc | 2 | ||||
| -rw-r--r-- | crawl-ref/source/makefile | 4 |
3 files changed, 6 insertions, 1 deletions
diff --git a/crawl-ref/source/effects.cc b/crawl-ref/source/effects.cc index c2c2db97a5..d021041131 100644 --- a/crawl-ref/source/effects.cc +++ b/crawl-ref/source/effects.cc @@ -1274,6 +1274,7 @@ bool acquirement(unsigned char force_class, int agent) case WPN_HALBERD: case WPN_GLAIVE: case WPN_SCYTHE: + case WPN_LOCHABER_AXE: mitm[thing_created].sub_type = (coinflip() ? WPN_SPEAR : WPN_TRIDENT); break; diff --git a/crawl-ref/source/item_use.cc b/crawl-ref/source/item_use.cc index 65079d11f3..d043cfc22c 100644 --- a/crawl-ref/source/item_use.cc +++ b/crawl-ref/source/item_use.cc @@ -102,6 +102,7 @@ bool can_wield(const item_def& weapon) || weapon.sub_type == WPN_DIRE_FLAIL || weapon.sub_type == WPN_BATTLEAXE || weapon.sub_type == WPN_EXECUTIONERS_AXE + || weapon.sub_type == WPN_LOCHABER_AXE || weapon.sub_type == WPN_HALBERD || weapon.sub_type == WPN_GLAIVE || weapon.sub_type == WPN_GIANT_CLUB @@ -264,6 +265,7 @@ bool wield_weapon(bool auto_wield, int slot, bool show_weff_messages) || you.inv[item_slot].sub_type == WPN_DIRE_FLAIL || you.inv[item_slot].sub_type == WPN_BATTLEAXE || you.inv[item_slot].sub_type == WPN_EXECUTIONERS_AXE + || you.inv[item_slot].sub_type == WPN_LOCHABER_AXE || you.inv[item_slot].sub_type == WPN_HALBERD || you.inv[item_slot].sub_type == WPN_GLAIVE || you.inv[item_slot].sub_type == WPN_GIANT_CLUB diff --git a/crawl-ref/source/makefile b/crawl-ref/source/makefile index 7b2856786f..0bfe2331f6 100644 --- a/crawl-ref/source/makefile +++ b/crawl-ref/source/makefile @@ -9,7 +9,9 @@ #MAKEFILE = makefile.dos #MAKEFILE = makefile.emx #MAKEFILE = makefile.sol -MAKEFILE = makefile.osx +#MAKEFILE = makefile.osx + +MAKEFILE = makefile.mgw #jmf: number of concurrent jobs -- good value is (#_of_CPUs * 2) + 1 # cuts build time a lot on multi-cpu machines |