From: Anders R. <ma...@us...> - 2005-12-21 21:07:38
|
Update of /cvsroot/planeshift/planeshift/src/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5526/src/client Modified Files: marriagehandler.cpp marriagehandler.h pscharcontrol.cpp pscharcontrol.h questionclient.cpp questionclient.h zonehandler.cpp zonehandler.h Log Message: - Fixed some SCF_ use. Index: marriagehandler.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/marriagehandler.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** marriagehandler.cpp 18 Dec 2005 22:51:50 -0000 1.5 --- marriagehandler.cpp 21 Dec 2005 21:07:27 -0000 1.6 *************** *** 36,44 **** - SCF_IMPLEMENT_IBASE( psMarriageHandler ) - SCF_IMPLEMENTS_INTERFACE( iNetSubscriber ) - SCF_IMPLEMENTS_INTERFACE( iCmdSubscriber ) - SCF_IMPLEMENT_IBASE_END - void DivorceConfirmCallback( bool yes, void * owner ) { --- 36,39 ---- *************** *** 50,55 **** : psCmdBase(mh,ch,obj) { - SCF_CONSTRUCT_IBASE(0); - yesNoBox = NULL; --- 45,48 ---- Index: marriagehandler.h =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/marriagehandler.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** marriagehandler.h 1 Dec 2005 20:34:30 -0000 1.3 --- marriagehandler.h 21 Dec 2005 21:07:28 -0000 1.4 *************** *** 33,38 **** { public: - SCF_DECLARE_IBASE; - psMarriageHandler( MsgHandler* mh,CmdHandler *ch, iObjectRegistry* obj ); virtual ~psMarriageHandler(); --- 33,36 ---- Index: pscharcontrol.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/pscharcontrol.cpp,v retrieving revision 1.145 retrieving revision 1.146 diff -C2 -d -r1.145 -r1.146 *** pscharcontrol.cpp 21 Dec 2005 18:48:37 -0000 1.145 --- pscharcontrol.cpp 21 Dec 2005 21:07:28 -0000 1.146 *************** *** 67,71 **** SCF_IMPLEMENT_IBASE( ExtraGravity ) ! // SCF_IMPLEMENTS_INTERFACE( iNetSubscriber ) SCF_IMPLEMENT_IBASE_END --- 67,71 ---- SCF_IMPLEMENT_IBASE( ExtraGravity ) ! SCF_IMPLEMENTS_INTERFACE( iPcGravityCallback ) SCF_IMPLEMENT_IBASE_END *************** *** 1497,1500 **** --- 1497,1502 ---- ExtraGravity::ExtraGravity(psMovement* parent,float grav) : Extra(parent) { + SCF_CONSTRUCT_IBASE(0); + this->grav = grav; diff = 0.0f; *************** *** 1503,1506 **** --- 1505,1514 ---- } + ExtraGravity::~ExtraGravity() + { + SCF_DESTRUCT_IBASE(); + } + + void ExtraGravity::Process() { Index: pscharcontrol.h =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/pscharcontrol.h,v retrieving revision 1.70 retrieving revision 1.71 diff -C2 -d -r1.70 -r1.71 *** pscharcontrol.h 12 Dec 2005 12:11:16 -0000 1.70 --- pscharcontrol.h 21 Dec 2005 21:07:29 -0000 1.71 *************** *** 121,124 **** --- 121,125 ---- ExtraGravity(psMovement* parent,float grav); + virtual ~ExtraGravity(); // Callback for gravity Index: questionclient.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/questionclient.cpp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** questionclient.cpp 1 Dec 2005 20:34:30 -0000 1.7 --- questionclient.cpp 21 Dec 2005 21:07:29 -0000 1.8 *************** *** 124,128 **** psQuestionClient::psQuestionClient(MsgHandler* mh,iObjectRegistry* obj) { - SCF_CONSTRUCT_IBASE(0); messageHandler = mh; paws = NULL; --- 124,127 ---- *************** *** 136,141 **** messageHandler->Unsubscribe(this,MSGTYPEQUESTION); messageHandler->Unsubscribe(this,MSGTYPEQUESTIONCANCEL); - - SCF_DESTRUCT_IBASE(); } --- 135,138 ---- Index: questionclient.h =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/questionclient.h,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** questionclient.h 12 Dec 2005 12:11:17 -0000 1.4 --- questionclient.h 21 Dec 2005 21:07:29 -0000 1.5 *************** *** 50,54 **** { public: - psQuestionClient(MsgHandler* mh, iObjectRegistry* obj); virtual ~psQuestionClient(); --- 50,53 ---- Index: zonehandler.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/zonehandler.cpp,v retrieving revision 1.51 retrieving revision 1.52 diff -C2 -d -r1.51 -r1.52 *** zonehandler.cpp 18 Dec 2005 22:51:53 -0000 1.51 --- zonehandler.cpp 21 Dec 2005 21:07:29 -0000 1.52 *************** *** 60,65 **** ZoneHandler::ZoneHandler(MsgHandler* mh,iObjectRegistry* obj_reg, PawsManager *wm, psCelClient *cc) { - SCF_CONSTRUCT_IBASE(0); - msghandler = mh; object_reg = obj_reg; --- 60,63 ---- *************** *** 82,87 **** msghandler->Unsubscribe(this,MSGTYPENEWSECTOR); } - - SCF_DESTRUCT_IBASE(); } --- 80,83 ---- Index: zonehandler.h =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/zonehandler.h,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** zonehandler.h 1 Dec 2005 20:34:30 -0000 1.20 --- zonehandler.h 21 Dec 2005 21:07:29 -0000 1.21 *************** *** 99,103 **** public: - ZoneHandler(MsgHandler* mh,iObjectRegistry* object_reg, PawsManager *windowManager, psCelClient *cc); virtual ~ZoneHandler(); --- 99,102 ---- |