Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: Merge changes from next patch

Browse source
This commit is contained in:
kervala 2011-06-04 13:23:14 +02:00
parent 6deae3686b
commit dc66068f94
4 changed files with 14 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
code/ryzom/client/src/client_chat_manager.cpp
View file

@ -1267,6 +1267,12 @@ void CClientChatManager::updateChatModeAndButton(uint mode, uint32 dynamicChanne
const bool teamActive = pIM->getDbProp("SERVER:GROUP:0:PRESENT")->getValueBool();
const bool guildActive = pIM->getDbProp("SERVER:GUILD:NAME")->getValueBool();
if (m == CChatGroup::team && ! teamActive)
m = PeopleInterraction.TheUserChat.Filter.getTargetGroup();
if (m == CChatGroup::guild && ! guildActive)
m = PeopleInterraction.TheUserChat.Filter.getTargetGroup();
if (pUserBut)
{
switch(m)

2
code/ryzom/client/src/interface_v3/chat_filter.cpp
View file

@ -382,7 +382,7 @@ void CChatTargetFilter::setTargetGroup(CChatGroup::TGroupType groupType, uint32
case CChatGroup::say: entry+="SAY"; break;
case CChatGroup::shout: entry+="SHOUT"; break;
case CChatGroup::team: if(!teamActive) return; entry+="GROUP"; break;
case CChatGroup::guild: if(!guildActive) return; entry+="CLADE"; break;
case CChatGroup::guild: entry+="CLADE"; break;
case CChatGroup::civilization: entry+="CIVILIZATION"; break;
case CChatGroup::territory: entry+="TERRITORY"; break;
case CChatGroup::universe:

6
code/ryzom/client/src/interface_v3/guild_manager.cpp
View file

@ -29,6 +29,7 @@
#include "group_html.h"
#include "../init_main_loop.h"
#include "inventory_manager.h"
#include "../client_chat_manager.h"
#include "../connection.h"
#include "../entity_cl.h"
@ -48,6 +49,7 @@ using namespace std;
using namespace NLMISC;
extern CPeopleInterraction PeopleInterraction;
extern CClientChatManager ChatMngr;
NLMISC_REGISTER_OBJECT(CViewBase, CDBGroupListAscensor, std::string, "list_sheet_guild");
@ -539,6 +541,10 @@ void CGuildManager::closeAllInterfaces()
CGroupContainer *pGuildChat = dynamic_cast<CGroupContainer*>(pIM->getElementFromId(WIN_GUILD_CHAT));
if (pGuildChat != NULL)
pGuildChat->setActive(false);
if (PeopleInterraction.TheUserChat.Filter.getTargetGroup() == CChatGroup::guild)
ChatMngr.updateChatModeAndButton(CChatGroup::say);
}
// ***************************************************************************

1
code/ryzom/server/src/entities_game_service/game_item_manager/game_item.cpp
View file

@ -2956,6 +2956,7 @@ uint32 CGameItem::weight() const
case ITEMFAMILY::HARVEST_TOOL:
case ITEMFAMILY::MISSION_ITEM:
case ITEMFAMILY::GENERIC_ITEM:
case ITEMFAMILY::ITEM_SAP_RECHARGE:
return _Form->Weight;
default:
return 0;