From: Keith F. <ven...@us...> - 2002-04-21 12:05:08
|
Update of /cvsroot/planeshift/planeshift/src/client In directory usw-pr-cvs1:/tmp/cvs-serv11380 Modified Files: psnetmanager.cpp psengine.cpp cmdguilds.h cmdguilds.cpp authentclient.cpp Log Message: Added support for confirmation of guild invites. Index: psnetmanager.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/psnetmanager.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** psnetmanager.cpp 13 Apr 2002 03:07:06 -0000 1.23 --- psnetmanager.cpp 21 Apr 2002 12:05:04 -0000 1.24 *************** *** 53,58 **** if (authclient) delete authclient; - if (msghandler) - delete msghandler; if (connection) delete connection; --- 53,56 ---- *************** *** 65,68 **** --- 63,68 ---- if (cmdhandler) delete cmdhandler; + if (msghandler) + delete msghandler; } *************** *** 83,87 **** usercmds = new psUserCommands(msghandler,cmdhandler, object_reg); ! guildcmds = new psGuildCommands(msghandler,cmdhandler, object_reg); utilcmds = new psUtilityCommands(msghandler,cmdhandler, object_reg,dmgr); --- 83,87 ---- usercmds = new psUserCommands(msghandler,cmdhandler, object_reg); ! guildcmds = new psGuildCommands(msghandler,cmdhandler, object_reg,dmgr); utilcmds = new psUtilityCommands(msghandler,cmdhandler, object_reg,dmgr); Index: psengine.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/psengine.cpp,v retrieving revision 1.169 retrieving revision 1.170 diff -C2 -d -r1.169 -r1.170 *** psengine.cpp 18 Apr 2002 00:02:17 -0000 1.169 --- psengine.cpp 21 Apr 2002 12:05:04 -0000 1.170 *************** *** 499,504 **** void psEngine::LoadGame() { ! csReport(object_reg, CS_REPORTER_SEVERITY_NOTIFY, PSAPP, ! "PSLoader: Starting step %d: '%s'", loadstate, GetResourceName()); switch(loadstate) { --- 499,504 ---- void psEngine::LoadGame() { ! // csReport(object_reg, CS_REPORTER_SEVERITY_NOTIFY, PSAPP, ! // "PSLoader: Starting step %d: '%s'", loadstate, GetResourceName()); switch(loadstate) { Index: cmdguilds.h =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/cmdguilds.h,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** cmdguilds.h 25 Feb 2002 08:53:06 -0000 1.2 --- cmdguilds.h 21 Apr 2002 12:05:04 -0000 1.3 *************** *** 9,19 **** #include "net/cmdbase.h" class psGuildCommands : public psCmdBase { public: SCF_DECLARE_IBASE; ! psGuildCommands(psClientMsgHandler *mh,CmdHandler *ch,iObjectRegistry* obj); virtual ~psGuildCommands(); --- 9,27 ---- #include "net/cmdbase.h" + #include "iclient/idmngr.h" class psGuildCommands : public psCmdBase { + protected: + iDialogManager *dialogmgr; + static void HandleConfirm(bool yesclick, void *thisptr); + public: SCF_DECLARE_IBASE; ! psGuildCommands(psClientMsgHandler *mh, ! CmdHandler *ch, ! iObjectRegistry* obj, ! iDialogManager *dmgr); virtual ~psGuildCommands(); Index: cmdguilds.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/cmdguilds.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** cmdguilds.cpp 19 Mar 2002 18:18:50 -0000 1.5 --- cmdguilds.cpp 21 Apr 2002 12:05:04 -0000 1.6 *************** *** 14,23 **** ! psGuildCommands::psGuildCommands(psClientMsgHandler *mh,CmdHandler *ch,iObjectRegistry* obj) : psCmdBase(mh,ch,obj) { SCF_CONSTRUCT_IBASE(0); ! // msgqueue->Subscribe(MSGTYPECHAT,this); cmdsource->Subscribe("/newguild","<name> This creates a new guild with the specified name and the current player as leader.",this); // create new guild (requires list of names) --- 14,28 ---- ! psGuildCommands::psGuildCommands(psClientMsgHandler *mh, ! CmdHandler *ch, ! iObjectRegistry* obj, ! iDialogManager *dmgr) : psCmdBase(mh,ch,obj) { SCF_CONSTRUCT_IBASE(0); ! dialogmgr = dmgr; ! ! msgqueue->Subscribe(this,MSGTYPECONFIRMINVITE); cmdsource->Subscribe("/newguild","<name> This creates a new guild with the specified name and the current player as leader.",this); // create new guild (requires list of names) *************** *** 34,38 **** psGuildCommands::~psGuildCommands() { ! // msgqueue->Unsubscribe(MSGTYPECHAT,this); cmdsource->Unsubscribe("/newguild",this); --- 39,43 ---- psGuildCommands::~psGuildCommands() { ! msgqueue->Unsubscribe(this,MSGTYPECONFIRMINVITE); cmdsource->Unsubscribe("/newguild",this); *************** *** 62,65 **** void psGuildCommands::HandleMessage(MsgEntry *msg) { ! (void) msg; } --- 67,94 ---- void psGuildCommands::HandleMessage(MsgEntry *msg) { ! psGuildConfirmMessage cmdmsg(msg); ! ! switch (msg->data->type) ! { ! case MSGTYPECONFIRMINVITE: ! { ! char buff[1000]; ! sprintf(buff, ! "%s has invited you to join the %s. Click Yes to accept or No to reject.", ! (const char *)cmdmsg.inviter, ! (const char *)cmdmsg.guild); ! dialogmgr->CreateConfirm(HandleConfirm,this,buff); ! } ! } ! } ! ! void psGuildCommands::HandleConfirm(bool yesclick, void *thisptr) ! { ! psGuildCommands *self = (psGuildCommands *)thisptr; ! ! if (yesclick) ! self->HandleCommand("/confirmguildjoin yes"); ! else ! self->HandleCommand("/confirmguildjoin no"); } + Index: authentclient.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/authentclient.cpp,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** authentclient.cpp 21 Apr 2002 11:50:54 -0000 1.23 --- authentclient.cpp 21 Apr 2002 12:05:04 -0000 1.24 *************** *** 142,146 **** iCelEntity* entity = psengine->GetCelClient()->GetNetPersist() ->GetMappedEntity(dc.actor); ! printf ("Disconnect MESSAGE! ('%s')\n", entity->GetName()); // are we kicked from server? --- 142,146 ---- iCelEntity* entity = psengine->GetCelClient()->GetNetPersist() ->GetMappedEntity(dc.actor); ! printf ("Disconnect MESSAGE! ('%s')\n", (entity)?entity->GetName():"NULL Entity"); // are we kicked from server? |