Archives/OpenTTD-patches
2
0
Fork 0
mirror of https://github.com/JGRennison/OpenTTD-patches.git synced 2024-11-16 00:12:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

(svn r13138) -Codechange: remove the need for IsWindowOfPrototype.

Browse Source
This commit is contained in:
rubidium 2008-05-17 12:26:00 +00:00
parent baff68179c
commit 7f6ccdc624
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/misc_gui.cpp
View File

@ -348,9 +348,12 @@ private:
uint64 decode_params[20]; uint64 decode_params[20];
StringID message_1; StringID message_1;
StringID message_2; StringID message_2;
bool show_player_face;
public: public:
ErrmsgWindow(Point pt, int width, int height, StringID msg1, StringID msg2, const Widget *widget) : Window(pt.x, pt.y, width, height, NULL, WC_ERRMSG, widget) ErrmsgWindow(Point pt, int width, int height, StringID msg1, StringID msg2, const Widget *widget, bool show_player_face) :
Window(pt.x, pt.y, width, height, NULL, WC_ERRMSG, widget),
show_player_face(show_player_face)
{ {
this->duration = _patches.errmsg_duration; this->duration = _patches.errmsg_duration;
CopyOutDParam(this->decode_params, 0, lengthof(this->decode_params)); CopyOutDParam(this->decode_params, 0, lengthof(this->decode_params));
@ -377,17 +380,15 @@ public:
SwitchToErrorRefStack(); SwitchToErrorRefStack();
RewindTextRefStack(); RewindTextRefStack();
byte i = 0; if (this->show_player_face) {
if (IsWindowOfPrototype(this, _errmsg_face_widgets)) {
const Player *p = GetPlayer((PlayerID)GetDParamX(this->decode_params, 2)); const Player *p = GetPlayer((PlayerID)GetDParamX(this->decode_params, 2));
DrawPlayerFace(p->face, p->player_color, 2, 16); DrawPlayerFace(p->face, p->player_color, 2, 16);
i = 1;
} }
byte j = (this->message_1 == INVALID_STRING_ID) ? 1 : 0; byte j = (this->message_1 == INVALID_STRING_ID) ? 1 : 0;
DrawStringMultiCenter(this->width - 120, y[i][j], this->message_2, this->width - 2); DrawStringMultiCenter(this->width - 120, y[this->show_player_face][j], this->message_2, this->width - 2);
if (j == 0) { if (j == 0) {
DrawStringMultiCenter(this->width - 120, y[i][2], this->message_1, this->width - 2); DrawStringMultiCenter(this->width - 120, y[this->show_player_face][2], this->message_1, this->width - 2);
} }
/* Switch back to the normal text ref. stack for NewGRF texts */ /* Switch back to the normal text ref. stack for NewGRF texts */
@ -447,7 +448,7 @@ void ShowErrorMessage(StringID msg_1, StringID msg_2, int x, int y)
pt.x = (_screen.width - 240) >> 1; pt.x = (_screen.width - 240) >> 1;
pt.y = (_screen.height - 46) >> 1; pt.y = (_screen.height - 46) >> 1;
} }
new ErrmsgWindow(pt, 240, 46, msg_1, msg_2, _errmsg_widgets); new ErrmsgWindow(pt, 240, 46, msg_1, msg_2, _errmsg_widgets, false);
} else { } else {
if ((x | y) != 0) { if ((x | y) != 0) {
pt = RemapCoords2(x, y); pt = RemapCoords2(x, y);
@ -458,7 +459,7 @@ void ShowErrorMessage(StringID msg_1, StringID msg_2, int x, int y)
pt.x = (_screen.width - 334) >> 1; pt.x = (_screen.width - 334) >> 1;
pt.y = (_screen.height - 137) >> 1; pt.y = (_screen.height - 137) >> 1;
} }
new ErrmsgWindow(pt, 334, 137, msg_1, msg_2, _errmsg_face_widgets); new ErrmsgWindow(pt, 334, 137, msg_1, msg_2, _errmsg_face_widgets, true);
} }
} }

5
src/window.cpp
View File

@ -796,11 +796,6 @@ static Window *ForceFindDeletableWindow()
NOT_REACHED(); NOT_REACHED();
} }
bool IsWindowOfPrototype(const Window *w, const Widget *widget)
{
return (w->original_widget == widget);
}
/** /**
* Assign widgets to a new window by initialising its widget pointers, and by * Assign widgets to a new window by initialising its widget pointers, and by
* copying the widget array \a widget to \c w->widget to allow for resizable * copying the widget array \a widget to \c w->widget to allow for resizable

2
src/window_gui.h
View File

@ -598,8 +598,6 @@ enum WindowFlags {
Window *BringWindowToFrontById(WindowClass cls, WindowNumber number); Window *BringWindowToFrontById(WindowClass cls, WindowNumber number);
Window *FindWindowFromPt(int x, int y); Window *FindWindowFromPt(int x, int y);
bool IsWindowOfPrototype(const Window *w, const Widget *widget);
/** /**
* Open a new window. * Open a new window.
* @param *desc The pointer to the WindowDesc to be created * @param *desc The pointer to the WindowDesc to be created