Mercurial > mm7
diff mm7_data.cpp @ 1055:010a844ef4a0
Слияние
author | Ritor1 |
---|---|
date | Wed, 22 May 2013 22:23:04 +0600 |
parents | 3a5c8df8381d |
children | 39f42990698f |
line wrap: on
line diff
--- a/mm7_data.cpp Wed May 22 22:22:36 2013 +0600 +++ b/mm7_data.cpp Wed May 22 22:23:04 2013 +0600 @@ -1,7 +1,5 @@ #include "mm7_data.h" -#include "NPC.h" -#include "Actor.h" #include "GUIWindow.h" #include "Party.h" @@ -388,14 +386,6 @@ char pDeckMaster[12]; char aIxf[4]; // idb _UNKNOWN unk_4E19FC; // weak -char pAreYouSureWishToLeave[32]; -char asc_4E1A28[4]; // idb -char aUsxfs[13]; -char aLayout_pcx[11]; // weak -char aSprites_pcx[12]; // weak -char aProblemInBlit_[777]; // idb -char aEWorkMsdevMm7M[777]; // idb -char aProblemInBli_0[777]; // idb char aD[777]; // idb char asc_4E1AB0[777]; // idb char aWb_0[777]; // idb @@ -407,7 +397,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}; @@ -498,7 +487,6 @@ char aS100110DS[777]; // idb char aS100110D02dSS[777]; // idb int pCurrentScreen = SCREEN_VIDEO; // 004E28F8 -char byte_4E28FC; // weak unsigned int uGammaPos; int BtnTurnCoord[8] = { @@ -513,7 +501,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] = { @@ -530,123 +517,22 @@ const char *format_4E2D80 = "\f%05d%s\f00000\n"; -char format_4E2D90[8]; -char aS03d03dS000_0[777]; // idb -char aS03d03dS000[777]; // idb //const char *format_4E2DC8 = "\f%05d"; -char aS[777]; // idb -char aLuSLuS[777]; // idb const char *format_4E2DE8 = "\f%05d%s\f00000 - "; -char asc_4E2DFC[3]; // idb const char *format_4E2E00 = "%s\f%05u\xD\r180%s\n"; // idb const char *format_4E2E10 = "%s\f%05u\t110%d\f00000 / %d\n"; -char aS100S_0[777]; // idb -char aS100S[777]; // idb -char aS100D[777]; // idb -char aS180[6]; // idb -char aS_6[2]; // idb -char aSS_0[777]; // idb -char aS_5[4]; // idb -char string_4E3294[8]; -char Format[777]; // idb -char aMem03i_txt[777]; // idb -char aMemory[777]; // idb -char aIdSSizeI[16]; // idb __int16 word_4E3C66[777]; // idb int dword_4E455C; // weak int dword_4E4560[6]; int dword_4E4578[6]; int dword_4E4590[6]; int dword_4E45A8[6]; -char aDDSDDS[777]; // idb -char asc_4E45DC[777]; // idb -char aD02dSSDSD[777]; // idb -char aButtexi1[777]; // idb -char aCanTJumpToThat[777]; // idb -char aNoMapFoundForS[777]; // idb -char global_a2[777]; // idb -char aSSS[777]; // idb -char aNotInMapStats[17]; // weak -char aD47_blv[777]; // idb -char aOut15_odm[777]; // idb -char Delim[777]; // idb -char aGamma_pcx[777]; -char aQuit1[777]; // idb -char aControls1[777]; // idb -char aSave1[777]; // idb -char aLoad1[777]; // idb -char aNew1[777]; // idb -char aOptions[777]; // idb -char aGammapos[9]; // weak -char aBloodsplats[777]; // idb -char aTinting[777]; // idb -char aColoredLights[777]; // idb -char aTurndelta[777]; // idb -char aFliponexit[777]; // idb -char pKey[777]; // idb -char aGraphicsmode[777]; // idb -char aShowdamage[777]; // idb -char aWalksound[777]; // idb -char aCharvoices[777]; // idb -char aMusicflag[777]; // idb -char aSoundflag[777]; // idb -char aOpvdgTn[777]; // idb -char aOpvdgCl[777]; // idb -char aOpvdgBs[777]; // idb -char aOpvdhTn[777]; // idb -char aOpvdhCl[777]; // idb -char aOpvdhBs[777]; // idb -char aOptvid[777]; // idb -char aOptkb_2[777]; // idb -char aOptkb_1[777]; // idb -char aResume1[777]; // idb -char aOptkb_h[777]; // idb -char aOptkb[777]; // idb -char aOption01[777]; // idb -char aOption02[777]; // idb -char aOption03[777]; // idb -char aOption04[777]; // idb -char aConvol90[777]; // idb -char aConvol80[777]; // idb -char aConvol70[777]; // idb -char aConvol60[777]; // idb -char aConvol50[777]; // idb -char aConvol40[777]; // idb -char aConvol30[777]; // idb -char aConvol20[777]; // idb -char aConvol10[777]; // idb -char aConvol00[777]; // idb -char aCon_smoo[777]; // idb -char aCon_arrr[777]; // idb -char aCon_arrl[777]; // idb -char aCon_32x[777]; // idb -char aCon_16x[777]; // idb -char aControlbg[777]; // idb -char aTitle_pcx[10]; // weak -char aEWorkMsdevMm_0[777]; // idb -char aDraw_debug_lin[777]; // idb -char aGenuineintel[13]; // weak -char asc_4E4938[13]; // weak -int dword_4E4948[777]; // weak -int dword_4E494C[777]; // weak -int dword_4E49D0[777]; // weak _UNKNOWN dword_4E49D4; // idb int dword_4E4A18[777]; // weak int dword_4E4A1C[777]; // weak int dword_4E4A40[777]; // weak int dword_4E4A44[777]; // weak -char aCentaurhauls[13]; // weak -char aCyrixinstead[13]; // weak -char aAuthenticamd[13]; // weak float flt_4E4A80[10]; -char aInvalidPlayerI[777]; // idb -char aEWorkMsdevMm_1[777]; // idb -char aEWorkMsdevMm_2[777]; // idb -char aErrorNoKeyboar[25]; // weak -char aInvalidDeviceP[777]; // idb -char aInvalidDevic_0[777]; // idb -char aEWorkMsdevMm_3[777]; // idb -char aErrorNoMouseFo[22]; // weak int pPaperdoll_BodyX = 481; // 004E4C28 int pPaperdoll_BodyY = 0; // 004E4C2C int paperdoll_Armor[4][17][2] = //4E4E30 @@ -753,24 +639,6 @@ 0x83, 0xD8, 0x7B, 0xD8, }; -char aItem092v3[777]; // idb -char aIbCd5D[777]; // idb -char aItem281pc02d[777]; // idb -char aPc02dbrd[777]; // idb -char aPc23vDlhu[777]; // idb -char aPc23vDlh[777]; // idb -char aPc23vDrh[777]; // idb -char aPc23vDlau[777]; // idb -char aPc23vDlad[777]; // idb -char aPc23vDbod[777]; // idb -char aBackhand[777]; // idb -char aBackdoll[777]; // idb -char aMagnifB[777]; // idb -char aItem3_3dvDa2[777]; // idb -char aItem3_3dvDa1[15]; // weak -char aItem3_3dvD[13]; // weak -char aItem64v1[9]; // weak -char aEffpar01[777]; // idb int pPartySpellbuffsUI_XYs[14][2] = { @@ -788,14 +656,6 @@ 3, 6, 15, 8, 3, 12, 0 }; -char aSpell27[777]; // idb -char aSpell21[777]; // idb -char aIsn02d[777]; // idb -char aBardataB[777]; // idb -char aBardata[8]; // weak -char aBardataC[10]; // weak -char aLoadprog[777]; // idb -char aLoadingD_pcx[777]; // idb int pNPCPortraits_x[6][6] = // 004E5E50 { {521, 0, 0, 0, 0, 0}, @@ -828,123 +688,10 @@ "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 -char aEle[777]; // idb -char aDar[777]; // idb -char aLig[777]; // idb -char aBod[777]; // idb -char aMin[777]; // idb -char aSpi[777]; // idb -char aEar[777]; // idb -char aWat[777]; // idb -char aAir[777]; // idb -char aFir[777]; // idb -char aBan[777]; // idb -char aTav[777]; // idb -char aTow[777]; // idb -char aTra[777]; // idb -char aTem[777]; // idb -char aBoa[777]; // idb -char aSta[777]; // idb -char aAlc[777]; // idb -char aMag[777]; // idb -char aArm[777]; // idb -char aWea[777]; // idb -char asc_4E7BD4[2]; // idb -char a2devents_txt[777]; // idb -char aFileSSizeLuBuf[777]; // idb -char aGlobal_evt[777]; // idb -char aMax_event_text[777]; // idb -char aS_str[777]; // idb -char aS_evt[777]; // idb -char aNoMazeInfoForT[36]; // weak -char aC[777]; // idb -char aB[3]; // weak -char aEvt02d[777]; // idb -char aNoTransitionTe[777]; // idb -char aEWorkMsdevMm_4[777]; // idb -char asc_4E7CD4[777]; // idb -char aSS_1[777]; // idb -char aNpcIdExceedsMa[777]; // idb -char aNpc03u[777]; // idb -char aPcout01[777]; // idb -char aArbiterEvil[777]; // idb -char aArbiterGood[777]; // idb -char a0[777]; // idb -char aPartyStart[777]; // idb -char aNorthStart[12]; // weak -char aSouthStart[12]; // weak -char aEastStart[11]; // weak -char aWestStart[11]; // weak -char aUnableToFindDo[777]; // idb -char aNwc_blv[777]; // idb -char aUnableToOpenS[777]; // idb -char aInvalidStringP[777]; // idb -char aEWorkMsdevMm_5[777]; // idb -char aNull[777]; // idb -char aInvalidStrin_0[777]; // idb -char aSI[777]; // idb -char aS7[4]; // weak -char aS6[777]; // idb -char aS5[4]; // weak -char aS1[777]; // idb -char aS3[4]; // weak -char aS0[777]; // idb -char aS2[4]; // weak -char aS4[4]; // weak -char aUnableToSaveDs[777]; // idb -char aDataDsft_bin[777]; // idb -char aPFrames[777]; // idb -char aEFrames[777]; // idb -char aSFrames[777]; // idb -char aMirror7[777]; // idb -char aMirror6[777]; // idb -char aMirror5[777]; // idb -char aMirror4[777]; // idb -char aMirror3[777]; // idb -char aMirror2[777]; // idb -char aMirror1[777]; // idb -char aMirror0[777]; // idb -char aLuminous[777]; // idb -char a1[777]; // idb -char aNew[777]; // idb -char pMessag[777]; // idb -char aCspriteframeta[777]; // idb -char aR[777]; // idb -char aNew_0[777]; // idb -char aUnableToSaveDt[777]; // idb -char aDataDtft_bin[777]; // idb -char aTxtFrames[777]; // idb -char aCtexturefram_1[777]; // idb -char aCtexturefram_0[777]; // idb -char aCtextureframet[777]; // idb + int bWinNT4_0; // weak -char aEWorkMsdevMm_6[777]; // idb -char aTheVisObjectPo[777]; // idb -char aSpriteOutlineC[777]; // idb -char aUndefinedCobje[777]; // idb -char aEWorkMsdevMm_7[777]; // idb -char aGammaControlNo[777]; // idb __int16 word_4E8152[11] = {0, 0, 0, 90, 8, 2, 70, 20, 10, 50, 30}; -char aD3dTextureName[777]; // idb -char aLogd3d_txt[777]; // idb char byte_4E8394[204] = { 0, 0, 0, 0, 1, 1, 2, 3, 0, 4, 5, 6, 7, 8, 10, 9, 1, 0, 0, 0, 0, 0, 0, @@ -1278,59 +1025,13 @@ "MAGSHELF", "MAGSHELF", "MAGSHELF", "MAGSHELF", "MAGSHELF", "MAGSHELF", "MAGSHELF" }; -//__int16 word_4F03FE[777]; // weak -//__int16 word_4F0400[777]; // weak -/*__int16 word_4F0404[] = -{ - 0, 0, 1, 0x17, 0x1B, 0x14, 0x14, 1, 0x17, 0x18, 0x1C, - 0x14, 2, 0x17, 0x18, 0x19, 0x14, 2, 0x1B, 0x1B, 0x1A, 0x1A, - 4, 0x18, 0x1E, 0x19, 0x1B, 4, 0x18, 0x1E, 0x19, 0x1B, 3, 0x1E, - 0x18, 0x14, 0x14, 2, 0x14, 0x14, 0x14, 0x14, 3, 0x1B, 0x1B, 0x1A, 0x1A, - 3, 0x1C, 0x1C, 0x19, 0x19, 2, 0x17, 0x17, 0x18, 0x18, - 3, 0x17, 0x17, 0x1A, 0x1A, 2, 0x1E, 0x1A, 0x1A, 0x1A, 2, 0x1C, - 0x19, 0x1C, 0x1D, 0, 0 -};*/ -//__int16 word_4F0498[777]; // weak -/*__int16 word_4F0498[] = -{ -1, 0x23, 0x23, 0x26, 0x26, 1, 0x1F, 0x1F, 0x1F, 0x22, 1, 0x23, 0x23, -0x26, 0x26, 1, 0x1F, 0x1F, 0x20, 0x22, 2, 0x23, 0x23, -0x26, 0x26, 2, 0x1F, 0x20, 0x20, 0x21, 2, 0x23, 0x23, -0x26, 0x26, 2, 0x1F, 0x1F, 0x20, 0x20, 4, 0x23, 0x23, -0x26, 0x26, 4, 0x1F, 0x20, 0x21, 0x22, 4, 0x23, 0x23, 0x26, 0x26, -4, 0x1F, 0x20, 0x21, 0x22, 3, 0x23, 0x23, 0x26, 0x26, 3, -0x1F, 0x1F, 0x1F, 0x1F, 2, 0x23, 0x23, 0x26, 0x26, 2, 0x1F, 0x20, -0x22, 0x22, 3, 0x23, 0x23, 0x26, 0x26, 3, 0x1F, 0x1F, -0x20, 0x20, 3, 0x23, 0x23, 0x26, 0x26, 3, 0x20, 0x20, 0x20, -0x21, 3, 0x23, 0x23, 0x26, 0x26, 3, 0x1F, 0x1F, 0x1F, 0x20 -};*/ -//__int16 word_4F0576[777]; // weak -/*__int16 word_4F0576[] = -{ -0x23, 0x23, 0x26, 0x26, 3, 0x21, 0x1F, 0x20, 0x22, 3, 0x23, 0x23, -0x26, 0x26, 3, 0x21, 0x1F, 0x20, 0x22, 4, 0x23, 0x23, 0x26, 0x26, -4, 0x21, 0x1F, 0x20, 0x22, 0x1, 0x1, 0x2, 0x2, 0x4, 0x4, -3, 2, 2, 2, 2, 2, 2, 0, 0x1, 0x1, 0x2, 0x2, 0x3, 0x3, 0x4, 0x4, -2, 2, 2, 2, 0x0, 0x0, 1, 0, 0xA3, 0xA3, 0xA2, 0xA1, 0xA0, -2, 0, 0xA3, 0xA3, 0xA2, 0xA1, 0xA0, 2, 0, 0xA3, 0xA3, -0xA2, 0xA1, 0xA0, 2, 0, 0x0A3, 0x0A3, 0xA2, 0xA1, 0xA0, -3, 0, 0xA3, 0xA3, 0xA2, 0xA1, 0xA0, 3, 0, 0xA3, 0xA3, -0xA2, 0xA1, 0xA0 -};*/ -//__int16 word_4F0578[777]; // weak -//__int16 word_4F05AE[777]; // weak - -//__int16 word_4F063E[290]; -//__int16 word_4F06D8[22]; int guild_mambership_flags[32]={ 54, 54, 54, 54, 52, 52, 52, 52, 55, 55, 55, 55, 53, 53, 53, 53, 58, 58, 58, 58, 57, 57, 57, 57, 56, 56, 56, 56, 59, 59, 60, 60}; __int16 word_4F0754[49]; -//__int16 word_4F07B6[88]; -//__int16 _word_4F0866_pMaxLevelPerTrainingHallType_negindexing[14]; -__int16 _4F0882_evt_VAR_PlayerItemInHands_vals[54]= +__int16 _4F0882_evt_VAR_PlayerItemInHands_vals[54] = { 0x0D4, 0x270, 0x0D5, 0x21C, 0x0D6, 0x2BE, 0x0D7, 0x2BD, 0x0D8, 0x289, 0x0D9, 0x258, 0x0DA, 0x2AB, 0x0DB, 0x281, 0x0DC, 0x280, 0x0DD, @@ -1354,40 +1055,6 @@ 4, 7, 10, 11, 7, 11, 7, 11}; -char aS03d[777]; // idb -char byte_4F0F98; // idb -char sz[777]; // idb -char aSSSSSS[777]; // idb -char aSDS[777]; // idb -char aSS_3[777]; // idb -char aSSSS[777]; // idb -char aS_2[777]; // idb -char aErrorlog_txt[777]; // idb -char aUnsupportedPix[777]; // idb -char aSmackerError[777]; // idb -char aCS[777]; // idb -char aAnimsMagic7_vi[777]; // idb -char aVideoFileError[777]; // idb -char aCanTOpenFileAn[777]; // idb -char aAnimsMight7_vi[777]; // idb -char aCanTLoadS[777]; // idb -char aS_smk[777]; // idb -char aUnsupportedBin[27]; // weak -char aEWorkMsdevM_29[777]; // idb -char aFailedToOpenBl[777]; // idb -char aCanTAllocateMe[33]; // weak -char aCanTLoadFileAn[777]; // idb -char aS_bik[777]; // idb -char aMm7_win_pcx[777]; // idb -char aLuSLuSLuS[777]; // idb -char aEndgame_fnt[777]; // idb -char aWinbg_pcx[10]; // weak -char aDefaultCaseRea[777]; // idb -char aUnsupportedExc[71]; // weak -char aEWorkMsdevM_30[777]; // idb -char aUndefinedTypeR[777]; // idb -char aUnknownPointer[777]; // idb -char a1_1_3[6]; // weak double dbl_4F2870; // weak int dword_4F288C; // weak double dbl_4F5372; // weak @@ -1509,8 +1176,7 @@ int dword_506984; // weak int dword_506988; // weak int dword_50698C; // weak -int dword_506E68; // weak -char KeyButtonFlagChangesArray[28]; // weak +int uGameMenuUI_CurentlySelectedKeyIdx; // 506E68 unsigned int pPrevVirtualCidesMapping[27]; int KeyboardPageNum; // weak int dword_506F0C[777]; // idb @@ -1546,8 +1212,6 @@ int dword_507B98_ctrl_pressed; // weak unsigned int uActiveCharacter; int dword_507BF0_is_there_popup_onscreen; // weak -int dword_507C08; // weak -int dword_507C0C; // weak int dword_507CBC; // weak int dword_507CC0; // weak __int64 GameUI_RightPanel_BookFlashTimer; // weak @@ -1562,26 +1226,16 @@ int _50B834_view_transformed_zs[45]; int dword_50B918[777]; int _50B924_view_transformed_xs[45]; -//int unk_50B9D4[777]; // idb int _50B9D8_screen_space_y[777]; int dword_50B9E4[777]; -//int dword_50B9E0_ys[777]; // idb -//int dword_50B9EC[777]; // idb int dword_50B9F0[2]; // idb -//int dword_50BAE8_xs[777]; -//int dword_50BAF4_xs[777]; -//int dword_50B9F8[777]; // idb int dword_50B9FC_ys[3 + 45]; int dword_50BA08_ys[48]; // idb -//int dword_50BAC4[777]; // weak int _50BAC8_screen_space_x[777]; // idb -//int dword_50BAD0[777]; // weak int dword_50BAD4[777]; // weak -//int dword_50BADC_xs[777]; // weak int dword_50BAE0[777]; // weak int dword_50BAE8[777]; // weak int dword_50BAEC_xs[3 + 45]; // weak -//int dword_50BAF4[777]; // weak int dword_50BAF8_xs[48]; // weak int dword_50BC10[777]; // weak int dword_50BDA0[777]; // weak @@ -1606,8 +1260,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