Mercurial > mm7

comparison mm7_data.h @ 1640:afc1c3514dd5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Some common code from ODM and BLV RenderParams moved to IndoorCameraD3D
author Nomad
date Tue, 17 Sep 2013 17:40:59 +0200
parents b60ddd777d50
children 466c5e15f524
comparison
equal deleted inserted replaced
1639:b60ddd777d50 1640:afc1c3514dd5
661 extern std::array<char, 54> party_has_equipment; 661 extern std::array<char, 54> party_has_equipment;
662 extern std::array<char, 17> byte_5111F6; 662 extern std::array<char, 17> byte_5111F6;
663 extern std::array<unsigned int, 16> papredoll_dbrds; 663 extern std::array<unsigned int, 16> papredoll_dbrds;
664 664
665 extern int bRingsShownInCharScreen; // weak 665 extern int bRingsShownInCharScreen; // weak
666 extern int _unused000; // weak
667 666
668 extern std::array<std::array<unsigned __int16, 137>, 117> pOdmMinimap; 667 extern std::array<std::array<unsigned __int16, 137>, 117> pOdmMinimap;
669 extern unsigned int uNumBlueFacesInBLVMinimap; 668 extern unsigned int uNumBlueFacesInBLVMinimap;
670 extern std::array<unsigned __int16, 50> pBlueFacesInBLVMinimapIDs; 669 extern std::array<unsigned __int16, 50> pBlueFacesInBLVMinimapIDs;
671 extern std::array<int, 14> pTextureIDs_PartyBuffIcons; 670 extern std::array<int, 14> pTextureIDs_PartyBuffIcons;
1371 { 1370 {
1372 auto p = (unsigned __int32 *)ptr; 1371 auto p = (unsigned __int32 *)ptr;
1373 for ( int i=0; i < count; i++ ) 1372 for ( int i=0; i < count; i++ )
1374 *p++ = value; 1373 *p++ = value;
1375 } 1374 }
1376 inline void __fastcall j_memset32(int a2, void *a1, unsigned int a3) {memset32(a1, a2, a3);} 1375 //inline void __fastcall j_memset32(int a2, void *a1, unsigned int a3) {memset32(a1, a2, a3);}
1377 1376
1378 1377
1379 #define ErrD3D(hr) do {extern void ErrHR(HRESULT, const char *, const char *, const char *, int); ErrHR(hr, "Direct3D", __FUNCTION__, __FILE__, __LINE__);} while(0) 1378 #define ErrD3D(hr) do {extern void ErrHR(HRESULT, const char *, const char *, const char *, int); ErrHR(hr, "Direct3D", __FUNCTION__, __FILE__, __LINE__);} while(0)
1380 1379
1381 1380