From: Anders R. <ma...@us...> - 2005-03-06 08:12:26
|
Update of /cvsroot/planeshift/planeshift/src/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17783/src/client Modified Files: pscelclient.cpp Log Message: - Fixed EndGuild so that the guild_member_of is cleared from the character table. Index: pscelclient.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/pscelclient.cpp,v retrieving revision 1.216 retrieving revision 1.217 diff -C2 -d -r1.216 -r1.217 *** pscelclient.cpp 1 Mar 2005 04:06:30 -0000 1.216 --- pscelclient.cpp 6 Mar 2005 08:12:15 -0000 1.217 *************** *** 281,285 **** } ! printf("Received actor %s.\n",actor->GetName() ); entities.Push(actor); --- 281,287 ---- } ! // csVector3 pos = actor->pcmesh->GetMesh()->GetMovable()->GetPosition(); ! // iSector* sector = actor->pcmesh->GetMesh()->GetMovable()->GetSectors()->Get(0); ! // printf("Recevied actor(%d) '%s' Pos (%.2f,%.2f,%.2f) sector '%s'\n", actor->GetID(),actor->GetName(), pos.x,pos.y,pos.z, sector->QueryObject()->GetName() ); entities.Push(actor); *************** *** 339,343 **** } ! Error2("Removing entity '%s'", entity->GetName()); if ( psengine->GetCharManager()->GetTarget() == entity ) { --- 341,348 ---- } ! // csVector3 pos = entity->pcmesh->GetMesh()->GetMovable()->GetPosition(); ! // iSector* sector = entity->pcmesh->GetMesh()->GetMovable()->GetSectors()->Get(0); ! // printf("Removing entity(%d) '%s' Pos (%.2f,%.2f,%.2f) sector '%s'\n", entity->GetID(),entity->GetName(), pos.x,pos.y,pos.z, sector->QueryObject()->GetName() ); ! if ( psengine->GetCharManager()->GetTarget() == entity ) { *************** *** 694,698 **** if(vel.y < -50) // Large speed puts too much stress on CPU { ! printf("Disabling CD on actor: %s\n", actor->GetName()); actor->colldet->SetOnGround(true); // Reset velocity --- 699,703 ---- if(vel.y < -50) // Large speed puts too much stress on CPU { ! printf("Disabling CD on actor(%d): %s\n", actor->GetID(),actor->GetName()); actor->colldet->SetOnGround(true); // Reset velocity |