Mercurial > mm7
diff mm7_data.cpp @ 2154:9bd7522cdbbb
Render decoupling.
Unsorted variables cleaning.
author | Nomad |
---|---|
date | Thu, 09 Jan 2014 14:36:48 +0200 |
parents | d28d3c006077 |
children | 5b27c035a241 |
line wrap: on
line diff
--- a/mm7_data.cpp Thu Jan 09 02:34:20 2014 +0200 +++ b/mm7_data.cpp Thu Jan 09 14:36:48 2014 +0200 @@ -336,16 +336,9 @@ int pWindowList_at_506F50_minus1_indexing[1]; int dword_4C9890[10]; // weak int dword_4C9920[16]; // weak -_UNKNOWN unk_4D8548; // weak char byte_4D864C; // weak float flt_4D86CC = 1.0f; // weak -int dword_4D86D8; // weak -int dword_4DAFCC; // weak -int (__stdcall *off_4DAFDC)(char); // weak -char asc_4DB724[777]; // idb -int dword_4DBD94; // weak -//int dword_4DF390; // weak -char Str2[777]; // idb +int dword_4D86D8 = 0x40000000; // weak @@ -355,97 +348,6 @@ float flt_4D84E8 = 0.0f; -char aIxf[4]; // idb -_UNKNOWN unk_4E19FC; // weak -char aD[777]; // idb -char asc_4E1AB0[777]; // idb -char aWb_0[777]; // idb -char a24bitPcxOnly[777]; // idb -char Mode[777]; // idb -char a16bitPcx[777]; // idb -char aUnableToLoadS[777]; // idb -char aBitmaps[777]; // idb -char aIcons[777]; // idb -char aPending[777]; // idb -char aCanTFindS[777]; // idb - -//std::array<char, 7> aSbwb00; // weak -char aW[2]; // idb -char aA[2]; // idb -char aSD[777]; // idb -char aSS03d03dS000S0[777]; // idb -char aLuS[777]; // idb -char aS_1[777]; // idb -char aSbSc02d[777]; // idb -char aSbSs02d[777]; // idb -char aTabDb[777]; // idb -char aTabDa[777]; // idb -char aIbM6D[777]; // idb -char aIbM6U[777]; // idb -char aIbM5D[777]; // idb -char aIbM5U[777]; // idb -char aPagemask[777]; // idb -char aBook[777]; // idb -char aSpell_fnt[777]; // idb -char aAutonote_fnt[777]; // idb -char aBook2_fnt[777]; // idb -char pFontFile[777]; // idb -char aFontpal[777]; // idb -char aMapbordr[777]; // idb -char aLloydDD_pcx[777]; // idb -char aDataLloydDD_pc[777]; // idb -char aLb_bordr[777]; // idb -char aTphell[777]; // idb -char aTpheaven[777]; // idb -char aTpisland[777]; // idb -char aTpwarlock[777]; // idb -char aTpelf[777]; // idb -char aTpharmndy[777]; // idb -char aTownport[777]; // idb -char aSbquiknot[777]; // idb -char aTabAn8a[777]; // idb -char aTabAn8b[777]; // idb -char aTabAn4a[777]; // idb -char aTabAn4b[777]; // idb -char aTabAn5a[777]; // idb -char aTabAn5b[777]; // idb -char aTabAn3a[777]; // idb -char aTabAn3b[777]; // idb -char aTabAn2a[777]; // idb -char aTabAn2b[777]; // idb -char aTabAn1a[777]; // idb -char aTabAn1b[777]; // idb -char aDivbar[777]; // idb -char aSbautnot[777]; // idb -char aTabwoff[777]; // idb -char aTabwon[777]; // idb -char aTabeoff[777]; // idb -char aTabeon[777]; // idb -char aTabsoff[777]; // idb -char aTabson[777]; // idb -char aTabnoff[777]; // idb -char aTabnon[777]; // idb -char aZootOff[777]; // idb -char aZoomOff[777]; // idb -char aZootOn[777]; // idb -char aZoomOn[777]; // idb -char aSbmap[777]; // idb -char aMoon_ful[777]; // idb -char aMoon_2[777]; // idb -char aMoon_4[777]; // idb -char aMoon_new[777]; // idb -char aSbdateTime[777]; // idb -char aTabAn7a[777]; // idb -char aTabAn6a[777]; // idb -char aTabAn7b[777]; // idb -char aTabAn6b[777]; // idb -char aSbplayrnot[777]; // idb -char aPending_0[777]; // idb -char aUnknown[8]; // weak -char aS100110S[777]; // idb -char aS100110D[777]; // idb -char aS100110DS[777]; // idb -char aS100110D02dSS[777]; // idb int pCurrentScreen = SCREEN_VIDEO; // 004E28F8 unsigned int uGammaPos; std::array<int, 8> BtnTurnCoord = @@ -454,7 +356,6 @@ }}; // weak std::array<__int16, 4> RightClickPortraitXmin={{0x14, 0x83, 0xF2, 0x165}}; std::array<__int16, 4> RightClickPortraitXmax={{0x53, 0xC6, 0x138, 0x1A7}}; -void *off_4E2A12; // stat_string_control_button_count std::array<unsigned int, 4> pHealthBarPos = {{22, 137, 251, 366}}; std::array<unsigned int, 4> pManaBarPos = {{102, 217, 331, 447}}; @@ -478,17 +379,11 @@ const char *format_4E2DE8 = "\f%05d%s\f00000 - "; const char *format_4E2E00 = "%s\f%05u\xD\r180%s\n"; // idb const char *format_4E2E10 = "%s\f%05u\t110%d\f00000 / %d\n"; -__int16 word_4E3C66[777]; // idb int dword_4E455C; // weak std::array<int, 6> dword_4E4560; std::array<int, 6> dword_4E4578; std::array<int, 6> dword_4E4590; std::array<int, 6> dword_4E45A8; -_UNKNOWN dword_4E49D4; // idb -int dword_4E4A18[777]; // weak -int dword_4E4A1C[777]; // weak -int dword_4E4A40[777]; // weak -int dword_4E4A44[777]; // weak std::array<float, 10> flt_4E4A80 = { 0.050000001, 0.1, 0.30000001, 0.5, 0.60000002, @@ -547,10 +442,9 @@ std::array<__int16, 11> word_4E8152 = {0, 0, 0, 90, 8, 2, 70, 20, 10, 50, 30}; -char byte_4E94D0 = 5; // weak -char byte_4E94D1 = 9; // weak +char _4E94D0_light_type = 5; // weak char _4E94D2_light_type = 6; // weak -char byte_4E94D3 = 10; // weak +char _4E94D3_light_type = 10; // weak int dword_4E98BC_bApplicationActive; // weak //char *off_4EB080; // idb std::array<char*, 465> pTransitionStrings = {"", nullptr}; // 004EB080 @@ -777,11 +671,9 @@ 3, 0, 2, 0, 0, 1, 0, 4, 0, 2, 0, 0, 4, 4, 4, 4, 0, 0, 0, 4, 0, 4, 1, 2, 0, 3, 2, 1, 0, 0, 0, 0, 4, 0, 0, 3, 3, 3, 0, 2, 0, 0, 1, 0, 4, 0, 2, 0, 0, 4, 4, 4, 4, 0, 0, 0, 0, 4, 4, 1, 2, 0, 3, 2, 1, 0, 0, 0, 0, 4, 0, 0, 3, 3, }}; -_UNKNOWN unk_4EDF40; // weak std::array<unsigned int, 2> pHiredNPCsIconsOffsetsX = {489, 559}; std::array<unsigned int, 2> pHiredNPCsIconsOffsetsY = {152, 152}; std::array<int, 2> dword_4EE07C; // weak -_UNKNOWN unk_4EE084; // weak std::array<__int16, 101> word_4EE088_sound_ids = {{ 0, 10000, 10010, 10020, 10030, 10040, 10050, 10060, 10070, 10080, @@ -802,12 +694,7 @@ 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 60 }}; -int dword_4EED78; // weak -_UNKNOWN unk_4EED80; // weak int ScreenshotFileNumber; // dword_4EFA80 -int dword_4EFA84; // weak -void *off_4EFDB0; // weak -int dword_4F031C[777]; // weak std::array<const char *, 19> off_4F03B8 = {{ "", "WEPNTABL", "ARMORY", "MAGSHELF", @@ -869,12 +756,6 @@ 4, 7, 10, 11, 7, 11, 7, 11}}; -double dbl_4F2870; // weak -int dword_4F288C; // weak -double dbl_4F5372; // weak -int dword_4F5428[777]; // weak -int dword_4F542C[777]; // weak -_UNKNOWN crtunk_4F54B8; // weak std::array<int, 500> ai_array_4F5E68; std::array<int, 500> ai_array_4F6638_actor_ids; std::array<int, 500> ai_near_actors_targets_pid; @@ -883,16 +764,9 @@ std::array<unsigned int, 500> ai_near_actors_ids; std::array<int, 182> dword_4F8580; // weak - - -_UNKNOWN unk_4FAA20; // weak char byte_4FAA24; // weak //HWND dword_4FAA28; // idb - - - -int dword_505890; // weak std::array<unsigned int, 480> pSRZBufferLineOffsets; int areWeLoadingTexture; // weak std::array<char, 777> books_num_items_per_page; // weak @@ -904,8 +778,6 @@ __int64 qword_506350; // weak char byte_506360; // weak int dword_506364; // weak -//Texture *dword_506404[12]; // weak -//Texture *dword_50640C[12]; // weak unsigned int uExitCancelTextureId; int books_page_number; // weak int books_primary_item_per_page; // weak @@ -961,7 +833,6 @@ std::array<const char *, 7> aDayNames; std::array<const char *, 9> aSpellSchoolNames; std::array<const char *, 7> aAttributeNames; -int dword_507B94; // weak unsigned int uActiveCharacter; int dword_507BF0_is_there_popup_onscreen; // weak int awards_scroll_bar_created; // weak @@ -972,31 +843,11 @@ std::array<int, 50> dword_50B570; // weak std::array<int, 50> dword_50B638; // weak stru367 PortalFace; -/*int PortalFace.field_0; // weak -int PortalFace.field_38[777]; // idb -int PortalFace._view_transformed_ys[45]; -int PortalFace.field_128[777]; -int PortalFace._view_transformed_zs[45]; -int PortalFace.field_218[777]; -int PortalFace._view_transformed_xs[45]; -int PortalFace._screen_space_y[777]; -int PortalFace.field_3E4[777]; -int PortalFace.field_2F0[2]; // idb -int PortalFace._ys[3 + 45]; -int PortalFace._ys2[48]; // idb -int PortalFace._screen_space_x[777]; // idb -int PortalFace.field_3D4[777]; // weak -int PortalFace._xs[777]; // weak -int dword_50BAE8[777]; // weak -int PortalFace._xs2[3 + 45]; // weak -int PortalFace._xs3[48]; // weak*/ std::array<int, 100> dword_50BC10; // weak std::array<int, 100> dword_50BDA0; // weak std::array<int, 100> dword_50BF30; // weak char town_portal_caster_id; // weak int some_active_character; // weak -//_UNKNOWN unk_50C190; // weak -int dword_50C968; // weak std::array<unsigned int, 5> pIconIDs_Turn; unsigned int uIconID_TurnStop; unsigned int uIconID_TurnHour; @@ -1007,7 +858,6 @@ int uSpriteID_Spell11; // idb bool _50C9A0_IsEnchantingInProgress; // weak int _50C9A8_item_enchantment_timer = 0; // weak -int dword_50C9AC; // weak int _50C9D0_AfterEnchClickEventId; // weak int _50C9D4_AfterEnchClickEventSecondParam; // weak int _50C9D8_AfterEnchClickEventTimeout; // weak @@ -1016,7 +866,6 @@ //int dword_50C9E8; // idb //int dword_50C9EC[120]; // weak int dword_50CDC8; -int bProcessorIsNotIntel; // weak Vec3_int_ layingitem_vel_50FDFC; char pStartingMapName[32]; // idb std::array<unsigned __int8, 5> IsPlayerWearingWatersuit; @@ -1031,7 +880,6 @@ int dword_576E28; // weak int _576E2C_current_minimap_zoom; // weak __int64 _5773B8_event_timer; // weak -int _5773C0_unused; // weak int dword_591084; // weak @@ -1054,7 +902,6 @@ struct Texture *pTexture_591428; struct Texture *pTexture_outside; // idb struct Texture *pTexture_Dialogue_Background; -_UNKNOWN unk_597F10; // weak std::array<char, 2000> byte_5B0938; int EvtTargetObj; // 0x5B5920 int _unused_5B5924_is_travel_ui_drawn = false; // 005B5924 @@ -1071,15 +918,13 @@ signed int dword_5B65D0_dialogue_actor_npc_id; // weak int dword_5C3418; // weak int dword_5C341C; // weak -int _5C3420_pDecoration; //std::array<char, 777> byte_5C3427; // weak std::array<char, 200> GameUI_Footer_TimedString; std::array<char, 200> pFooterString; unsigned int GameUI_Footer_TimeLeft; int bForceDrawFooter; // weak -int dword_5C35C0; // weak +int _5C35C0_force_party_death = false; // weak int bDialogueUI_InitializeActor_NPC_ID; // weak -int dword_5C35C8; // weak char *p2DEventsTXT_Raw; int dword_5C35D4; // weak @@ -1155,8 +1000,6 @@ unsigned int uTextureID_save_up; unsigned int uTextureID_load_up; unsigned int uTextureID_loadsave; -_UNKNOWN _69FBB4_ptr_iterator_end; // weak -_UNKNOWN unk_6A0758; // weak int pSaveListPosition; // weak unsigned int uLoadGameUI_SelectedSlot; HWND hInsertCDWindow; // idb