Mercurial > mm7
diff mm7_data.h @ 1165:29a8defbad9e
temporary _CRT_SECURE_NO_WARNINGS to remove some warnings
removed double LOBYTE, LOWORD etd macro definitions
swprintf called with string size parameter
ErrD3D with too many params fix
1 or 2 other minor fixes
| author | Grumpy7 |
|---|---|
| date | Tue, 04 Jun 2013 03:21:21 +0200 |
| parents | 502b8b2e36b4 |
| children | e8f3f8612cb0 |
line wrap: on
line diff
--- a/mm7_data.h Tue Jun 04 02:03:43 2013 +0200 +++ b/mm7_data.h Tue Jun 04 03:21:21 2013 +0200 @@ -88,6 +88,19 @@ // Some convenience macros to make partial accesses nicer // first unsigned macros: +#ifdef HIBYTE +#undef HIBYTE +#endif // HIBYTE +#ifdef HIWORD +#undef HIWORD +#endif // HIWORD +#ifdef LOBYTE +#undef LOBYTE +#endif // LOBYTE +#ifdef LOWORD +#undef LOWORD +#endif // LOWORD + #define LOBYTE(x) (*((_BYTE*)&(x))) // low byte #define LOWORD(x) (*((_WORD*)&(x))) // low word #define LODWORD(x) (*((_DWORD*)&(x))) // low dword @@ -153,7 +166,6 @@ - // Generate a reference to pair of operands template<class T> int16 __PAIR__( int8 high, T low) { return ((( int16)high) << sizeof(high)*8) | uint8(low); } template<class T> int32 __PAIR__( int16 high, T low) { return ((( int32)high) << sizeof(high)*8) | uint16(low); } @@ -433,7 +445,7 @@ extern unsigned int pHealthBarPos[4]; extern unsigned int pManaBarPos[4]; extern char _4E2B21_buff_spell_tooltip_colors[80]; -extern char monster_popup_y_offsets[]; // weak +extern unsigned char monster_popup_y_offsets[]; // weak extern unsigned char hourglass_icon_idx; // weak