Mercurial > might-and-magic-trilogy
changeset 189:cdb5d83a9fd8
21.12.12
| author | Ritor1 |
|---|---|
| date | Fri, 21 Dec 2012 00:22:57 +0600 |
| parents | 27bdff4ed3e6 |
| children | d7bd52a35e52 |
| files | Party.cpp Player.cpp |
| diffstat | 2 files changed, 39 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/Party.cpp Thu Dec 20 20:35:47 2012 +0600 +++ b/Party.cpp Fri Dec 21 00:22:57 2012 +0600 @@ -405,60 +405,76 @@ { case PLAYER_SKILL_STAFF: v15 = ITEM_STAFF_1; - goto wear_item; + pCharacter->WearItem(v15); + break; case PLAYER_SKILL_SWORD: v15 = ITEM_LONGSWORD_1; - goto wear_item; + pCharacter->WearItem(v15); + break; case PLAYER_SKILL_DAGGER: v15 = ITEM_DAGGER_1; - goto wear_item; + pCharacter->WearItem(v15); + break; case PLAYER_SKILL_AXE: v15 = ITEM_AXE_1; - goto wear_item; + pCharacter->WearItem(v15); + break; case PLAYER_SKILL_SPEAR: v15 = ITEM_SPEAR_1; - goto wear_item; + pCharacter->WearItem(v15); + break; case PLAYER_SKILL_BOW: v15 = ITEM_CROSSBOW_1; - goto wear_item; + pCharacter->WearItem(v15); + break; case PLAYER_SKILL_MACE: v15 = ITEM_MACE_1; - goto wear_item; + pCharacter->WearItem(v15); + break; case PLAYER_SKILL_SHIELD: v15 = ITEM_BUCKLER_1; - goto wear_item; + pCharacter->WearItem(v15); + break; case PLAYER_SKILL_LEATHER: v15 = ITEM_LEATHER_1; - goto wear_item; + pCharacter->WearItem(v15); + break; case PLAYER_SKILL_CHAIN: v15 = ITEM_CHAINMAIL_1; - goto wear_item; + pCharacter->WearItem(v15); + break; case PLAYER_SKILL_PLATE: v15 = ITEM_PLATE_1; -wear_item: pCharacter->WearItem(v15); break; case PLAYER_SKILL_FIRE: v16 = ITEM_SPELLBOOK_FIRE_STRIKE; - goto add_item; + pCharacter->AddItem(-1, v16); + break; case PLAYER_SKILL_AIR: v16 = ITEM_SPELLBOOK_AIR_FEATHER_FALL; - goto add_item; + pCharacter->AddItem(-1, v16); + break; case PLAYER_SKILL_WATER: v16 = ITEM_SPELLBOOK_WATER_POISON_SPRAY; - goto add_item; + pCharacter->AddItem(-1, v16); + break; case PLAYER_SKILL_EARTH: v16 = ITEM_SPELLBOOK_EARTH_SLOW; - goto add_item; + pCharacter->AddItem(-1, v16); + break; case PLAYER_SKILL_SPIRIT: v16 = ITEM_SPELLBOOK_SPIRIT_BLESS; - goto add_item; + pCharacter->AddItem(-1, v16); + break; case PLAYER_SKILL_MIND: v16 = ITEM_SPELLBOOK_MIND_MIND_BLAST; - goto add_item; + pCharacter->AddItem(-1, v16); + break; case PLAYER_SKILL_BODY: v16 = ITEM_SPELLBOOK_BODY_FIRST_AID; - goto add_item; + pCharacter->AddItem(-1, v16); + break; case PLAYER_SKILL_ITEM_ID: case PLAYER_SKILL_REPAIR: case PLAYER_SKILL_MEDITATION: @@ -468,13 +484,14 @@ case PLAYER_SKILL_LEARNING: pCharacter->AddItem(-1, ITEM_POTION_BOTTLE); v16 = 5 * (rand() % 3 + 40); // simple reagent - goto add_item; + pCharacter->AddItem(-1, v16); + break; case PLAYER_SKILL_DODGE: v16 = ITEM_BOOTS_1; - goto add_item; + pCharacter->AddItem(-1, v16); + break; case PLAYER_SKILL_UNARMED: v16 = ITEM_GAUNTLETS_1; -add_item: pCharacter->AddItem(-1, v16); break; default: