From: Andy D. <kha...@us...> - 2004-08-31 20:44:17
|
Update of /cvsroot/planeshift/planeshift/src/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10398/src/client Modified Files: pscelclient.cpp Log Message: Added a remember password option on the login screen. Improved error message on missing mesh a bit. Made labels on checkboxes default to the right-hand side. Index: pscelclient.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/pscelclient.cpp,v retrieving revision 1.167 retrieving revision 1.168 diff -C2 -d -r1.167 -r1.168 *** pscelclient.cpp 30 Aug 2004 07:46:33 -0000 1.167 --- pscelclient.cpp 31 Aug 2004 20:44:08 -0000 1.168 *************** *** 647,651 **** Debug3( LOG_CELPERSIST, "Actor %s(%d) Received", mesg.name.GetData(), mesg.entityid ); ! InitMesh( mesg.factname, mesg.filename, mesg.pos, mesg.yrot, mesg.sectorName ); InitLinMove( mesg.pos, mesg.yrot, mesg.sectorName, mesg.top, mesg.bottom, mesg.offset ); if (mesg.sector != NULL) --- 647,656 ---- Debug3( LOG_CELPERSIST, "Actor %s(%d) Received", mesg.name.GetData(), mesg.entityid ); ! if (InitMesh( mesg.factname, mesg.filename, mesg.pos, mesg.yrot, mesg.sectorName ) == false) ! { ! Error1("Fatal Error: Could not create actor."); ! return; ! } ! InitLinMove( mesg.pos, mesg.yrot, mesg.sectorName, mesg.top, mesg.bottom, mesg.offset ); if (mesg.sector != NULL) *************** *** 655,668 **** InitCharData( mesg.texParts, mesg.equipment ); - - iMeshWrapper* mesh = pcmesh->GetMesh(); - if ( !mesh ) - { - Error1("Could not create Item because pcmesh didn't have iMeshWrapper."); - return; - } - // Have to call SetVelocity to get cal3d to find the stand blend animation. ! cal3dstate = SCF_QUERY_INTERFACE(mesh->GetMeshObject(), iSpriteCal3DState); if (cal3dstate) { --- 660,665 ---- InitCharData( mesg.texParts, mesg.equipment ); // Have to call SetVelocity to get cal3d to find the stand blend animation. ! cal3dstate = SCF_QUERY_INTERFACE(pcmesh->GetMesh()->GetMeshObject(), iSpriteCal3DState); if (cal3dstate) { |