Mercurial > mm7
comparison mm7_data.cpp @ 1018:9ac94d00012e
Merge
author | Grumpy7 |
---|---|
date | Tue, 21 May 2013 02:24:31 +0200 |
parents | c45d51b3f4f4 9e823ad5eaa6 |
children | f93d17337113 |
comparison
equal
deleted
inserted
replaced
1017:af20650a052f | 1018:9ac94d00012e |
---|---|
403 char aUnableToLoadS[777]; // idb | 403 char aUnableToLoadS[777]; // idb |
404 char aBitmaps[777]; // idb | 404 char aBitmaps[777]; // idb |
405 char aIcons[777]; // idb | 405 char aIcons[777]; // idb |
406 char aPending[777]; // idb | 406 char aPending[777]; // idb |
407 char aCanTFindS[777]; // idb | 407 char aCanTFindS[777]; // idb |
408 char pDayMoonPhase[28]; | |
409 char *spellbook_texture_filename_suffices[8] = {"f", "a", "w", "e", "s", "m", "b", "l"}; // weak | 408 char *spellbook_texture_filename_suffices[8] = {"f", "a", "w", "e", "s", "m", "b", "l"}; // weak |
410 __int16 word_4E1D3A[777]; // weak | 409 __int16 word_4E1D3A[777]; // weak |
411 __int16 pTownPortalBook_xs[6] = {260, 324, 147, 385, 390, 19}; | 410 __int16 pTownPortalBook_xs[6] = {260, 324, 147, 385, 390, 19}; |
412 __int16 pTownPortalBook_ys[6] = {206, 84, 182, 239, 17, 283}; | 411 __int16 pTownPortalBook_ys[6] = {206, 84, 182, 239, 17, 283}; |
413 __int16 pTownPortalBook_ws[6] = { 80, 66, 68, 72, 67, 74}; | 412 __int16 pTownPortalBook_ws[6] = { 80, 66, 68, 72, 67, 74}; |
509 int pWeaponSkills[9] = {PLAYER_SKILL_AXE, PLAYER_SKILL_BOW, PLAYER_SKILL_DAGGER, PLAYER_SKILL_MACE, PLAYER_SKILL_SPEAR, PLAYER_SKILL_STAFF, PLAYER_SKILL_SWORD, PLAYER_SKILL_UNARMED, PLAYER_SKILL_BLASTER}; | 508 int pWeaponSkills[9] = {PLAYER_SKILL_AXE, PLAYER_SKILL_BOW, PLAYER_SKILL_DAGGER, PLAYER_SKILL_MACE, PLAYER_SKILL_SPEAR, PLAYER_SKILL_STAFF, PLAYER_SKILL_SWORD, PLAYER_SKILL_UNARMED, PLAYER_SKILL_BLASTER}; |
510 int pMiscSkills[12] = {PLAYER_SKILL_ALCHEMY, PLAYER_SKILL_ARMSMASTER, PLAYER_SKILL_BODYBUILDING, PLAYER_SKILL_ITEM_ID, PLAYER_SKILL_MONSTER_ID, PLAYER_SKILL_LEARNING, PLAYER_SKILL_TRAP_DISARM, PLAYER_SKILL_MEDITATION, PLAYER_SKILL_MERCHANT, PLAYER_SKILL_PERCEPTION, PLAYER_SKILL_REPAIR, PLAYER_SKILL_STEALING}; | 509 int pMiscSkills[12] = {PLAYER_SKILL_ALCHEMY, PLAYER_SKILL_ARMSMASTER, PLAYER_SKILL_BODYBUILDING, PLAYER_SKILL_ITEM_ID, PLAYER_SKILL_MONSTER_ID, PLAYER_SKILL_LEARNING, PLAYER_SKILL_TRAP_DISARM, PLAYER_SKILL_MEDITATION, PLAYER_SKILL_MERCHANT, PLAYER_SKILL_PERCEPTION, PLAYER_SKILL_REPAIR, PLAYER_SKILL_STEALING}; |
511 int pMagicSkills[9] = {PLAYER_SKILL_FIRE, PLAYER_SKILL_AIR, PLAYER_SKILL_WATER, PLAYER_SKILL_EARTH, PLAYER_SKILL_SPIRIT, PLAYER_SKILL_MIND, PLAYER_SKILL_BODY, PLAYER_SKILL_LIGHT, PLAYER_SKILL_DARK}; | 510 int pMagicSkills[9] = {PLAYER_SKILL_FIRE, PLAYER_SKILL_AIR, PLAYER_SKILL_WATER, PLAYER_SKILL_EARTH, PLAYER_SKILL_SPIRIT, PLAYER_SKILL_MIND, PLAYER_SKILL_BODY, PLAYER_SKILL_LIGHT, PLAYER_SKILL_DARK}; |
512 unsigned int pHealthBarPos[4] = {22, 137, 251, 366}; | 511 unsigned int pHealthBarPos[4] = {22, 137, 251, 366}; |
513 unsigned int pManaBarPos[4] = {102, 217, 331, 447}; | 512 unsigned int pManaBarPos[4] = {102, 217, 331, 447}; |
514 char _4E2AD8_ui_colors[72]; | |
515 char _4E2B21_buff_spell_tooltip_colors[80]; | 513 char _4E2B21_buff_spell_tooltip_colors[80]; |
516 char monster_popup_y_offsets[88] = | 514 char monster_popup_y_offsets[88] = |
517 { | 515 { |
518 236, 20, 0, 216, 0, 0, 0, 0, 0, 0, 206, | 516 236, 20, 0, 216, 0, 0, 0, 0, 0, 0, 206, |
519 20, 0, 246, 246, 236, 10, 246, 0, 0, 0, 236, | 517 20, 0, 246, 246, 236, 10, 246, 0, 0, 0, 236, |
824 "itrap", | 822 "itrap", |
825 "outside", | 823 "outside", |
826 "idoor", | 824 "idoor", |
827 "isecdoor" | 825 "isecdoor" |
828 }; | 826 }; |
829 const char *_4E6BDC_loc_names[11]= | 827 |
830 { | |
831 "mdt12.blv", | |
832 "d18.blv", | |
833 "mdt14.blv", | |
834 "d37.blv", | |
835 "mdk01.blv", | |
836 "mdt01.blv", | |
837 "mdr01.blv", | |
838 "mdt10.blv", | |
839 "mdt09.blv", | |
840 "mdt15.blv", | |
841 "mdt11.blv" | |
842 }; | |
843 char aMer[777]; // idb | 828 char aMer[777]; // idb |
844 char aMir[777]; // idb | 829 char aMir[777]; // idb |
845 char aSel[777]; // idb | 830 char aSel[777]; // idb |
846 char aEle[777]; // idb | 831 char aEle[777]; // idb |
847 char aDar[777]; // idb | 832 char aDar[777]; // idb |
1602 int dword_50C9D0; // weak | 1587 int dword_50C9D0; // weak |
1603 int dword_50C9D4; // weak | 1588 int dword_50C9D4; // weak |
1604 int dword_50C9D8; // weak | 1589 int dword_50C9D8; // weak |
1605 int dword_50C9DC; // weak | 1590 int dword_50C9DC; // weak |
1606 struct NPCData *ptr_50C9E0; | 1591 struct NPCData *ptr_50C9E0; |
1607 int dword_50C9E8; // idb | 1592 //int dword_50C9E8; // idb |
1608 int dword_50C9EC[120]; // weak | 1593 //int dword_50C9EC[120]; // weak |
1609 int dword_50CDC8; | 1594 int dword_50CDC8; |
1610 int dword_50CDCC; // weak | 1595 int dword_50CDCC; // weak |
1611 int bProcessorIsNotIntel; // weak | 1596 int bProcessorIsNotIntel; // weak |
1612 Vec3_int_ layingitem_vel_50FDFC; | 1597 Vec3_int_ layingitem_vel_50FDFC; |
1613 char pStartingMapName[777]; // idb | 1598 char pStartingMapName[777]; // idb |