diff mm7_data.h @ 1235:7da06d00ad25

Слияние
author Ritor1
date Sun, 09 Jun 2013 21:10:32 +0600
parents be76a797780e 68655becb94b
children 7f4d7597fa2d
line wrap: on
line diff
--- a/mm7_data.h	Sun Jun 09 21:10:18 2013 +0600
+++ b/mm7_data.h	Sun Jun 09 21:10:32 2013 +0600
@@ -486,7 +486,7 @@
 extern std::array<const char*, 25> pPlayerPortraitsNames;
 
 extern std::array< std::array<unsigned char, 25>, 48> byte_4ECF08;
-extern unsigned char SoundSetAction[110][8]; // weak
+extern std::array<std::array<unsigned char, 8>, 110> SoundSetAction; // weak
 extern std::array<__int16, 4> pPlayerPortraitsXCoords_For_PlayerBuffAnimsDrawing;
 extern std::array< std::array<char, 37>, 36> byte_4ED970_skill_learn_ability_by_class_table;
 extern std::array<int, 777> dword_4EDEA0; // weak
@@ -755,8 +755,8 @@
 extern int dword_591178_teleporty; // weak
 extern int dword_59117C_teleportx; // weak
 extern std::array<std::array<char, 100>, 6> byte_591180; // idb
-extern std::array<struct NPCData *, 60> HouseNPCData; //this array size temporarily increased to 60 from 6 to work aroud house overflow
-
+extern std::array<struct NPCData *, 7> HouseNPCData; //0this array size temporarily increased to 60 from 6 to work aroud house overflow
+extern GUIButton* dword_5913F4[6];
 extern struct Texture *pTexture_591428;
 extern struct Texture *pTexture_outside; // idb
 extern struct Texture *pTexture_Dialogue_Background;