Mercurial > mm7
diff mm7_data.cpp @ 1018:9ac94d00012e
Merge
author | Grumpy7 |
---|---|
date | Tue, 21 May 2013 02:24:31 +0200 |
parents | c45d51b3f4f4 9e823ad5eaa6 |
children | f93d17337113 |
line wrap: on
line diff
--- a/mm7_data.cpp Sun May 19 20:41:19 2013 +0200 +++ b/mm7_data.cpp Tue May 21 02:24:31 2013 +0200 @@ -405,7 +405,6 @@ char aIcons[777]; // idb char aPending[777]; // idb char aCanTFindS[777]; // idb -char pDayMoonPhase[28]; char *spellbook_texture_filename_suffices[8] = {"f", "a", "w", "e", "s", "m", "b", "l"}; // weak __int16 word_4E1D3A[777]; // weak __int16 pTownPortalBook_xs[6] = {260, 324, 147, 385, 390, 19}; @@ -511,7 +510,6 @@ 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}; unsigned int pHealthBarPos[4] = {22, 137, 251, 366}; unsigned int pManaBarPos[4] = {102, 217, 331, 447}; -char _4E2AD8_ui_colors[72]; char _4E2B21_buff_spell_tooltip_colors[80]; char monster_popup_y_offsets[88] = { @@ -826,20 +824,7 @@ "idoor", "isecdoor" }; -const char *_4E6BDC_loc_names[11]= -{ - "mdt12.blv", - "d18.blv", - "mdt14.blv", - "d37.blv", - "mdk01.blv", - "mdt01.blv", - "mdr01.blv", - "mdt10.blv", - "mdt09.blv", - "mdt15.blv", - "mdt11.blv" -}; + char aMer[777]; // idb char aMir[777]; // idb char aSel[777]; // idb @@ -1604,8 +1589,8 @@ int dword_50C9D8; // weak int dword_50C9DC; // weak struct NPCData *ptr_50C9E0; -int dword_50C9E8; // idb -int dword_50C9EC[120]; // weak +//int dword_50C9E8; // idb +//int dword_50C9EC[120]; // weak int dword_50CDC8; int dword_50CDCC; // weak int bProcessorIsNotIntel; // weak