Mercurial > mm7
comparison mm7_data.h @ 1658:55bdb9b043e3
Merge
author | Grumpy7 |
---|---|
date | Wed, 18 Sep 2013 10:23:47 +0200 |
parents | 51a74615d956 a7eebb6ee7a2 |
children | 483cc7f0d86c 3c451fd02fcf |
comparison
equal
deleted
inserted
replaced
1657:51a74615d956 | 1658:55bdb9b043e3 |
---|---|
883 extern float flt_6BE150_look_up_down_dangle; // weak | 883 extern float flt_6BE150_look_up_down_dangle; // weak |
884 //extern char pMM7WindowClassName[]; // idb | 884 //extern char pMM7WindowClassName[]; // idb |
885 //extern HINSTANCE hInstance; // idb | 885 //extern HINSTANCE hInstance; // idb |
886 //extern char *pCmdLine; | 886 //extern char *pCmdLine; |
887 extern HWND hWnd; // idb | 887 extern HWND hWnd; // idb |
888 extern int uWindowWidth; // idb | |
889 extern int uWindowHeight; // idb | |
890 extern int uWindowX; // idb | |
891 extern int uWindowY; // idb | |
892 extern LONG uWindowStyle; // idb | |
893 extern int dword_6BE340; // weak | 888 extern int dword_6BE340; // weak |
894 extern char pCurrentMapName[32]; // idb | 889 extern char pCurrentMapName[32]; // idb |
895 extern unsigned int uLevelMapStatsID; | 890 extern unsigned int uLevelMapStatsID; |
896 extern int dword_6BE364_game_settings_1; // weak | 891 extern int dword_6BE364_game_settings_1; // weak |
897 extern int dword_6BE368_debug_settings_2; // weak | 892 extern int dword_6BE368_debug_settings_2; // weak |
1405 for ( int i=0; i < count; i++ ) | 1400 for ( int i=0; i < count; i++ ) |
1406 *p++ = value; | 1401 *p++ = value; |
1407 } | 1402 } |
1408 //inline void __fastcall j_memset32(int a2, void *a1, unsigned int a3) {memset32(a1, a2, a3);} | 1403 //inline void __fastcall j_memset32(int a2, void *a1, unsigned int a3) {memset32(a1, a2, a3);} |
1409 | 1404 |
1405 void CenterWindowAndAdjustSize(HWND hwnd, int client_width, int client_height); | |
1410 | 1406 |
1411 #define ErrD3D(hr) do {extern void ErrHR(HRESULT, const char *, const char *, const char *, int); ErrHR(hr, "Direct3D", __FUNCTION__, __FILE__, __LINE__);} while(0) | 1407 #define ErrD3D(hr) do {extern void ErrHR(HRESULT, const char *, const char *, const char *, int); ErrHR(hr, "Direct3D", __FUNCTION__, __FILE__, __LINE__);} while(0) |
1412 | 1408 |
1413 | 1409 |
1414 namespace zlib | 1410 namespace zlib |