comparison mm7_data.cpp @ 279:3395164886cd

Слияние
author Ritor1
date Sun, 17 Feb 2013 19:48:54 +0600
parents f809f0465769 bcd55744c2f4
children e3b70ba42154
comparison
equal deleted inserted replaced
278:0191c3a3271c 279:3395164886cd
1 #include "mm7_data.h" 1 #include "mm7_data.h"
2 2
3 #include "NPC.h" 3 #include "NPC.h"
4 #include "Actor.h" 4 #include "Actor.h"
5 #include "GUIWindow.h"
5 6
6 7
7 8
8 void ErrHR(HRESULT hr, const char *pAPI, const char *pFunction, const char *pFile, int line) 9 void ErrHR(HRESULT hr, const char *pAPI, const char *pFunction, const char *pFile, int line)
9 { 10 {
475 char aUnknown[8]; // weak 476 char aUnknown[8]; // weak
476 char aS100110S[777]; // idb 477 char aS100110S[777]; // idb
477 char aS100110D[777]; // idb 478 char aS100110D[777]; // idb
478 char aS100110DS[777]; // idb 479 char aS100110DS[777]; // idb
479 char aS100110D02dSS[777]; // idb 480 char aS100110D02dSS[777]; // idb
480 int pCurrentScreen; // weak 481 int pCurrentScreen = SCREEN_VIDEO; // 004E28F8
481 char byte_4E28FC; // weak 482 char byte_4E28FC; // weak
482 unsigned int uGammaPos; 483 unsigned int uGammaPos;
483 int dword_4E2910[777]; // weak 484 int dword_4E2910[777]; // weak
484 __int16 RightClickPortraitXmin[4]; 485 __int16 RightClickPortraitXmin[4];
485 __int16 RightClickPortraitXmax[4]; 486 __int16 RightClickPortraitXmax[4];