Skip to content

Commit dfbb815

Browse files
pionerepionere
committed
use TBOOK_* defines in the team-book
1 parent 6487a94 commit dfbb815

File tree

2 files changed

+36
-34
lines changed

2 files changed

+36
-34
lines changed

‎Source/control.cpp‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -2044,53 +2044,53 @@ void DrawTeamBook()
20442044

20452045
hasTeam = PlrHasTeam();
20462046

2047-
yp += SBOOK_TOP_BORDER + SBOOK_CELHEIGHT;
2048-
sx += SBOOK_CELBORDER;
2047+
yp += TBOOK_TOP_BORDER + TBOOK_CELHEIGHT;
2048+
sx += TBOOK_CELBORDER;
20492049
for (i = 0; i < NUM_BOOK_ENTRIES; i++) {
20502050
pnum = i + guTeamTab * NUM_BOOK_ENTRIES;
20512051
if (pnum >= MAX_PLRS)
20522052
break;
20532053
if (!plr._pActive)
20542054
continue;
20552055
// name
2056-
PrintLimitedString(sx + SBOOK_LINE_TAB, yp - 25, plr._pName, SBOOK_LINE_LENGTH, COL_WHITE, 0);
2056+
PrintLimitedString(sx + TBOOK_LINE_TAB, yp - 25, plr._pName, TBOOK_LINE_LENGTH, COL_WHITE, 0);
20572057
// class(level) - team
20582058
static_assert(MAXCHARLEVEL < 100, "Level must fit to the TeamBook.");
20592059
snprintf(tempstr, sizeof(tempstr), "%s (lvl:%2d) %c", ClassStrTbl[plr._pClass], plr._pLevel, 'a' + plr._pTeam);
2060-
PrintGameStr(sx + SBOOK_LINE_TAB, yp - 13, tempstr, COL_WHITE);
2060+
PrintGameStr(sx + TBOOK_LINE_TAB, yp - 13, tempstr, COL_WHITE);
20612061

20622062
// mute
20632063
if (pnum != mypnum) {
2064-
DrawTeamButton(sx + SBOOK_LINE_TAB + SBOOK_LINE_LENGTH - (TBOOK_BTN_WIDTH - 8), yp - 24, TBOOK_BTN_WIDTH,
2064+
DrawTeamButton(sx + TBOOK_LINE_TAB + TBOOK_LINE_LENGTH - (TBOOK_BTN_WIDTH - 8), yp - 24, TBOOK_BTN_WIDTH,
20652065
(guTeamMute & (1 << pnum)) != 0, "mute", 10);
20662066
}
20672067

20682068
// drop/leave
20692069
if (hasTeam && (pnum == mypnum || plr._pTeam == mypnum)) {
2070-
DrawTeamButton(sx + SBOOK_LINE_TAB + SBOOK_LINE_LENGTH - (TBOOK_BTN_WIDTH - 8), yp - 12, TBOOK_BTN_WIDTH, false,
2070+
DrawTeamButton(sx + TBOOK_LINE_TAB + TBOOK_LINE_LENGTH - (TBOOK_BTN_WIDTH - 8), yp - 12, TBOOK_BTN_WIDTH, false,
20712071
pnum == mypnum ? "leave" : "drop", pnum == mypnum ? 8 : 12);
20722072
}
20732073

20742074
// accept/reject
20752075
if (guTeamInviteRec & (1 << pnum)) {
2076-
DrawTeamButton(sx + SBOOK_LINE_TAB, yp, TBOOK_BTN_WIDTH,
2076+
DrawTeamButton(sx + TBOOK_LINE_TAB, yp, TBOOK_BTN_WIDTH,
20772077
false, "accept", 2);
2078-
DrawTeamButton(sx + SBOOK_LINE_TAB + TBOOK_BTN_WIDTH + 10, yp, TBOOK_BTN_WIDTH,
2078+
DrawTeamButton(sx + TBOOK_LINE_TAB + TBOOK_BTN_WIDTH + 10, yp, TBOOK_BTN_WIDTH,
20792079
false, "reject", 6);
20802080
}
20812081

20822082
// invite/cancel
20832083
if (pnum != mypnum && plr._pTeam != myplr._pTeam && myplr._pTeam == mypnum) {
20842084
unsigned invited = (guTeamInviteSent & (1 << pnum));
2085-
DrawTeamButton(sx + SBOOK_LINE_TAB + SBOOK_LINE_LENGTH - (TBOOK_BTN_WIDTH - 8), yp, TBOOK_BTN_WIDTH, false,
2085+
DrawTeamButton(sx + TBOOK_LINE_TAB + TBOOK_LINE_LENGTH - (TBOOK_BTN_WIDTH - 8), yp, TBOOK_BTN_WIDTH, false,
20862086
!invited ? "invite" : "cancel", !invited ? 7 : 2);
20872087
}
20882088

20892089
// icon
20902090
st = plr._pDunLevel == DLV_TOWN ? RSPLTYPE_ABILITY : (plr._pmode == PM_DEATH ? RSPLTYPE_INVALID : RSPLTYPE_SPELL);
20912091
CelDrawTrnTbl(sx, yp, pSBkIconCels, ClassIconTbl[plr._pClass], SkillTrns[st]);
20922092

2093-
yp += SBOOK_CELBORDER + SBOOK_CELHEIGHT;
2093+
yp += TBOOK_CELBORDER + TBOOK_CELHEIGHT;
20942094
}
20952095
}
20962096

@@ -2102,27 +2102,27 @@ void CheckTeamClick(bool altAction)
21022102
ToggleWindow(WND_TEAM);
21032103
return;
21042104
}
2105-
dx = MousePos.x - (gnWndTeamX + SBOOK_LEFT_BORDER);
2106-
dy = MousePos.y - (gnWndTeamY + SBOOK_TOP_BORDER);
2105+
dx = MousePos.x - (gnWndTeamX + TBOOK_LEFT_BORDER);
2106+
dy = MousePos.y - (gnWndTeamY + TBOOK_TOP_BORDER);
21072107
if (dx < 0 || dy < 0) {
21082108
return;
21092109
}
21102110

2111-
if (dy < NUM_BOOK_ENTRIES * (SBOOK_CELBORDER + SBOOK_CELHEIGHT)) {
2112-
int pnum = dy / (SBOOK_CELBORDER + SBOOK_CELHEIGHT);
2113-
dy = dy % (SBOOK_CELBORDER + SBOOK_CELHEIGHT);
2111+
if (dy < NUM_BOOK_ENTRIES * (TBOOK_CELBORDER + TBOOK_CELHEIGHT)) {
2112+
int pnum = dy / (TBOOK_CELBORDER + TBOOK_CELHEIGHT);
2113+
dy = dy % (TBOOK_CELBORDER + TBOOK_CELHEIGHT);
21142114
pnum += guTeamTab * NUM_BOOK_ENTRIES;
21152115
if (pnum >= MAX_PLRS || !plr._pActive) {
21162116
StartWndDrag(WND_TEAM);
21172117
return;
21182118
}
2119-
if (dx <= SBOOK_CELWIDTH) {
2119+
if (dx <= TBOOK_CELWIDTH) {
21202120
// clicked on the icon
21212121
SetupPlrMsg(pnum);
2122-
} else if (dx > SBOOK_LINE_TAB + SBOOK_LINE_LENGTH - (TBOOK_BTN_WIDTH - 8)
2123-
&& dx <= SBOOK_LINE_TAB + SBOOK_LINE_LENGTH + 8) {
2122+
} else if (dx > TBOOK_LINE_TAB + TBOOK_LINE_LENGTH - (TBOOK_BTN_WIDTH - 8)
2123+
&& dx <= TBOOK_LINE_TAB + TBOOK_LINE_LENGTH + 8) {
21242124
// clicked on the right column of buttons
2125-
dy = 3 * dy / (SBOOK_CELBORDER + SBOOK_CELHEIGHT);
2125+
dy = 3 * dy / (TBOOK_CELBORDER + TBOOK_CELHEIGHT);
21262126
if (dy == 0) {
21272127
// mute
21282128
if (pnum != mypnum)
@@ -2142,28 +2142,28 @@ void CheckTeamClick(bool altAction)
21422142
guTeamInviteSent ^= (1 << pnum);
21432143
}
21442144
}
2145-
} else if (dy >= (2 * (SBOOK_CELBORDER + SBOOK_CELHEIGHT) / 3)) {
2145+
} else if (dy >= (2 * (TBOOK_CELBORDER + TBOOK_CELHEIGHT) / 3)) {
21462146
if (guTeamInviteRec & (1 << pnum)) {
2147-
if (dx > SBOOK_LINE_TAB && dx < SBOOK_LINE_TAB + TBOOK_BTN_WIDTH) {
2147+
if (dx > TBOOK_LINE_TAB && dx < TBOOK_LINE_TAB + TBOOK_BTN_WIDTH) {
21482148
// accept (invite)
21492149
NetSendCmdBParam1(CMD_ACK_INVITE, pnum);
2150-
} else if (dx > SBOOK_LINE_TAB + TBOOK_BTN_WIDTH + 10 && dx < SBOOK_LINE_TAB + 2 * TBOOK_BTN_WIDTH + 10) {
2150+
} else if (dx > TBOOK_LINE_TAB + TBOOK_BTN_WIDTH + 10 && dx < TBOOK_LINE_TAB + 2 * TBOOK_BTN_WIDTH + 10) {
21512151
// reject (invite)
21522152
NetSendCmdBParam1(CMD_DEC_INVITE, pnum);
21532153
}
21542154
guTeamInviteRec &= ~(1 << pnum);
21552155
}
21562156
}
21572157
} else {
2158-
if (dx <= SBOOK_PAGER_WIDTH * 2) {
2159-
if (dx <= SBOOK_PAGER_WIDTH) {
2158+
if (dx <= TBOOK_PAGER_WIDTH * 2) {
2159+
if (dx <= TBOOK_PAGER_WIDTH) {
21602160
guTeamTab = 0;
21612161
} else {
21622162
if (guTeamTab != 0)
21632163
guTeamTab--;
21642164
}
2165-
} else if (dx >= SPANEL_WIDTH - SBOOK_PAGER_WIDTH * 2) {
2166-
if (dx >= SPANEL_WIDTH - SBOOK_PAGER_WIDTH) {
2165+
} else if (dx >= SPANEL_WIDTH - TBOOK_PAGER_WIDTH * 2) {
2166+
if (dx >= SPANEL_WIDTH - TBOOK_PAGER_WIDTH) {
21672167
guTeamTab = TBOOKTABS - 1;
21682168
} else {
21692169
if (guTeamTab < TBOOKTABS - 1)

‎Source/gameui.h‎

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -148,19 +148,21 @@ extern "C" {
148148

149149
#define SBOOK_CELWIDTH 37
150150
#define SBOOK_CELHEIGHT 38
151-
#define SBOOK_CELBORDER 1
152-
#define SBOOK_TOP_BORDER 1
153-
#define SBOOK_LEFT_BORDER 1
154-
#define SBOOK_LINE_BORDER 10
155-
#define SBOOK_LINE_LENGTH (SPANEL_WIDTH - 2 * SBOOK_LEFT_BORDER - SBOOK_CELBORDER - SBOOK_CELWIDTH - 2 * SBOOK_LINE_BORDER)
156-
#define SBOOK_LINE_TAB (SBOOK_CELWIDTH + SBOOK_CELBORDER + SBOOK_LINE_BORDER)
157-
#define SBOOK_PAGER_WIDTH 56
158151
// #define SBOOK_PNL_WIDTH (2 * BOXBORDER_WIDTH + 140 + 2 * SBOOK_CELWIDTH)
159152
#define SBOOK_PNL_WIDTH SPANEL_WIDTH
160153
#define SBOOK_X_OFFSET 4
161154
#define SBOOK_LINE_HEIGHT 12
162155

163-
#define TBOOK_BTN_WIDTH 60
156+
#define TBOOK_CELWIDTH SBOOK_CELWIDTH
157+
#define TBOOK_CELHEIGHT SBOOK_CELHEIGHT
158+
#define TBOOK_CELBORDER 1
159+
#define TBOOK_TOP_BORDER 1
160+
#define TBOOK_LEFT_BORDER 1
161+
#define TBOOK_LINE_BORDER 10
162+
#define TBOOK_LINE_LENGTH (SPANEL_WIDTH - 2 * TBOOK_LEFT_BORDER - TBOOK_CELBORDER - TBOOK_CELWIDTH - 2 * TBOOK_LINE_BORDER)
163+
#define TBOOK_LINE_TAB (TBOOK_CELWIDTH + TBOOK_CELBORDER + TBOOK_LINE_BORDER)
164+
#define TBOOK_PAGER_WIDTH 56
165+
#define TBOOK_BTN_WIDTH 60
164166

165167
#define DURICON_WIDTH 32
166168
#define GOLDDROP_WIDTH 261

0 commit comments

Comments
 (0)