diff mm7_data.cpp @ 1225:42b41aaecd87

Слияние
author Ritor1
date Wed, 05 Jun 2013 21:00:45 +0600
parents e8f3f8612cb0
children fa30ea497e94
line wrap: on
line diff
--- a/mm7_data.cpp	Wed Jun 05 21:00:11 2013 +0600
+++ b/mm7_data.cpp	Wed Jun 05 21:00:45 2013 +0600
@@ -1,3 +1,7 @@
+#ifdef _MSC_VER
+#define _CRT_SECURE_NO_WARNINGS
+#endif
+
 #include "mm7_data.h"
 
 #include "GUIWindow.h"
@@ -492,7 +496,7 @@
 unsigned int pHealthBarPos[4] = {22, 137, 251, 366};
 unsigned int pManaBarPos[4] = {102, 217, 331, 447};
 char _4E2B21_buff_spell_tooltip_colors[80];
-char monster_popup_y_offsets[88] =
+unsigned char monster_popup_y_offsets[88] =
 {
   236,  20,   0, 216,   0,   0,   0,   0,   0,   0, 206,
    20,   0, 246, 246, 236,  10, 246,   0,   0,   0, 236,
@@ -1126,7 +1130,7 @@
 int dword_591178_teleporty; // weak
 int dword_59117C_teleportx; // weak
 char byte_591180[6][100]; // idb
-struct NPCData *HouseNPCData[6];//array_5913D8
+struct NPCData *HouseNPCData[60];//array_5913D8
 
 struct Texture *pTexture_591428;
 struct Texture *pTexture_outside; // idb
@@ -1166,7 +1170,7 @@
 char pFinalMessage[4096]; // idb
 char pTmpBuf[2000];
 char pTmpBuf2[2000];
-char byte_5C6D50[777]; // weak
+char byte_5C6D50[100]; // weak
 int ui_current_text_color; // weak
 __int64 qword_5C6DF0; // weak
 int dword_5C6DF8; // weak