Browse Source

Use RECT32 struct for attribute_inc_rects

pull/88/head
Robin Eklind 7 years ago
parent
commit
0501ff10ef
  1. 18
      Source/control.cpp
  2. 2
      Source/control.h
  3. 12
      structs.h

18
Source/control.cpp

@ -159,7 +159,7 @@ char *PanBtnStr[8] = {
"Send Message",
"Player Attack"
};
int attribute_inc_rects[4][4] = {
RECT32 attribute_inc_rects[4] = {
{ 137, 138, 41, 22 },
{ 137, 166, 41, 22 },
{ 137, 195, 41, 22 },
@ -2238,10 +2238,10 @@ void CheckChrBtns()
default:
continue;
}
if (MouseX >= attribute_inc_rects[i][0]
&& MouseX <= attribute_inc_rects[i][0] + attribute_inc_rects[i][2]
&& MouseY >= attribute_inc_rects[i][1]
&& MouseY <= attribute_inc_rects[i][3] + attribute_inc_rects[i][1]) {
if (MouseX >= attribute_inc_rects[i].x
&& MouseX <= attribute_inc_rects[i].x + attribute_inc_rects[i].w
&& MouseY >= attribute_inc_rects[i].y
&& MouseY <= attribute_inc_rects[i].y + attribute_inc_rects[i].h) {
chrbtn[i] = TRUE;
chrbtnactive = TRUE;
}
@ -2257,10 +2257,10 @@ void ReleaseChrBtns()
for (i = 0; i < 4; ++i) {
if (chrbtn[i]) {
chrbtn[i] = FALSE;
if (MouseX >= attribute_inc_rects[i][0]
&& MouseX <= attribute_inc_rects[i][0] + attribute_inc_rects[i][2]
&& MouseY >= attribute_inc_rects[i][1]
&& MouseY <= attribute_inc_rects[i][3] + attribute_inc_rects[i][1]) {
if (MouseX >= attribute_inc_rects[i].x
&& MouseX <= attribute_inc_rects[i].x + attribute_inc_rects[i].w
&& MouseY >= attribute_inc_rects[i].y
&& MouseY <= attribute_inc_rects[i].y + attribute_inc_rects[i].h) {
switch (i) {
case 0:
NetSendCmdParam1(TRUE, CMD_ADDSTR, 1);

2
Source/control.h

@ -131,7 +131,7 @@ extern unsigned char SpellITbl[MAX_SPELLS];
extern int PanBtnPos[8][5];
extern char *PanBtnHotKey[8];
extern char *PanBtnStr[8];
extern int attribute_inc_rects[4][4];
extern RECT32 attribute_inc_rects[4];
extern int SpellPages[6][7];
#endif /* __CONTROL_H__ */

12
structs.h

@ -1,3 +1,15 @@
//////////////////////////////////////////////////
// control
//////////////////////////////////////////////////
// size: 0x10
typedef struct RECT32 {
int x;
int y;
int w;
int h;
} RECT32;
//////////////////////////////////////////////////
// items
//////////////////////////////////////////////////

Loading…
Cancel
Save