mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

[diablo] 🐛 Correct spelling of Sorcerer 

Fixes #1074
pull/1231/head
Anders Jenbo 5 years ago
parent
2e21e7ab0e
commit
8f09cc3034
11 changed files with 125 additions and 125 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 210
      Source/effects.cpp
  2. 6
      Source/itemdat.cpp
  3. 2
      Source/itemdat.h
  4. 6
      Source/items.cpp
  5. 4
      Source/loadsave.cpp
  6. 6
      Source/msg.cpp
  7. 2
      Source/pack.cpp
  8. 6
      Source/player.cpp
  9. 2
      Source/sync.cpp
  10. 2
      SourceT/pack_test.cpp
  11. 4
      enums.h

210
Source/effects.cpp
Unescape View File

@ -552,109 +552,109 @@ TSFX sgSFX[] = {
{ sfx_STREAM, "Sfx\\Towners\\Witch49.wav", NULL },
{ sfx_STREAM, "Sfx\\Towners\\Witch50.wav", NULL },
{ sfx_STREAM, "Sfx\\Towners\\Wound01.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage01.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage02.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage03.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage04.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage05.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage06.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage07.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage08.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage09.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage10.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage11.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage12.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage13.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage14.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage15.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage16.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage17.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage18.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage19.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage20.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage21.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage22.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage23.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage24.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage25.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage26.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage27.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage28.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage29.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage30.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage31.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage32.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage33.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage34.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage35.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage36.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage37.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage38.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage39.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage40.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage41.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage42.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage43.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage44.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage45.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage46.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage47.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage48.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage49.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage50.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage51.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage52.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage53.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage54.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage55.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage56.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage57.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage58.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage59.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage60.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage61.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage62.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage63.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage64.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage65.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage66.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage67.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage68.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage69.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage69b.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage70.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage71.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage72.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage73.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage74.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage75.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage76.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage77.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage78.wav", NULL },
{ sfx_SORCEROR, "Sfx\\Sorceror\\Mage79.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage80.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage81.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage82.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage83.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage84.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage85.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage86.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage87.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage88.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage89.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage90.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage91.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage92.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage93.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage94.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage95.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage96.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage97.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage98.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage99.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage100.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage101.wav", NULL },
{ sfx_STREAM | sfx_SORCEROR, "Sfx\\Sorceror\\Mage102.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage01.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage02.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage03.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage04.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage05.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage06.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage07.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage08.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage09.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage10.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage11.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage12.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage13.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage14.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage15.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage16.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage17.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage18.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage19.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage20.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage21.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage22.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage23.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage24.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage25.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage26.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage27.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage28.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage29.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage30.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage31.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage32.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage33.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage34.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage35.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage36.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage37.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage38.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage39.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage40.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage41.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage42.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage43.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage44.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage45.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage46.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage47.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage48.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage49.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage50.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage51.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage52.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage53.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage54.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage55.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage56.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage57.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage58.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage59.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage60.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage61.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage62.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage63.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage64.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage65.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage66.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage67.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage68.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage69.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage69b.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage70.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage71.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage72.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage73.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage74.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage75.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage76.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage77.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage78.wav", NULL },
{ sfx_SORCERER, "Sfx\\Sorceror\\Mage79.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage80.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage81.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage82.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage83.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage84.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage85.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage86.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage87.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage88.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage89.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage90.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage91.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage92.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage93.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage94.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage95.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage96.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage97.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage98.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage99.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage100.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage101.wav", NULL },
{ sfx_STREAM | sfx_SORCERER, "Sfx\\Sorceror\\Mage102.wav", NULL },
{ sfx_STREAM | sfx_ROGUE, "Sfx\\Rogue\\Rogue01.wav", NULL },
{ sfx_STREAM | sfx_ROGUE, "Sfx\\Rogue\\Rogue02.wav", NULL },
{ sfx_STREAM | sfx_ROGUE, "Sfx\\Rogue\\Rogue03.wav", NULL },
@ -1364,7 +1364,7 @@ void sound_init()
if (gbIsMultiplayer) {
mask |= sfx_WARRIOR;
if (!gbIsSpawn)
mask |= (sfx_ROGUE | sfx_SORCEROR);
mask |= (sfx_ROGUE | sfx_SORCERER);
if (gbIsHellfire)
mask |= sfx_MONK;
} else if (plr[myplr]._pClass == PC_WARRIOR) {
@ -1372,7 +1372,7 @@ void sound_init()
} else if (plr[myplr]._pClass == PC_ROGUE) {
mask |= sfx_ROGUE;
} else if (plr[myplr]._pClass == PC_SORCERER) {
mask |= sfx_SORCEROR;
mask |= sfx_SORCERER;
} else if (plr[myplr]._pClass == PC_MONK) {
mask |= sfx_MONK;
} else if (plr[myplr]._pClass == PC_BARD) {

6
Source/itemdat.cpp
Unescape View File

@ -16,7 +16,7 @@ ItemDataStruct AllItemsList[] = {
/*IDI_WARRSHLD */ { IDROP_NEVER, ICLASS_ARMOR, ILOC_ONEHAND, ICURS_BUCKLER, ITYPE_SHIELD, UITYPE_NONE, "Buckler", NULL, 2, 10, 0, 0, 3, 3, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 50, 50 },
/*IDI_WARRCLUB */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_ONEHAND, ICURS_CLUB, ITYPE_MACE, UITYPE_SPIKCLUB, "Club", NULL, 1, 20, 1, 6, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 20, 20 },
/*IDI_ROGUE */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SHORT_BOW, ITYPE_BOW, UITYPE_NONE, "Short Bow", NULL, 1, 30, 1, 4, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 100, 100 },
/*IDI_SORCEROR */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SHORT_STAFF, ITYPE_STAFF, UITYPE_NONE, "Short Staff of Mana", NULL, 1, 25, 2, 4, 0, 0, 0, 20, 0, ISPL_NONE, IMISC_STAFF, SPL_MANA, FALSE, 520, 520 },
/*IDI_SORCERER */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SHORT_STAFF, ITYPE_STAFF, UITYPE_NONE, "Short Staff of Mana", NULL, 1, 25, 2, 4, 0, 0, 0, 20, 0, ISPL_NONE, IMISC_STAFF, SPL_MANA, FALSE, 520, 520 },
/*IDI_CLEAVER */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_CLEAVER, ITYPE_AXE, UITYPE_CLEAVER, "Cleaver", NULL, 10, 10, 4, 24, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_UNIQUE, SPL_NULL, FALSE, 2000, 2000 },
/*IDI_SKCROWN */ { IDROP_NEVER, ICLASS_ARMOR, ILOC_HELM, ICURS_THE_UNDEAD_CROWN, ITYPE_HELM, UITYPE_SKCROWN, "The Undead Crown", NULL, 0, 50, 0, 0, 15, 15, 0, 0, 0, ISPL_RNDSTEALLIFE, IMISC_UNIQUE, SPL_NULL, FALSE, 10000, 10000 },
/*IDI_INFRARING */ { IDROP_NEVER, ICLASS_MISC, ILOC_RING, ICURS_EMPYREAN_BAND, ITYPE_RING, UITYPE_INFRARING, "Empyrean Band", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_UNIQUE, SPL_NULL, FALSE, 8000, 8000 },
@ -34,7 +34,7 @@ ItemDataStruct AllItemsList[] = {
/*IDI_SPECELIX */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SPECTRAL_ELIXIR, ITYPE_MISC, UITYPE_ELIXIR, "Spectral Elixir", NULL, 15, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SPECELIX, SPL_NULL, FALSE, 0, 0 },
/*IDI_BLDSTONE */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_BLOOD_STONE, ITYPE_MISC, UITYPE_NONE, "Blood Stone", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 0, 0 },
/*IDI_MAPOFDOOM */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_MAP_OF_THE_STARS, ITYPE_MISC, UITYPE_MAPOFDOOM, "Cathedral Map", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_MAPOFDOOM, SPL_NULL, TRUE, 0, 0 },
/*IDI_EAR */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_EAR_SORCEROR, ITYPE_MISC, UITYPE_NONE, "Heart", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_EAR, SPL_NULL, FALSE, 0, 0 },
/*IDI_EAR */ { IDROP_NEVER, ICLASS_QUEST, ILOC_UNEQUIPABLE, ICURS_EAR_SORCERER, ITYPE_MISC, UITYPE_NONE, "Heart", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_EAR, SPL_NULL, FALSE, 0, 0 },
/*IDI_HEAL */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_POTION_OF_HEALING, ITYPE_MISC, UITYPE_NONE, "Potion of Healing", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_HEAL, SPL_NULL, TRUE, 50, 50 },
/*IDI_MANA */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_POTION_OF_MANA, ITYPE_MISC, UITYPE_NONE, "Potion of Mana", NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_MANA, SPL_NULL, TRUE, 50, 50 },
/*IDI_IDENTIFY */ { IDROP_NEVER, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_SCROLL_OF, ITYPE_MISC, UITYPE_NONE, "Scroll of Identify", NULL, 1, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_SCROLL, SPL_IDENTIFY, TRUE, 200, 200 },
@ -177,7 +177,7 @@ ItemDataStruct AllItemsList[] = {
/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_GREATER_RUNE_OF_FIRE, ITYPE_MISC, UITYPE_NONE, "Greater Rune of Fire", "Rune", 7, 0, 0, 0, 0, 0, 0, 42, 0, ISPL_NONE, IMISC_GR_RUNEF, SPL_NULL, TRUE, 400, 400 },
/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_GREATER_RUNE_OF_LIGHTNING, ITYPE_MISC, UITYPE_NONE, "Greater Rune of Lightning", "Rune", 7, 0, 0, 0, 0, 0, 0, 42, 0, ISPL_NONE, IMISC_GR_RUNEL, SPL_NULL, TRUE, 500, 500 },
/* */ { IDROP_REGULAR, ICLASS_MISC, ILOC_UNEQUIPABLE, ICURS_RUNE_OF_STONE, ITYPE_MISC, UITYPE_NONE, "Rune of Stone", "Rune", 7, 0, 0, 0, 0, 0, 0, 25, 0, ISPL_NONE, IMISC_RUNES, SPL_NULL, TRUE, 300, 300 },
/*IDI_SORCEROR */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SHORT_STAFF, ITYPE_STAFF, UITYPE_NONE, "Short Staff of Charged Bolt", NULL, 1, 25, 2, 4, 0, 0, 0, 20, 0, ISPL_NONE, IMISC_STAFF, SPL_CBOLT, FALSE, 520, 520 },
/*IDI_SORCERER */ { IDROP_NEVER, ICLASS_WEAPON, ILOC_TWOHAND, ICURS_SHORT_STAFF, ITYPE_STAFF, UITYPE_NONE, "Short Staff of Charged Bolt", NULL, 1, 25, 2, 4, 0, 0, 0, 20, 0, ISPL_NONE, IMISC_STAFF, SPL_CBOLT, FALSE, 520, 520 },
/* */ { IDROP_NEVER, ICLASS_NONE, ILOC_INVALID, ICURS_POTION_OF_FULL_MANA, ITYPE_MISC, UITYPE_NONE, NULL, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, ISPL_NONE, IMISC_NONE, SPL_NULL, FALSE, 0, 0 },
// clang-format on
};

