MattTheTekie/devilutionX
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Some booleans

Browse source
This commit is contained in:
Anders Jenbo 2019-04-16 02:27:47 +02:00
commit c0531bfc4c
8 changed files with 19 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

19
Source/control.cpp
View file

@ -44,7 +44,7 @@ int talkflag; // weak
void *pSBkIconCels;
int sbookflag; // weak
int chrflag;
int drawbtnflag; // idb
BOOL drawbtnflag;
void *pSpellBkCel;
char infostr[MAX_PATH];
int numpanbtns; // weak
@ -54,7 +54,7 @@ int panelflag; // weak
unsigned char SplTransTbl[256];
int initialDropGoldValue; // idb
void *pSpellCels;
int panbtndown; // weak
BOOL panbtndown;
void *pTalkPanel; // idb
int spselflag; // weak
@ -1276,7 +1276,6 @@ void InitControlPan()
// 4B8968: using guessed type int sbookflag;
// 4B8A7C: using guessed type int numpanbtns;
// 4B8B84: using guessed type int panelflag;
// 4B8C90: using guessed type int panbtndown;
// 4B8C98: using guessed type int spselflag;
// 679660: using guessed type char gbMaxPlayers;
@ -1368,8 +1367,8 @@ void DoPanBtn()
if (MouseX >= PanBtnPos[i][0] && MouseX <= PanBtnPos[i][0] + PanBtnPos[i][2]) {
if (MouseY >= PanBtnPos[i][1] && MouseY <= PanBtnPos[i][1] + PanBtnPos[i][3]) {
panbtn[i] = 1;
drawbtnflag = 1;
panbtndown = 1;
drawbtnflag = TRUE;
panbtndown = TRUE;
}
}
}
@ -1382,10 +1381,9 @@ void DoPanBtn()
void control_set_button_down(int btn_id)
{
panbtn[btn_id] = 1;
drawbtnflag = 1;
panbtndown = 1;
drawbtnflag = TRUE;
panbtndown = TRUE;
}
// 4B8C90: using guessed type int panbtndown;
void control_check_btn_press()
{
@ -1549,8 +1547,8 @@ void CheckBtnUp()
char gamemenuOff;
gamemenuOff = 1;
drawbtnflag = 1;
panbtndown = 0;
drawbtnflag = TRUE;
panbtndown = FALSE;
for (i = 0; i < 8; i++) {
if (!panbtn[i]) {
@ -1620,7 +1618,6 @@ void CheckBtnUp()
// 484368: using guessed type int FriendlyMode;
// 4B8960: using guessed type int talkflag;
// 4B8968: using guessed type int sbookflag;
// 4B8C90: using guessed type int panbtndown;
// 646D00: using guessed type char qtextflag;
void FreeControlPan()

4
Source/control.h
View file

@ -39,7 +39,7 @@ extern int talkflag; // weak
extern void *pSBkIconCels;
extern int sbookflag; // weak
extern int chrflag;
extern int drawbtnflag; // idb
extern BOOL drawbtnflag;
extern void *pSpellBkCel;
extern char infostr[MAX_PATH];
extern int numpanbtns; // weak
@ -49,7 +49,7 @@ extern int panelflag; // weak
extern unsigned char SplTransTbl[256];
extern int initialDropGoldValue; // idb
extern void *pSpellCels;
extern int panbtndown; // weak
extern BOOL panbtndown;
extern void *pTalkPanel; // idb
extern int spselflag; // weak

2
Source/cursor.cpp
View file

@ -285,7 +285,7 @@ void CheckCursMove()
pcursobj = -1;
pcursitem = -1;
if (pcursinvitem != -1)
drawsbarflag = 1;
drawsbarflag = TRUE;
pcursinvitem = -1;
pcursplr = -1;
uitemflag = 0;

1
Source/diablo.cpp
View file

@ -982,7 +982,6 @@ void LeftMouseUp()
ReleaseStoreBtn();
}
// 4B851C: using guessed type int lvlbtndown;
// 4B8C90: using guessed type int panbtndown;
// 6AA705: using guessed type char stextflag;
void RightMouseDown()

10
Source/inv.cpp
View file

@ -4,7 +4,7 @@
BOOL invflag;
void *pInvCels;
int drawsbarflag; // idb
BOOL drawsbarflag;
int sgdwLastTime; // check name
const InvXY InvRect[73] = {
@ -109,7 +109,7 @@ void InitInv()
}
invflag = 0;
drawsbarflag = 0;
drawsbarflag = FALSE;
}
void InvDrawSlotBack(int X, int Y, int W, int H)
@ -1150,7 +1150,7 @@ LABEL_18:
qmemcpy((char *)plr[0].SpdList + v53, &plr[v3].HoldItem, 0x170u);
plr[v3]._pGold += plr[v3].HoldItem._ivalue;
LABEL_225:
drawsbarflag = 1;
drawsbarflag = TRUE;
LABEL_226:
v60 = p;
CalcPlrInv(p, 1u);
@ -1408,7 +1408,7 @@ void CheckInvCut(int pnum, int mx, int my)
if (plr[pnum].SpdList[offs]._itype != ITYPE_NONE) {
plr[pnum].HoldItem = plr[pnum].SpdList[offs];
plr[pnum].SpdList[offs]._itype = ITYPE_NONE;
drawsbarflag = 1;
drawsbarflag = TRUE;
}
}
@ -2273,7 +2273,7 @@ int CheckInvHLight()
if (v0 < 65)
goto LABEL_36;
v5 = v0 - 65;
drawsbarflag = 1;
drawsbarflag = TRUE;
result = 368 * v5;
v2 = &v3->SpdList[v5];
if (v3->SpdList[v5]._itype != ITYPE_NONE) {

2
Source/inv.h
View file

@ -3,7 +3,7 @@
#define __INV_H__
extern BOOL invflag;
extern int drawsbarflag; // idb
extern BOOL drawsbarflag;
void FreeInvGFX();
void InitInv();

2
Source/scrollrt.cpp
View file

@ -2433,7 +2433,7 @@ void scrollrt_draw_cursor_item()
// 4B8C9C: using guessed type int cursH;
// 69CF0C: using guessed type int gpBufEnd;
void DrawMain(int dwHgt, int draw_desc, int draw_hp, int draw_mana, int draw_sbar, int draw_btn)
void DrawMain(int dwHgt, BOOL draw_desc, BOOL draw_hp, BOOL draw_mana, BOOL draw_sbar, BOOL draw_btn)
{
int ysize;
DWORD dwTicks;

2
Source/scrollrt.h
View file

@ -43,7 +43,7 @@ void EnableFrameCount();
void scrollrt_draw_game_screen(BOOL draw_cursor);
void scrollrt_draw_cursor_back_buffer();
void scrollrt_draw_cursor_item();
void DrawMain(int dwHgt, int draw_desc, int draw_hp, int draw_mana, int draw_sbar, int draw_btn);
void DrawMain(int dwHgt, BOOL draw_desc, BOOL draw_hp, BOOL draw_mana, BOOL draw_sbar, BOOL draw_btn);
#ifdef _DEBUG
void DrawFPS();
#endif