Mercurial > mm7

diff GUI/UI/UIPartyCreation.cpp @ 2567:d569340b05ff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Few constants changed into enum values
author a.parshin
date Thu, 21 May 2015 01:50:59 +0200
parents 48708da03b7f
children d87bfbd3bb3b
line wrap: on
line diff
--- a/GUI/UI/UIPartyCreation.cpp	Wed May 20 21:05:07 2015 +0200
+++ b/GUI/UI/UIPartyCreation.cpp	Thu May 21 01:50:59 2015 +0200
@@ -663,44 +663,44 @@
 
       switch (j)
       {
-        case PLAYER_SKILL_STAFF:   pParty->pPlayers[i].AddItem(-1, 61); break;
-        case PLAYER_SKILL_SWORD:   pParty->pPlayers[i].AddItem(-1, 1); break;
-        case PLAYER_SKILL_DAGGER:  pParty->pPlayers[i].AddItem(-1, 15); break;
-        case PLAYER_SKILL_AXE:     pParty->pPlayers[i].AddItem(-1, 23); break;
-        case PLAYER_SKILL_SPEAR:   pParty->pPlayers[i].AddItem(-1, 31); break;
-        case PLAYER_SKILL_BOW:     pParty->pPlayers[i].AddItem(-1, 47); break;
-        case PLAYER_SKILL_MACE:    pParty->pPlayers[i].AddItem(-1, 50); break;
+        case PLAYER_SKILL_STAFF:   pParty->pPlayers[i].AddItem(-1, ITEM_STAFF_1); break;
+        case PLAYER_SKILL_SWORD:   pParty->pPlayers[i].AddItem(-1, ITEM_LONGSWORD_1); break;
+        case PLAYER_SKILL_DAGGER:  pParty->pPlayers[i].AddItem(-1, ITEM_DAGGER_1); break;
+        case PLAYER_SKILL_AXE:     pParty->pPlayers[i].AddItem(-1, ITEM_AXE_1); break;
+        case PLAYER_SKILL_SPEAR:   pParty->pPlayers[i].AddItem(-1, ITEM_SPEAR_1); break;
+        case PLAYER_SKILL_BOW:     pParty->pPlayers[i].AddItem(-1, ITEM_CROSSBOW_1); break;
+        case PLAYER_SKILL_MACE:    pParty->pPlayers[i].AddItem(-1, ITEM_MACE_1); break;
         case PLAYER_SKILL_BLASTER: Error("No blasters at startup :p");
-        case PLAYER_SKILL_SHIELD:  pParty->pPlayers[i].AddItem(-1, 84); break;
-        case PLAYER_SKILL_LEATHER: pParty->pPlayers[i].AddItem(-1, 66); break;
-        case PLAYER_SKILL_CHAIN:   pParty->pPlayers[i].AddItem(-1, 71); break;
-        case PLAYER_SKILL_PLATE:   pParty->pPlayers[i].AddItem(-1, 76); break;
+        case PLAYER_SKILL_SHIELD:  pParty->pPlayers[i].AddItem(-1, ITEM_BUCKLER_1); break;
+        case PLAYER_SKILL_LEATHER: pParty->pPlayers[i].AddItem(-1, ITEM_LEATHER_1); break;
+        case PLAYER_SKILL_CHAIN:   pParty->pPlayers[i].AddItem(-1, ITEM_CHAINMAIL_1); break;
+        case PLAYER_SKILL_PLATE:   pParty->pPlayers[i].AddItem(-1, ITEM_PLATE_1); break;
         case PLAYER_SKILL_FIRE:
-          pParty->pPlayers[i].AddItem(-1, 0x191);
+            pParty->pPlayers[i].AddItem(-1, ITEM_SPELLBOOK_FIRE_STRIKE);
           pParty->pPlayers[i].spellbook.pFireSpellbook.bIsSpellAvailable[0] = true;
         break;
         case PLAYER_SKILL_AIR:
-          pParty->pPlayers[i].AddItem(-1, 0x19C);
+            pParty->pPlayers[i].AddItem(-1, ITEM_SPELLBOOK_AIR_FEATHER_FALL);
           pParty->pPlayers[i].spellbook.pAirSpellbook.bIsSpellAvailable[0] = true;
         break;
         case PLAYER_SKILL_WATER:
-          pParty->pPlayers[i].AddItem(-1, 0x1A7);
+            pParty->pPlayers[i].AddItem(-1, ITEM_SPELLBOOK_WATER_POISON_SPRAY);
           pParty->pPlayers[i].spellbook.pWaterSpellbook.bIsSpellAvailable[0] = true;
         break;
         case PLAYER_SKILL_EARTH:
-          pParty->pPlayers[i].AddItem(-1, 0x1B2);
+            pParty->pPlayers[i].AddItem(-1, ITEM_SPELLBOOK_EARTH_SLOW);
           pParty->pPlayers[i].spellbook.pEarthSpellbook.bIsSpellAvailable[0] = true;
         break;
         case PLAYER_SKILL_SPIRIT:
-          pParty->pPlayers[i].AddItem(-1, 0x1BD);
+            pParty->pPlayers[i].AddItem(-1, ITEM_SPELLBOOK_SPIRIT_BLESS);
           pParty->pPlayers[i].spellbook.pSpiritSpellbook.bIsSpellAvailable[0] = true;
         break;
         case PLAYER_SKILL_MIND:
-          pParty->pPlayers[i].AddItem(-1, 0x1C8);
+            pParty->pPlayers[i].AddItem(-1, ITEM_SPELLBOOK_MIND_MIND_BLAST);
           pParty->pPlayers[i].spellbook.pMindSpellbook.bIsSpellAvailable[0] = true;
         break;
         case PLAYER_SKILL_BODY:
-          pParty->pPlayers[i].AddItem(-1, 0x1D3);
+            pParty->pPlayers[i].AddItem(-1, ITEM_SPELLBOOK_BODY_FIRST_AID);
           pParty->pPlayers[i].spellbook.pBodySpellbook.bIsSpellAvailable[0] = true;
         break;
         case PLAYER_SKILL_LIGHT:
@@ -714,11 +714,11 @@
         case PLAYER_SKILL_PERCEPTION:
         case PLAYER_SKILL_TRAP_DISARM:
         case PLAYER_SKILL_LEARNING:
-          pParty->pPlayers[i].AddItem(-1, 0xDC);
+            pParty->pPlayers[i].AddItem(-1, ITEM_POTION_BOTTLE);
           pParty->pPlayers[i].AddItem(-1, 5 * (rand() % 3 + 40));
         break;
-        case PLAYER_SKILL_DODGE:   pParty->pPlayers[i].AddItem(-1, 115); break;
-        case PLAYER_SKILL_UNARMED: pParty->pPlayers[i].AddItem(-1, 110); break;
+        case PLAYER_SKILL_DODGE:   pParty->pPlayers[i].AddItem(-1, ITEM_BOOTS_1); break;
+        case PLAYER_SKILL_UNARMED: pParty->pPlayers[i].AddItem(-1, ITEM_GAUNTLETS_1); break;
         default:
           break;
       }