2
Source/itemdat.h
Unescape View File

@ -53,7 +53,7 @@ typedef enum item_cursor_graphic {
ICURS_SPECTRAL_ELIXIR = 15,
ICURS_GOLDEN_ELIXIR = 17,
ICURS_EMPYREAN_BAND = 18,
ICURS_EAR_SORCEROR = 19,
ICURS_EAR_SORCERER = 19,
ICURS_EAR_WARRIOR = 20,
ICURS_EAR_ROGUE = 21,
ICURS_BLOOD_STONE = 25,

6
Source/items.cpp
Unescape View File

@ -307,7 +307,7 @@ bool IsItemAvailable(int i)
&& (i < 83 || i > 86) // Oils
&& i != 92 // Scroll of Search
&& (i < 161 || i > 165) // Runes
&& i != IDI_SORCEROR;
&& i != IDI_SORCERER;
}
return true;
@ -1408,7 +1408,7 @@ void CreatePlrItems(int p)
GetPlrHandSeed(&plr[p].SpdList[1]);
break;
case PC_SORCERER:
SetPlrHandItem(&plr[p].InvBody[INVLOC_HAND_LEFT], gbIsHellfire ? IDI_SORCEROR : 166);
SetPlrHandItem(&plr[p].InvBody[INVLOC_HAND_LEFT], gbIsHellfire ? IDI_SORCERER : 166);
GetPlrHandSeed(&plr[p].InvBody[INVLOC_HAND_LEFT]);
SetPlrHandItem(&plr[p].SpdList[0], gbIsHellfire ? IDI_HEAL : IDI_MANA);
@ -2965,7 +2965,7 @@ void RecreateEar(int ii, WORD ic, int iseed, int Id, int dur, int mdur, int ch,
tempstr[15] = ibuff & 0x7F;
tempstr[16] = '\0';
sprintf(item[ii]._iName, "Ear of %s", tempstr);
item[ii]._iCurs = ((ivalue >> 6) & 3) + ICURS_EAR_SORCEROR;
item[ii]._iCurs = ((ivalue >> 6) & 3) + ICURS_EAR_SORCERER;
item[ii]._ivalue = ivalue & 0x3F;
item[ii]._iCreateInfo = ic;
item[ii]._iSeed = iseed;

4
Source/loadsave.cpp
Unescape View File

@ -772,7 +772,7 @@ static void LoadPortal(LoadHelper *file, int i)
int RemapItemIdxFromDiablo(int i)
{
if (i == IDI_SORCEROR) {
if (i == IDI_SORCERER) {
return 166;
}
if (i >= 156) {
@ -791,7 +791,7 @@ int RemapItemIdxFromDiablo(int i)
int RemapItemIdxToDiablo(int i)
{
if (i == 166) {
return IDI_SORCEROR;
return IDI_SORCERER;
}
if ((i >= 83 && i <= 86) || i == 92 || i >= 161) {
return -1; // Hellfire exclusive items

6
Source/msg.cpp
Unescape View File

@ -985,7 +985,7 @@ void NetSendCmdGItem(BOOL bHiPri, BYTE bCmd, BYTE mast, BYTE pnum, BYTE ii)
cmd.bMDur = item[ii]._iName[15];
cmd.bCh = item[ii]._iName[16];
cmd.bMCh = item[ii]._iName[17];
cmd.wValue = item[ii]._ivalue | (item[ii]._iName[18] << 8) | ((item[ii]._iCurs - ICURS_EAR_SORCEROR) << 6);
cmd.wValue = item[ii]._ivalue | (item[ii]._iName[18] << 8) | ((item[ii]._iCurs - ICURS_EAR_SORCERER) << 6);
cmd.dwBuff = item[ii]._iName[22] | ((item[ii]._iName[21] | ((item[ii]._iName[20] | (item[ii]._iName[19] << 8)) << 8)) << 8);
} else {
cmd.wCI = item[ii]._iCreateInfo;
@ -1082,7 +1082,7 @@ void NetSendCmdPItem(BOOL bHiPri, BYTE bCmd, BYTE x, BYTE y)
cmd.bMDur = plr[myplr].HoldItem._iName[15];
cmd.bCh = plr[myplr].HoldItem._iName[16];
cmd.bMCh = plr[myplr].HoldItem._iName[17];
cmd.wValue = plr[myplr].HoldItem._ivalue | (plr[myplr].HoldItem._iName[18] << 8) | ((plr[myplr].HoldItem._iCurs - ICURS_EAR_SORCEROR) << 6);
cmd.wValue = plr[myplr].HoldItem._ivalue | (plr[myplr].HoldItem._iName[18] << 8) | ((plr[myplr].HoldItem._iCurs - ICURS_EAR_SORCERER) << 6);
cmd.dwBuff = plr[myplr].HoldItem._iName[22] | ((plr[myplr].HoldItem._iName[21] | ((plr[myplr].HoldItem._iName[20] | (plr[myplr].HoldItem._iName[19] << 8)) << 8)) << 8);
} else {
cmd.wCI = plr[myplr].HoldItem._iCreateInfo;
@ -1153,7 +1153,7 @@ void NetSendCmdDItem(BOOL bHiPri, int ii)
cmd.bMDur = item[ii]._iName[15];
cmd.bCh = item[ii]._iName[16];
cmd.bMCh = item[ii]._iName[17];
cmd.wValue = item[ii]._ivalue | (item[ii]._iName[18] << 8) | ((item[ii]._iCurs - ICURS_EAR_SORCEROR) << 6);
cmd.wValue = item[ii]._ivalue | (item[ii]._iName[18] << 8) | ((item[ii]._iCurs - ICURS_EAR_SORCERER) << 6);
cmd.dwBuff = item[ii]._iName[22] | ((item[ii]._iName[21] | ((item[ii]._iName[20] | (item[ii]._iName[19] << 8)) << 8)) << 8);
} else {
cmd.wCI = item[ii]._iCreateInfo;

2
Source/pack.cpp
Unescape View File

@ -26,7 +26,7 @@ void PackItem(PkItemStruct *id, const ItemStruct *is)
id->bMDur = is->_iName[15];
id->bCh = is->_iName[16];
id->bMCh = is->_iName[17];
id->wValue = SwapLE16(is->_ivalue | (is->_iName[18] << 8) | ((is->_iCurs - ICURS_EAR_SORCEROR) << 6));
id->wValue = SwapLE16(is->_ivalue | (is->_iName[18] << 8) | ((is->_iCurs - ICURS_EAR_SORCERER) << 6));
id->dwBuff = LOAD_BE32(&is->_iName[19]);
} else {
id->iSeed = SwapLE32(is->_iSeed);

6
Source/player.cpp
Unescape View File

@ -137,7 +137,7 @@ int ToBlkTbl[NUM_CLASSES] = {
const char *const ClassStrTblOld[] = {
"Warrior",
"Rogue",
"Sorceror",
"Sorcerer",
"Monk",
"Bard",
"Barbarian",
@ -210,7 +210,7 @@ int ExpLvlsTbl[MAXCHARLEVEL] = {
const char *const ClassStrTbl[] = {
"Warrior",
"Rogue",
"Sorceror",
"Sorcerer",
"Monk",
"Rogue",
"Warrior",
@ -1796,7 +1796,7 @@ StartPlayerKill(int pnum, int earflag)
SetPlrHandItem(&ear, IDI_EAR);
sprintf(ear._iName, "Ear of %s", plr[pnum]._pName);
if (plr[pnum]._pClass == PC_SORCERER) {
ear._iCurs = ICURS_EAR_SORCEROR;
ear._iCurs = ICURS_EAR_SORCERER;
} else if (plr[pnum]._pClass == PC_WARRIOR) {
ear._iCurs = ICURS_EAR_WARRIOR;
} else if (plr[pnum]._pClass == PC_ROGUE) {

2
Source/sync.cpp
Unescape View File

@ -116,7 +116,7 @@ static void SyncPlrInv(TSyncHeader *pHdr)
pHdr->bItemMDur = item[ii]._iName[15];
pHdr->bItemCh = item[ii]._iName[16];
pHdr->bItemMCh = item[ii]._iName[17];
pHdr->wItemVal = (item[ii]._iName[18] << 8) | ((item[ii]._iCurs - ICURS_EAR_SORCEROR) << 6) | item[ii]._ivalue;
pHdr->wItemVal = (item[ii]._iName[18] << 8) | ((item[ii]._iCurs - ICURS_EAR_SORCERER) << 6) | item[ii]._ivalue;
pHdr->dwItemBuff = (item[ii]._iName[19] << 24) | (item[ii]._iName[20] << 16) | (item[ii]._iName[21] << 8) | item[ii]._iName[22];
} else {
pHdr->wItemCI = item[ii]._iCreateInfo;

2
SourceT/pack_test.cpp
Unescape View File

@ -141,7 +141,7 @@ const dvl::PkItemStruct PackedDiabloItems[] = {
{ 1272669062, 258, 115, 0, 10, 20, 0, 0, 0, 0 }, // Falchion
{ 1133884051, 278, 120, 2, 18, 40, 0, 0, 0, 0 }, // Sword of vim
{ 1743897351, 259, 146, 2, 10, 25, 60, 60, 0, 0 }, // Frog's Staff of Holy Bolt
{ 429107209, 0, 5, 0, 25, 25, 9, 40, 0, 0 }, // IDI_SORCEROR
{ 429107209, 0, 5, 0, 25, 25, 9, 40, 0, 0 }, // IDI_SORCERER
{ 466015738, 257, 146, 0, 18, 25, 50, 50, 0, 0 }, // Staff of Charged Bolt
{ 686949358, 193, 48, 3, 12, 15, 0, 0, 0, 0 }, // Cap of the mind armor
{ 888855755, 195, 58, 3, 30, 30, 0, 0, 0, 0 }, // Armor of protection

4
enums.h
Unescape View File

@ -1044,7 +1044,7 @@ typedef enum sfx_flag {
sfx_MONK = 0x08,
sfx_ROGUE = 0x10,
sfx_WARRIOR = 0x20,
sfx_SORCEROR = 0x40,
sfx_SORCERER = 0x40,
sfx_HELLFIRE = 0x80,
} sfx_flag;
@ -2298,7 +2298,7 @@ typedef enum _item_indexes {
IDI_WARRSHLD,
IDI_WARRCLUB,
IDI_ROGUE,
IDI_SORCEROR,
IDI_SORCERER,
IDI_CLEAVER,
IDI_FIRSTQUEST = IDI_CLEAVER,
IDI_SKCROWN,

Write Preview
Loading…
Cancel
Save