Mercurial > mm7

diff 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
line wrap: on
line diff
--- a/mm7_data.h	Tue Sep 17 15:40:36 2013 +0200
+++ b/mm7_data.h	Tue Sep 17 17:40:59 2013 +0200
@@ -663,7 +663,6 @@
 extern std::array<unsigned int, 16> papredoll_dbrds;
 
 extern int bRingsShownInCharScreen; // weak
-extern int _unused000; // weak
 
 extern std::array<std::array<unsigned __int16, 137>, 117> pOdmMinimap;
 extern unsigned int uNumBlueFacesInBLVMinimap;
@@ -1373,7 +1372,7 @@
   for ( int i=0; i < count; i++ )
     *p++ = value;
 }
-inline void __fastcall j_memset32(int a2, void *a1, unsigned int a3) {memset32(a1, a2, a3);}
+//inline void __fastcall j_memset32(int a2, void *a1, unsigned int a3) {memset32(a1, a2, a3);}
 
 
 #define ErrD3D(hr) do {extern void ErrHR(HRESULT, const char *, const char *, const char *, int); ErrHR(hr, "Direct3D", __FUNCTION__, __FILE__, __LINE__);} while(0)