Mercurial > mm7
comparison 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 |
comparison
equal
deleted
inserted
replaced
1164:6b911d7e09a5 | 1165:29a8defbad9e |
---|---|
86 typedef int bool; // we want to use bool in our C programs | 86 typedef int bool; // we want to use bool in our C programs |
87 #endif | 87 #endif |
88 | 88 |
89 // Some convenience macros to make partial accesses nicer | 89 // Some convenience macros to make partial accesses nicer |
90 // first unsigned macros: | 90 // first unsigned macros: |
91 #ifdef HIBYTE | |
92 #undef HIBYTE | |
93 #endif // HIBYTE | |
94 #ifdef HIWORD | |
95 #undef HIWORD | |
96 #endif // HIWORD | |
97 #ifdef LOBYTE | |
98 #undef LOBYTE | |
99 #endif // LOBYTE | |
100 #ifdef LOWORD | |
101 #undef LOWORD | |
102 #endif // LOWORD | |
103 | |
91 #define LOBYTE(x) (*((_BYTE*)&(x))) // low byte | 104 #define LOBYTE(x) (*((_BYTE*)&(x))) // low byte |
92 #define LOWORD(x) (*((_WORD*)&(x))) // low word | 105 #define LOWORD(x) (*((_WORD*)&(x))) // low word |
93 #define LODWORD(x) (*((_DWORD*)&(x))) // low dword | 106 #define LODWORD(x) (*((_DWORD*)&(x))) // low dword |
94 #define HIBYTE(x) (*((_BYTE*)&(x)+1)) | 107 #define HIBYTE(x) (*((_BYTE*)&(x)+1)) |
95 #define HIWORD(x) (*((_WORD*)&(x)+1)) | 108 #define HIWORD(x) (*((_WORD*)&(x)+1)) |
148 #define SWORD3(x) SWORDn(x, 3) | 161 #define SWORD3(x) SWORDn(x, 3) |
149 #define SWORD4(x) SWORDn(x, 4) | 162 #define SWORD4(x) SWORDn(x, 4) |
150 #define SWORD5(x) SWORDn(x, 5) | 163 #define SWORD5(x) SWORDn(x, 5) |
151 #define SWORD6(x) SWORDn(x, 6) | 164 #define SWORD6(x) SWORDn(x, 6) |
152 #define SWORD7(x) SWORDn(x, 7) | 165 #define SWORD7(x) SWORDn(x, 7) |
153 | |
154 | 166 |
155 | 167 |
156 | 168 |
157 // Generate a reference to pair of operands | 169 // Generate a reference to pair of operands |
158 template<class T> int16 __PAIR__( int8 high, T low) { return ((( int16)high) << sizeof(high)*8) | uint8(low); } | 170 template<class T> int16 __PAIR__( int8 high, T low) { return ((( int16)high) << sizeof(high)*8) | uint8(low); } |
431 //extern int pMiscSkills[12]; | 443 //extern int pMiscSkills[12]; |
432 //extern int pMagicSkills[9]; | 444 //extern int pMagicSkills[9]; |
433 extern unsigned int pHealthBarPos[4]; | 445 extern unsigned int pHealthBarPos[4]; |
434 extern unsigned int pManaBarPos[4]; | 446 extern unsigned int pManaBarPos[4]; |
435 extern char _4E2B21_buff_spell_tooltip_colors[80]; | 447 extern char _4E2B21_buff_spell_tooltip_colors[80]; |
436 extern char monster_popup_y_offsets[]; // weak | 448 extern unsigned char monster_popup_y_offsets[]; // weak |
437 extern unsigned char hourglass_icon_idx; // weak | 449 extern unsigned char hourglass_icon_idx; // weak |
438 | 450 |
439 | 451 |
440 extern const char *format_4E2D80; | 452 extern const char *format_4E2D80; |
441 extern char format_4E2D90[8]; | 453 extern char format_4E2D90[8]; |