From: Andrew C. <ac...@us...> - 2004-01-31 23:08:18
|
Update of /cvsroot/planeshift/planeshift/src/client/gui In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17340/src/client/gui Modified Files: inventorywindow.cpp pawsgmgui.cpp pawspetitiongmwindow.cpp Log Message: Some more GEM wrappers on client, started stripping pcchardata class for removal Index: inventorywindow.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/gui/inventorywindow.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** inventorywindow.cpp 28 Jan 2004 05:24:12 -0000 1.15 --- inventorywindow.cpp 31 Jan 2004 23:06:27 -0000 1.16 *************** *** 140,150 **** } - csRef<iPcCharacterData> pcchar = psengine->GetCelClient()->GetMainPlayer()->pcdata; - - CS_ASSERT( pcchar ); - - pcchar->CustomizeTexture( widget->GetObject(), pcchar->GetTextureParts() ); - pcchar->CustomizeEquipment( widget->GetObject(), pcchar->GetEquipment() ); - trias = (pawsTextBox*)FindWidget("TotalTrias"); CS_ASSERT( trias ); --- 140,143 ---- Index: pawsgmgui.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawsgmgui.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** pawsgmgui.cpp 28 Jan 2004 06:01:02 -0000 1.6 --- pawsgmgui.cpp 31 Jan 2004 23:06:27 -0000 1.7 *************** *** 98,105 **** csRef<iPSEngine> psengine = CS_QUERY_REGISTRY( windowManager->GetObjectRegistry(), iPSEngine ); ! ! csRef<iPcCharacterData> pcchar = CEL_QUERY_PROPCLASS( ! psengine->GetCelClient()->GetMainActor()->GetPropertyClassList(), iPcCharacterData ); ! // Check system message (meaning we should enable the petition_manage command): if(me->data->type == MSGTYPESYSTEM) --- 98,102 ---- csRef<iPSEngine> psengine = CS_QUERY_REGISTRY( windowManager->GetObjectRegistry(), iPSEngine ); ! // Check system message (meaning we should enable the petition_manage command): if(me->data->type == MSGTYPESYSTEM) *************** *** 108,112 **** psSystemMessage msg(me); ! switch(pcchar->GetEntityType()) { case 9: --- 105,109 ---- psSystemMessage msg(me); ! switch(psengine->GetCelClient()->GetMainPlayer()->GetType()) { case 9: *************** *** 240,246 **** csRef<iPSEngine> psengine = CS_QUERY_REGISTRY( windowManager->GetObjectRegistry(), iPSEngine ); ! csRef<iPcCharacterData> pcchar = CEL_QUERY_PROPCLASS( ! psengine->GetCelClient()->GetMainActor()->GetPropertyClassList(), iPcCharacterData ); ! // hide all controls FindWidget("PlayerList")->Hide(); --- 237,241 ---- csRef<iPSEngine> psengine = CS_QUERY_REGISTRY( windowManager->GetObjectRegistry(), iPSEngine ); ! // hide all controls FindWidget("PlayerList")->Hide(); *************** *** 258,262 **** { case 1: // players ! switch(pcchar->GetEntityType()) { case 9: --- 253,257 ---- { case 1: // players ! switch(psengine->GetCelClient()->GetMainPlayer()->GetType()) { case 9: *************** *** 283,287 **** break; case 2: // tournament ! switch(pcchar->GetEntityType()) { case 9: --- 278,282 ---- break; case 2: // tournament ! switch(psengine->GetCelClient()->GetMainPlayer()->GetType()) { case 9: *************** *** 299,303 **** break; case 3: // misc ! switch(pcchar->GetEntityType()) { case 9: --- 294,298 ---- break; case 3: // misc ! switch(psengine->GetCelClient()->GetMainPlayer()->GetType()) { case 9: Index: pawspetitiongmwindow.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/gui/pawspetitiongmwindow.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pawspetitiongmwindow.cpp 27 Jan 2004 02:15:11 -0000 1.5 --- pawspetitiongmwindow.cpp 31 Jan 2004 23:06:27 -0000 1.6 *************** *** 114,120 **** CS_QUERY_REGISTRY( windowManager->GetObjectRegistry(), iPSEngine ); - csRef<iPcCharacterData> pcchar = CEL_QUERY_PROPCLASS( - psengine->GetCelClient()->GetMainActor()->GetPropertyClassList(), iPcCharacterData ); - // Check system message (meaning we should enable the petition_manage command): if(me->data->type == MSGTYPESYSTEM) --- 114,117 ---- *************** *** 123,127 **** psSystemMessage msg(me); ! switch(pcchar->GetEntityType()) { case 9: --- 120,124 ---- psSystemMessage msg(me); ! switch( psengine->GetCelClient()->GetMainPlayer()->GetType() ) { case 9: *************** *** 148,152 **** return; ! if (message.msgType == PETITION_DIRTY && pcchar->GetEntityType() > 0) { if (hasPetInterest) --- 145,149 ---- return; ! if (message.msgType == PETITION_DIRTY && psengine->GetCelClient()->GetMainPlayer()->GetType() > 0) { if (hasPetInterest) *************** *** 420,424 **** if (petCount > 0) { ! if (pcchar->GetEntityType() + 1 >= atof(((pawsTextBox*)(petitionList->GetSelected()->GetColumn(PGMCOL_LVL)))->GetText())) { // Get the currently selected row: --- 417,421 ---- if (petCount > 0) { ! if (psengine->GetCelClient()->GetMainPlayer()->GetType() + 1 >= atof(((pawsTextBox*)(petitionList->GetSelected()->GetColumn(PGMCOL_LVL)))->GetText())) { // Get the currently selected row: |