(svn r13070) -Fix (r13069): do save before commit...
This commit is contained in:
@@ -769,11 +769,11 @@ class SelectPlayerFaceWindow : public Window
|
|||||||
}
|
}
|
||||||
|
|
||||||
public:
|
public:
|
||||||
SelectPlayerFaceWindow(const WindowDesc *desc, bool advanced) : Window(desc, 0)
|
SelectPlayerFaceWindow(const WindowDesc *desc, PlayerID player, bool advanced) : Window(desc, player)
|
||||||
{
|
{
|
||||||
this->FindWindowPlacementAndResize(desc);
|
this->FindWindowPlacementAndResize(desc);
|
||||||
this->caption_color = this->window_number;
|
this->caption_color = this->window_number;
|
||||||
this->face = GetPlayer((PlayerID)this->window_number)->face;
|
this->face = GetPlayer(player)->face;
|
||||||
this->advanced = advanced;
|
this->advanced = advanced;
|
||||||
|
|
||||||
this->UpdateData();
|
this->UpdateData();
|
||||||
@@ -1045,8 +1045,8 @@ static void DoSelectPlayerFace(PlayerID player, bool adv, int top, int left)
|
|||||||
{
|
{
|
||||||
if (!IsValidPlayer(player)) return;
|
if (!IsValidPlayer(player)) return;
|
||||||
|
|
||||||
if (BringWindowToFrontById(WC_PLAYER_FACE, 0)) return;
|
if (BringWindowToFrontById(WC_PLAYER_FACE, player)) return;
|
||||||
return SelectPlayerFaceWindow(adv ? &_select_player_face_adv_desc : &_select_player_face_desc, player, adv); // simple or advanced window
|
new SelectPlayerFaceWindow(adv ? &_select_player_face_adv_desc : &_select_player_face_desc, player, adv); // simple or advanced window
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user