Mercurial > mm7
diff mm7_data.cpp @ 629:59713bb36033
houses func moved to uihouses
| author | Gloval |
|---|---|
| date | Sun, 10 Mar 2013 20:57:52 +0400 |
| parents | cfca6297e4ae |
| children | 35ce4761382c |
line wrap: on
line diff
--- a/mm7_data.cpp Sun Mar 10 17:00:50 2013 +0400 +++ b/mm7_data.cpp Sun Mar 10 20:57:52 2013 +0400 @@ -68,205 +68,6 @@ Award pAwards[104]; #include "stru159.h" -stru159 pAnimatedRooms[196] = //0x4E5F70 -{ - {"", 0x4, 0x1F4, 0, 0, 0}, - {"Human Armor01", 0x20, 0x2C0, 2, 58, 0}, -{"Necromancer Armor01", 0x20, 0x2D7, 2, 70, 0 }, -{"Dwarven Armor01", 0x20, 0x2EE, 2, 5, 0 }, -{"Wizard Armor", 0x20, 0x3BD, 2, 19, 0 }, -{"Warlock Armor", 0x20, 0x2D6, 2, 35, 0 }, -{"Elf Armor", 0x20, 0x2BC, 2, 79, 0 }, -{"Human Alchemisht01", 0xE, 0x2BE, 4, 95, 0 }, -{"Necromancer Alchemist01", 0xE, 0x2D6, 4, 69, 0 }, -{"Dwarven Achemist01", 0xE, 0x387, 4, 4, 0 }, -{"Wizard Alchemist", 0xE, 0x232, 4, 25, 0 }, -{"Warlock Alchemist", 0xE, 0x2BE, 4, 42, 0 }, -{"Elf Alchemist", 0xE, 0x38A, 4, 84, 0 }, -{"Human Bank01", 0x6, 0x384, 22, 52, 0 }, -{"Necromancer Bank01", 0x6, 0x2D8, 22, 71, 0 }, -{"Dwarven Bank", 0x6, 0x2F3, 22, 6, 0 }, -{"Wizard Bank", 0x6, 0x3BA, 22, 20, 0 }, -{"Warlock Bank", 0x6, 0x39F, 22, 36, 0 }, -{"Elf Bank", 0x6, 0x2BC, 22, 71, 0 }, -{"Boat01", 0xF, 0x4C, 28, 53, 3 }, -{"Boat01d", 0xF, 0x4C, 28, 53, 3 }, -{"Human Magic Shop01", 0xA, 0x2C8, 3, 54, 0 }, -{"Necromancer Magic Shop01", 0xE, 0x2DC, 3, 66, 0 }, -{"Dwarven Magic Shop01", 0x2A, 0x2EF, 3, 91, 0 }, -{"Wizard Magic Shop", 0x1E, 0x2DF, 3, 15, 0 }, -{"Warlock Magic Shop", 0x7, 0x3B9, 3, 15, 0 }, -{"Elf Magic Shop", 0x24, 0x2CC, 3, 82, 0 }, -{"Human Stables01", 0x21, 0x31, 27, 48, 3 }, -{"Necromancer Stables", 0x21, 0x2DD, 27, 67, 3 }, -{"", 0x21, 0x2F0, 27, 91, 3 }, -{"Wizard Stables", 0x21, 0x3BA, 27, 16, 3 }, -{"Warlock Stables", 0x21, 0x181, 27, 77, 3 }, -{"Elf Stables", 0x21, 0x195, 27, 77, 3 }, -{"Human Tavern01", 0xD, 0x2C2, 21, 49, 0 }, -{"Necromancer Tavern01", 0xD, 0x3B0, 21, 57, 0 }, -{"Dwarven Tavern01", 0xD, 0x2FE, 21, 94, 0 }, -{"Wizard Tavern", 0xD, 0x3BB, 21, 17, 0 }, -{"Warlock Tavern", 0xD, 0x3A8, 21, 33, 0 }, -{"Elf Tavern", 0xD, 0x2CD, 21, 78, 0 }, -{"Human Temple01", 0x24, 0x2DB, 23, 50, 3 }, -{"Necromancer Temple", 0x24, 0x2DF, 23, 60, 3 }, -{"Dwarven Temple01", 0x24, 0x2F1, 23, 86, 3 }, -{"Wizard Temple", 0x24, 0x2E0, 23, 10, 3 }, -{"Warlock Temple", 0x24, 0x3A4, 23, 27, 3 }, -{"Elf Temple", 0x24, 0x2CE, 23, 72, 3 }, -{"Human Town Hall", 0x10, 0x39C, 17, 14, 0 }, -{"Necromancer Town Hall01", 0x10, 0x3A4, 17, 61, 0 }, -{"Dwarven Town Hall", 0x10, 0x2DB, 17, 88, 0 }, -{"Wizard Town Hall", 0x10, 0x3BD, 17, 11, 0 }, -{"Warlock Town Hall", 0x10, 0x2DB, 17, 28, 0 }, -{"Elf Town Hall", 0x10, 0x27A, 17, 73, 0 }, -{"Human Training Ground01", 0x18, 0x2C7, 30, 44, 0 }, -{"Necromancer Training Ground", 0x18, 0x3AD, 30, 62, 0 }, -{"Dwarven Training Ground", 0x18, 0x2F2, 30, 89, 0 }, -{"Wizard Training Ground", 0x18, 0x3A3, 30, 12, 0 }, -{"Warlock Training Ground", 0x18, 0x3A6, 30, 29, 0 }, -{"Elf Training Ground", 0x18, 0x19F, 30, 74, 0 }, -{"Human Weapon Smith01", 0x16, 0x2C1, 1, 45, 4 }, -{"Necromancer Weapon Smith01", 0x16, 0x2D9, 1, 63, 4 }, -{"Dwarven Weapon Smith01", 0x16, 0x2EE, 1, 82, 4 }, -{"Wizard Weapon Smith", 0x16, 0x2D5, 1, 13, 4 }, -{"Warlock Weapon Smith", 0x16, 0x2D7, 1, 23, 4 }, -{"Elf Weapon Smith", 0x16, 0x2CA, 1, 75, 4 }, -{"Air Guild", 0x1D, 0xA4, 6, 1, 3 }, -{"Body Guild", 0x19, 0x3BF, 11, 2, 0 }, -{"DarkGuild", 0x19, 0x2D1, 13, 3, 0 }, -{"EarthGuild", 0x19, 0x2CB, 8, 83, 0 }, -{"Fire Guild", 0x1C, 0x2BF, 5, 56, 0 }, -{"Light Guild", 0x1C, 0x2D5, 12, 46, 0 }, -{"Mind Guild", 0x1C, 0xE5, 10, 40, 0 }, -{"Spirit Guild", 0x1C, 0x2D2, 9, 41, 0 }, -{"Water Guild", 0x1B, 0x2D3, 7, 24, 0 }, -{"Lord And Judge Out01", 1, 0, 29, 39, 0 }, -{"Human Poor House 1", 8, 0, 29, 0, 0 }, -{"Human Poor House 2", 8, 0, 29, 0, 0 }, -{"Human Poor House 3", 8, 0, 29, 0, 0 }, -{"Human Medium House 1", 8, 0, 29, 0, 0 }, -{"Human Medium House 2", 8, 0, 29, 0, 0 }, -{"Human Medium House 3", 8, 0, 29, 0, 0 }, -{"Human Rich House 1", 8, 0, 29, 0, 0 }, -{"Human Rich House 2", 8, 0, 29, 0, 0 }, -{"Human Rich House 3", 8, 0, 29, 0, 0 }, -{"Elven Poor House 1", 8, 0, 29, 0, 0 }, -{"Elven Poor House 2", 8, 0, 29, 0, 0 }, -{"Elven Poor House 3", 8, 0, 29, 0, 0 }, -{"Elven Medium House 1", 8, 0, 29, 0, 0 }, -{"Elven Medium House 2", 8, 0, 29, 0, 0 }, -{"Elven Medium House 3", 8, 0, 29, 0, 0 }, -{"Elven Rich House 1", 8, 0, 29, 0, 0 }, -{"Elven Rich House 2", 8, 0, 29, 0, 0 }, -{"Elven Rich House 3", 8, 0, 29, 0, 0 }, -{"Dwarven Poor House 1", 8, 0, 29, 0, 0 }, -{"Dwarven Poor House 2", 8, 0, 29, 0, 0 }, -{"Dwarven Poor House 3", 8, 0, 29, 0, 0 }, -{"Dwarven Medium House 1", 8, 0, 29, 0, 0 }, -{"Dwarven Medium house 2", 8, 0, 29, 0, 0 }, -{"Dwarven Medium House 3", 8, 0, 29, 0, 0 }, -{"Dwarven Rich House 1", 8, 0, 29, 0, 0 }, -{"Dwarven Rich House 2", 8, 0, 29, 0, 0 }, -{"Dwarven Rich House 3", 8, 0, 29, 0, 0 }, -{"Wizard Poor House 1", 8, 0, 29, 0, 0 }, -{"Wizard Poor House 2", 8, 0, 29, 0, 0 }, -{"Wizard Poor House 3", 8, 0, 29, 0, 0 }, -{"Wizard Medium House 1", 8, 0, 29, 0, 0 }, -{"Wizard Medium House 2", 8, 0, 29, 0, 0 }, -{"Wizard Mdeium House 3", 8, 0, 29, 0, 0 }, -{"Wizard Rich House 1", 8, 0, 29, 0, 0 }, -{"Wizard Rich House 2", 8, 0, 29, 0, 0 }, -{"Wizard Rich House 3", 8, 0, 29, 0, 0 }, -{"Necromancer Poor House 1", 8, 0, 29, 0, 0 }, -{"Necromancer Poor House 2", 8, 0, 29, 0, 0 }, -{"Necromancer Poor House 3", 8, 0, 29, 0, 0 }, -{"Necromancer Medium House 1", 8, 0, 29, 0, 0 }, -{"Necromancer Medium House 2", 8, 0, 29, 0, 0 }, -{"Necromancer Mdeium House 3", 8, 0, 29, 0, 0 }, -{"Necromancer Rich House 1", 8, 0, 29, 0, 0 }, -{"Necromancer Rich House 2", 8, 0, 29, 0, 0 }, -{"Necromancer Rich House 3", 8, 0, 29, 0, 0 }, -{"Warlock Poor House 1", 8, 0, 29, 0, 0 }, -{"Warlock Poor House 2", 8, 0, 29, 0, 0 }, -{"Warlock Poor House 3", 8, 0, 29, 0, 0 }, -{"Warlock Medium House 1", 8, 0, 29, 0, 0 }, -{"Warlock Medium House 2", 8, 0, 29, 0, 0 }, -{"Warlock Mdeium House 3", 8, 0, 29, 0, 0 }, -{"Warlock Rich House 1", 8, 0, 29, 0, 0 }, -{"Warlock Rich House 2", 8, 0, 29, 0, 0 }, -{"Warlock Rich House 3", 8, 0, 29, 0, 0 }, -{"Out01 Temple of the Moon", 0x24, 0, 25, 0, 0 }, -{"Out01 Dragon Cave", 0x24, 0, 25, 0, 0 }, -{"Out02 Castle Harmondy", 0x24, 0, 25, 0, 0 }, -{"Out02 White Cliff Cave", 0x24, 0, 25, 0, 0 }, -{"Out03 Erathian Sewer", 0x24, 0, 25, 0, 0 }, -{"Out03 Fort Riverstride", 0x24, 0, 25, 0, 0 }, -{"Out03 Castle Gryphonheart", 0x24, 0, 25, 0, 0 }, -{"Out04 Elf Castle", 0x24, 0, 25, 0, 0 }, -{"Out04 Tularean Caves", 0x24, 0, 25, 0, 0 }, -{"Out04 Clanker's Laboratory", 0x24, 0, 25, 0, 0 }, -{"Out05 Hall of the Pit", 0x24, 0, 25, 0, 0 }, -{"Out05 Watchtower 6", 0x24, 0, 25, 0, 0 }, -{"Out06 School of Sorcery", 0x24, 0, 25, 0, 0 }, -{"Out06 Red Dwarf Mines", 0x24, 0, 25, 0, 0 }, -{"Out07 Castle Lambert", 0x24, 0, 25, 0, 0 }, -{"Out07 Walls of Mist", 0x24, 0, 25, 0, 0 }, -{"Out07 Temple of the Light", 0x24, 0, 25, 0, 0 }, -{"Out08 Evil Entrance", 0x24, 0, 25, 0, 0 }, -{"Out08 Breeding Zone", 0x24, 0, 25, 0, 0 }, -{"Out08 Temple of the Dark", 0x24, 0, 25, 0, 0 }, -{"Out09 Grand Temple of the Moon", 0x24, 0, 25, 0, 0 }, -{"Out09 Grand Tempple of the Sun", 0x24, 0, 25, 0, 0 }, -{"Out10 Thunderfist Mountain", 0x24, 0, 25, 0, 0 }, -{"Out10 The Maze", 0x24, 0, 25, 0, 0 }, -{"Out10 Connecting Tunnel Cave #1", 0x24, 0, 25, 0, 0 }, -{"", 0x24, 0, 25, 0, 0 }, -{"", 0x24, 0, 25, 0, 0 }, -{"Out11 Stone City", 0x24, 0, 25, 0, 0 }, -{"", 0x24, 0, 25, 0, 0 }, -{"Out12 Colony Zod", 0x24, 0, 25, 0, 0 }, -{"Out12 Connecting Tunnel Cave #1", 0x24, 0, 25, 0, 0 }, -{"", 0x24, 0, 25, 0, 0 }, -{"", 0x24, 0, 25, 0, 0 }, -{"Out13 Mercenary Guild", 0x24, 0, 25, 0, 0 }, -{"Out13 Tidewater Caverns", 0x24, 0, 25, 0, 0 }, -{"Out13 Wine Cellar", 0x24, 0, 25, 0, 0 }, -{"Out14 Titan's Stronghold", 0x24, 0, 25, 0, 0 }, -{"Out14 Temple Of Baa", 0x24, 0, 25, 0, 0 }, -{"Out14 Hall under the Hill", 0x24, 0, 25, 0, 0 }, -{"Out15 The Linclon", 0x24, 0, 25, 0, 0 }, -{"Jail", 0x24, 0, 31, 0, 0 }, -{"Harmondale Throne Room", 0x24, 0, 29, 0, 0 }, -{"Gryphonheart Throne Room", 0x24, 0, 20, 0, 0 }, -{"Elf Castle Throne Room", 0x24, 0, 20, 0, 0 }, -{"Wizard Castle Throne Room", 0x24, 0, 20, 0, 0 }, -{"Necromancer Casstle Trone Room", 0x24, 0, 20, 0, 0 }, -{"Master Thief", 0x24, 0, 29, 0, 0 }, -{"Dwarven King", 0x24, 0, 20, 0, 0 }, -{"Arms Master", 0x24, 0, 29, 0, 0 }, -{"Warlock", 0x24, 0, 29, 0, 0 }, -{"Lord Markam", 0x24, 0, 20, 0, 0 }, -{"Arbiter Neutral Town", 0x24, 0, 29, 0, 0 }, -{"Arbiter Good Town", 0x24, 0, 29, 0, 0 }, -{"Arbiter Evil Town", 0x24, 0, 29, 0, 0 }, -{"Necromancer Throne Room Empty", 0x24, 0, 20, 0, 0 }, -{"", 0x24, 0, 29, 0, 0 }, -{"", 0x24, 0, 29, 0, 0 }, -{"", 0x24, 0, 29, 0, 0 }, -{"", 0x24, 0, 29, 0, 0 }, -{"Boat01", 0xF, 0, 29, 53, 3 }, -{"", 0x24, 0, 28, 0, 0 }, -{"", 0x24, 0, 28, 0, 0 }, -{"", 0x24, 0, 28, 0, 0 }, -{"", 0x24, 0, 29, 0, 0 }, -{"Arbiter Room Neutral", 0x24, 0, 29, 0, 0 }, -{"Out02 Castle Harmondy Abandoned", 0x24, 0, 25, 0, 0 }, -{"Human Temple02", 0x24, 0x3AB, 23, 27, 0 }, -{"Player Castle Good", 0x24, 0, 25, 0, 0 }, -{"Player Castle Bad", 0x24, 0, 25, 0, 0} -}; #include "stru160.h" stru160 array_4EB8B8[66] = @@ -2001,7 +1802,7 @@ __int64 _5773B8_event_timer; // weak int dword_5773C0; // weak -int dword_591080; // weak + int dword_591084; // weak struct Actor *pDialogue_SpeakingActor; unsigned int uDialogueType; @@ -2018,9 +1819,7 @@ int dword_59117C_teleportx; // weak char byte_591180[600]; // idb struct NPCData *HouseNPCData[6];//array_5913D8 -int pDialogueNPCCount; -struct Texture *pDialogueNPCPortraits[6]; -int uNumDialogueNPCPortraits; // weak + struct Texture *pTexture_591428; struct Texture *pTexture_outside; // idb struct Texture *pTexture_Dialogue_Background; @@ -2052,7 +1851,7 @@ int bDialogueUI_InitializeActor_NPC_ID; // weak int dword_5C35C8; // weak char *p2DEventsTXT_Raw; -int uHouse_ExitPic; // weak + int dword_5C35D4; // weak char *aAMPMNames[2]; char byte_5C45AF[777]; // weak @@ -2261,7 +2060,7 @@ int dword_723E84[777]; // weak int dword_7241C8; // weak struct unk_F7B60C stru_73C834; // struct @ MM7.exe::0073C834 -struct NPCStats *pNPCStats = nullptr; + char *aNPCProfessionNames[59]; char *pAwardsTXT_Raw; char *pScrollsTXT_Raw;