mirror
/
devilutionX
mirror of https://github.com/diasurgical/devilutionX.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #1083 from AJenbo/control.cpp 

Correct types in control.cpp
pull/100/head
Robin Eklind 7 years ago committed by GitHub
parent
8ec6423ea4 48212a62f6
commit
0280c30df9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 22 additions and 22 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 38
      Source/control.cpp
  2. 6
      Source/control.h

38
Source/control.cpp
Unescape View File

@ -6,8 +6,8 @@ void *pDurIcons;
void *pChrButtons; void *pChrButtons;
BOOL drawhpflag; // idb BOOL drawhpflag; // idb
BOOL dropGoldFlag; BOOL dropGoldFlag;
WORD panbtn[8]; int panbtn[8];
WORD chrbtn[4]; int chrbtn[4];
void *pMultiBtns; void *pMultiBtns;
void *pPanelButtons; void *pPanelButtons;
void *pChrPanel; void *pChrPanel;
@ -25,7 +25,7 @@ void *pTalkBtns;
int pstrjust[4]; int pstrjust[4];
int pnumlines; // idb int pnumlines; // idb
BOOL pinfoflag; BOOL pinfoflag;
WORD talkbtndown[3]; BOOL talkbtndown[3];
int pSpell; // weak int pSpell; // weak
BYTE *pManaBuff; BYTE *pManaBuff;
char infoclr; // weak char infoclr; // weak
@ -1211,13 +1211,13 @@ void InitControlPan()
sgszTalkMsg[0] = 0; sgszTalkMsg[0] = 0;
for (i = 0; i < sizeof(byte_4B894C); i++) for (i = 0; i < sizeof(byte_4B894C); i++)
byte_4B894C[i] = 1; byte_4B894C[i] = 1;
for (i = 0; i < sizeof(talkbtndown); i++) for (i = 0; i < sizeof(talkbtndown) / sizeof(talkbtndown[0]); i++)
talkbtndown[i] = 0; talkbtndown[i] = FALSE;
} }
panelflag = 0; panelflag = 0;
lvlbtndown = 0; lvlbtndown = 0;
pPanelButtons = LoadFileInMem("CtrlPan\\Panel8bu.CEL", 0); pPanelButtons = LoadFileInMem("CtrlPan\\Panel8bu.CEL", 0);
for (i = 0; i < sizeof(panbtn); i++) for (i = 0; i < sizeof(panbtn) / sizeof(panbtn[0]); i++)
panbtn[i] = 0; panbtn[i] = 0;
panbtndown = 0; panbtndown = 0;
if (gbMaxPlayers == 1) if (gbMaxPlayers == 1)
@ -1225,7 +1225,7 @@ void InitControlPan()
else else
numpanbtns = 8; numpanbtns = 8;
pChrButtons = LoadFileInMem("Data\\CharBut.CEL", 0); pChrButtons = LoadFileInMem("Data\\CharBut.CEL", 0);
for (i = 0; i < sizeof(chrbtn); i++) for (i = 0; i < sizeof(chrbtn) / sizeof(chrbtn[0]); i++)
chrbtn[i] = 0; chrbtn[i] = 0;
chrbtnactive = FALSE; chrbtnactive = FALSE;
pDurIcons = LoadFileInMem("Items\\DurIcons.CEL", 0); pDurIcons = LoadFileInMem("Items\\DurIcons.CEL", 0);
@ -2186,7 +2186,7 @@ void CheckChrBtns()
&& MouseX <= attribute_inc_rects[i].x + attribute_inc_rects[i].w && MouseX <= attribute_inc_rects[i].x + attribute_inc_rects[i].w
&& MouseY >= attribute_inc_rects[i].y && MouseY >= attribute_inc_rects[i].y
&& MouseY <= attribute_inc_rects[i].y + attribute_inc_rects[i].h) { && MouseY <= attribute_inc_rects[i].y + attribute_inc_rects[i].h) {
chrbtn[i] = TRUE; chrbtn[i] = 1;
chrbtnactive = TRUE; chrbtnactive = TRUE;
} }
} }
@ -2200,7 +2200,7 @@ void ReleaseChrBtns()
chrbtnactive = FALSE; chrbtnactive = FALSE;
for (i = 0; i < 4; ++i) { for (i = 0; i < 4; ++i) {
if (chrbtn[i]) { if (chrbtn[i]) {
chrbtn[i] = FALSE; chrbtn[i] = 0;
if (MouseX >= attribute_inc_rects[i].x if (MouseX >= attribute_inc_rects[i].x
&& MouseX <= attribute_inc_rects[i].x + attribute_inc_rects[i].w && MouseX <= attribute_inc_rects[i].x + attribute_inc_rects[i].w
&& MouseY >= attribute_inc_rects[i].y && MouseY >= attribute_inc_rects[i].y
@ -2796,10 +2796,10 @@ int control_check_talk_btn()
return 0; return 0;
result = 0; result = 0;
if (MouseY <= 475) { if (MouseY <= 475) {
talkbtndown[0] = 0; talkbtndown[0] = FALSE;
talkbtndown[1] = 0; talkbtndown[1] = FALSE;
talkbtndown[2] = 0; talkbtndown[2] = FALSE;
talkbtndown[(v0 - 421) / 18] = 1; talkbtndown[(v0 - 421) / 18] = TRUE;
result = 1; result = 1;
} }
return result; return result;
@ -2814,9 +2814,9 @@ void control_release_talk_btn()
if (talkflag) { if (talkflag) {
v0 = MouseX; v0 = MouseX;
talkbtndown[0] = 0; talkbtndown[0] = FALSE;
talkbtndown[1] = 0; talkbtndown[1] = FALSE;
talkbtndown[2] = 0; talkbtndown[2] = FALSE;
if (v0 >= 172 && MouseY >= 421 && v0 <= 233 && MouseY <= 475) { if (v0 >= 172 && MouseY >= 421 && v0 <= 233 && MouseY <= 475) {
v1 = (MouseY - 421) / 18; v1 = (MouseY - 421) / 18;
v2 = 0; v2 = 0;
@ -2855,9 +2855,9 @@ void control_type_message()
sgszTalkMsg[0] = 0; sgszTalkMsg[0] = 0;
talkflag = 1; talkflag = 1;
frame = 1; frame = 1;
talkbtndown[0] = 0; talkbtndown[0] = FALSE;
talkbtndown[1] = 0; talkbtndown[1] = FALSE;
talkbtndown[2] = 0; talkbtndown[2] = FALSE;
sgbPlrTalkTbl = 144; sgbPlrTalkTbl = 144;
drawpanflag = 255; drawpanflag = 255;
sgbTalkSavePos = sgbNextTalkSave; sgbTalkSavePos = sgbNextTalkSave;

6
Source/control.h
Unescape View File

@ -6,8 +6,8 @@ extern void *pDurIcons;
extern void *pChrButtons; extern void *pChrButtons;
extern BOOL drawhpflag; // idb extern BOOL drawhpflag; // idb
extern BOOL dropGoldFlag; extern BOOL dropGoldFlag;
extern WORD panbtn[8]; extern int panbtn[8];
extern WORD chrbtn[4]; extern int chrbtn[4];
extern void *pMultiBtns; extern void *pMultiBtns;
extern void *pPanelButtons; extern void *pPanelButtons;
extern void *pChrPanel; extern void *pChrPanel;
@ -23,7 +23,7 @@ extern void *pTalkBtns;
extern int pstrjust[4]; extern int pstrjust[4];
extern int pnumlines; // idb extern int pnumlines; // idb
extern BOOL pinfoflag; extern BOOL pinfoflag;
extern WORD talkbtndown[3]; extern BOOL talkbtndown[3];
extern int pSpell; // weak extern int pSpell; // weak
extern BYTE *pManaBuff; extern BYTE *pManaBuff;
extern char infoclr; // weak extern char infoclr; // weak

Write Preview
Loading…
Cancel
Save