Skip to content

Commit f03e66b

Browse files
committed
softcode briefing colors
1 parent f3baa3a commit f03e66b

2 files changed

Lines changed: 16 additions & 15 deletions

File tree

‎bin/data/Ruleset/Xcom1Ruleset/interfaces.rul‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1098,6 +1098,15 @@ interfaces:
10981098
color: 24
10991099
color2: 28
11001100
border: 15
1101+
- type: briefing
1102+
elements:
1103+
- id: window
1104+
color: 239
1105+
- id: button
1106+
color: 133
1107+
color2: 133
1108+
- id: text
1109+
color: 133
11011110
- type: inventory
11021111
elements:
11031112
- id: textName

‎src/Battlescape/BriefingState.cpp‎

Lines changed: 7 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -91,32 +91,25 @@ BriefingState::BriefingState(Craft *craft, Base *base)
9191
_txtCraft->setVisible(data.showCraft);
9292
}
9393

94-
add(_window);
95-
add(_btnOk);
96-
add(_txtTitle);
97-
add(_txtTarget);
98-
add(_txtCraft);
99-
add(_txtBriefing);
94+
add(_window, "window", "briefing");
95+
add(_btnOk, "button", "briefing");
96+
add(_txtTitle, "text", "briefing");
97+
add(_txtTarget, "text", "briefing");
98+
add(_txtCraft, "text", "briefing");
99+
add(_txtBriefing, "text", "briefing");
100100

101101
centerAllSurfaces();
102102

103103
// Set up objects
104-
_window->setColor(Palette::blockOffset(15)-1);
105-
106-
_btnOk->setColor(Palette::blockOffset(8)+5);
107104
_btnOk->setText(tr("STR_OK"));
108105
_btnOk->onMouseClick((ActionHandler)&BriefingState::btnOkClick);
109106
_btnOk->onKeyboardPress((ActionHandler)&BriefingState::btnOkClick, Options::keyOk);
110107
_btnOk->onKeyboardPress((ActionHandler)&BriefingState::btnOkClick, Options::keyCancel);
111108

112-
_txtTitle->setColor(Palette::blockOffset(8)+5);
113109
_txtTitle->setBig();
114-
115-
_txtTarget->setColor(Palette::blockOffset(8)+5);
116110
_txtTarget->setBig();
117-
118-
_txtCraft->setColor(Palette::blockOffset(8)+5);
119111
_txtCraft->setBig();
112+
120113
std::wstring s;
121114
if (craft)
122115
{
@@ -133,7 +126,6 @@ BriefingState::BriefingState(Craft *craft, Base *base)
133126
}
134127
_txtCraft->setText(s);
135128

136-
_txtBriefing->setColor(Palette::blockOffset(8)+5);
137129
_txtBriefing->setWordWrap(true);
138130

139131
_txtTitle->setText(tr(mission));

0 commit comments

Comments
 (0)