From a7db265bb6c55bb3e507ab2b069cedbe4a198b03 Mon Sep 17 00:00:00 2001 From: rubidium Date: Tue, 13 May 2008 14:43:33 +0000 Subject: (svn r13069) -Codechange: it is no longer needed to pass a void *data pointer with the WE_CREATE message because nothing uses it anymore. --- src/player_gui.cpp | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/player_gui.cpp') diff --git a/src/player_gui.cpp b/src/player_gui.cpp index 36613a553..0879a0c60 100644 --- a/src/player_gui.cpp +++ b/src/player_gui.cpp @@ -769,12 +769,12 @@ class SelectPlayerFaceWindow : public Window } public: - SelectPlayerFaceWindow(const WindowDesc *desc, void *data, WindowNumber number) : Window(desc, data, number) + SelectPlayerFaceWindow(const WindowDesc *desc, bool advanced) : Window(desc, 0) { this->FindWindowPlacementAndResize(desc); this->caption_color = this->window_number; this->face = GetPlayer((PlayerID)this->window_number)->face; - this->advanced = *(bool*)data; + this->advanced = advanced; this->UpdateData(); @@ -1045,7 +1045,8 @@ static void DoSelectPlayerFace(PlayerID player, bool adv, int top, int left) { if (!IsValidPlayer(player)) return; - AllocateWindowDescFront(adv ? &_select_player_face_adv_desc : &_select_player_face_desc, player, &adv); // simple or advanced window + if (BringWindowToFrontById(WC_PLAYER_FACE, 0)) return; + return SelectPlayerFaceWindow(adv ? &_select_player_face_adv_desc : &_select_player_face_desc, player, adv); // simple or advanced window } -- cgit v1.2.3-54-g00ecf