From: <ral...@us...> - 2013-12-25 00:46:23
|
Revision: 9108 http://sourceforge.net/p/planeshift/code/9108 Author: ralphcampbell Date: 2013-12-25 00:46:20 +0000 (Wed, 25 Dec 2013) Log Message: ----------- Doll figure isn't used in stats and skills window. Modified Paths: -------------- trunk/src/client/gui/pawsskillwindow.cpp trunk/src/client/gui/pawsskillwindow.h Modified: trunk/src/client/gui/pawsskillwindow.cpp =================================================================== --- trunk/src/client/gui/pawsskillwindow.cpp 2013-12-24 18:23:43 UTC (rev 9107) +++ trunk/src/client/gui/pawsskillwindow.cpp 2013-12-25 00:46:20 UTC (rev 9108) @@ -70,7 +70,6 @@ menStaminaMax = 0; factRequest = false; - charApp = new psCharAppearance(PawsManager::GetSingleton().GetObjectRegistry()); } pawsSkillWindow::pawsSkillWindow(const pawsSkillWindow& origin) { @@ -85,17 +84,10 @@ delete i.Next(); } skillDescriptions.DeleteAll(); - delete charApp; } bool pawsSkillWindow::PostSetup() { - // Setup the Doll - if ( !SetupDoll() ) - { - return false; - } - xml = csQueryRegistry<iDocumentSystem > ( PawsManager::GetSingleton().GetObjectRegistry()); statsSkillList = (pawsListBox*)FindWidget("StatsSkillList"); @@ -149,47 +141,6 @@ return true; } -bool pawsSkillWindow::SetupDoll() -{ - pawsObjectView* widget = dynamic_cast<pawsObjectView*>(FindWidget("Doll")); - GEMClientActor* actor = psengine->GetCelClient()->GetMainPlayer(); - if (!widget || !actor) - { - return true; // doll not wanted, not an error - } - - // Set the doll view - while(!widget->View(actor->GetFactName())) - { - continue; - } - - CS_ASSERT(widget->GetObject()->GetMeshObject()); - - // Set the charApp. - widget->SetCharApp(charApp); - - // Register this doll for updates - widget->SetID(actor->GetEID().Unbox()); - - csRef<iSpriteCal3DState> spstate = scfQueryInterface<iSpriteCal3DState> (widget->GetObject()->GetMeshObject()); - if (spstate) - { - // Setup cal3d to select random 0 velocity anims - spstate->SetVelocity(0.0,&psengine->GetRandomGen()); - } - - charApp->SetMesh(widget->GetObject()); - - charApp->ApplyTraits(actor->traits); - charApp->ApplyEquipment(actor->equipment); - - widget->EnableMouseControl(true); - - //return (a && e); - return true; -} - void pawsSkillWindow::HandleFactionMsg(MsgEntry* me) { psFactionMessage factMsg(me); Modified: trunk/src/client/gui/pawsskillwindow.h =================================================================== --- trunk/src/client/gui/pawsskillwindow.h 2013-12-24 18:23:43 UTC (rev 9107) +++ trunk/src/client/gui/pawsskillwindow.h 2013-12-25 00:46:20 UTC (rev 9108) @@ -96,8 +96,6 @@ virtual void OnNumberEntered(const char *name,int param,int number); protected: - bool SetupDoll(); - void BuySkill(); void BuyMaxSkill(); @@ -157,7 +155,6 @@ /// Flag if we have sent our initial request for faction information. Only sent /// once and everything else is an update. bool factRequest; - psCharAppearance* charApp; }; CREATE_PAWS_FACTORY( pawsSkillWindow ); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |