Changed: #1433 Merge changes from patch 1.13
This commit is contained in:
parent
f84de8f1b0
commit
07e5d9d10e
2 changed files with 2 additions and 2 deletions
|
@ -997,7 +997,7 @@ void CBotChatPageTrade::startSellDialog(CDBCtrlSheet *sheet, CCtrlBase * /* pCal
|
|||
CCtrlTextButton *confirmButton = dynamic_cast<CCtrlTextButton*>(ig->getCtrl("ok"));
|
||||
if (confirmButton)
|
||||
{
|
||||
confirmButton->setActive( sheet->getLockedByOwner() );
|
||||
confirmButton->setActive( !sheet->getLockedByOwner() );
|
||||
confirmButton->setText(CI18N::get("uiSellImmediately"));
|
||||
confirmButton->setDefaultContextHelp(CI18N::get("uittDirectSellButton"));
|
||||
}
|
||||
|
|
|
@ -2088,7 +2088,7 @@ public:
|
|||
if(GenericMsgHeaderMngr.pushNameToStream(msgName, out))
|
||||
{
|
||||
uint8 teamMember = (uint8) peopleIndex;
|
||||
out.serialEnum(teamMember);
|
||||
out.serial(teamMember);
|
||||
NetMngr.push(out);
|
||||
//nlinfo("impulseCallBack : %s %d sent", msgName.c_str(), teamMember);
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue