Menu
▾
▴
[Planeshift-cvs] CVS: planeshift/src/client clientvitals.cpp,1.18,1.19 clientvitals.h,1.8,1.9 modehandler.cpp,1.158,1.159 pscal3dcallback.cpp,1.5,1.6 pscamera.cpp,1.74,1.75 pscamera.h,1.37,1.38 pscelclient.cpp,1.253,1.254 pscharcontrol.cpp,1.144,1.145 psengine.cpp,1.542,1.543 psengine.h,1.183,1.184
|
From: Anders R. <ma...@us...> - 2005-12-21 18:48:46
|
Update of /cvsroot/planeshift/planeshift/src/client In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3982/src/client Modified Files: clientvitals.cpp clientvitals.h modehandler.cpp pscal3dcallback.cpp pscamera.cpp pscamera.h pscelclient.cpp pscharcontrol.cpp psengine.cpp psengine.h Log Message: - A number of fixes based on running valgrind. Index: clientvitals.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/clientvitals.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** clientvitals.cpp 5 Dec 2005 20:51:05 -0000 1.18 --- clientvitals.cpp 21 Dec 2005 18:48:36 -0000 1.19 *************** *** 26,29 **** --- 26,35 ---- #include "engine/drmessage.h" + psClientVitals::psClientVitals() + { + counter = 0; + counter_set = false; + } + void psClientVitals::HandleDRData(psStatDRMessage& msg, const char *labelname ) { Index: clientvitals.h =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/clientvitals.h,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** clientvitals.h 5 Dec 2005 20:51:05 -0000 1.8 --- clientvitals.h 21 Dec 2005 18:48:37 -0000 1.9 *************** *** 34,38 **** bool counter_set; public: ! psClientVitals() { counter = 0; } /** Handles new Vital data from the server. --- 34,38 ---- bool counter_set; public: ! psClientVitals(); /** Handles new Vital data from the server. Index: modehandler.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/modehandler.cpp,v retrieving revision 1.158 retrieving revision 1.159 diff -C2 -d -r1.158 -r1.159 *** modehandler.cpp 20 Dec 2005 07:55:37 -0000 1.158 --- modehandler.cpp 21 Dec 2005 18:48:37 -0000 1.159 *************** *** 125,128 **** --- 125,129 ---- rainobject = NULL; chatWindow = NULL; + sound_queued = false; } Index: pscal3dcallback.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/pscal3dcallback.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** pscal3dcallback.cpp 5 Oct 2005 23:49:17 -0000 1.5 --- pscal3dcallback.cpp 21 Dec 2005 18:48:37 -0000 1.6 *************** *** 46,49 **** --- 46,50 ---- { SCF_DESTRUCT_IBASE(); + printf("psCal3DCallbackLoader destroyed\n"); } Index: pscamera.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/pscamera.cpp,v retrieving revision 1.74 retrieving revision 1.75 diff -C2 -d -r1.74 -r1.75 *** pscamera.cpp 12 Dec 2005 10:00:01 -0000 1.74 --- pscamera.cpp 21 Dec 2005 18:48:37 -0000 1.75 *************** *** 59,62 **** --- 59,64 ---- camData[CAMERA_FIRST_PERSON].maxDistance = 1.0f; camData[CAMERA_FIRST_PERSON].minDistance = 1.0f; + camData[CAMERA_FIRST_PERSON].turnSpeed = 0.0f; + camData[CAMERA_FIRST_PERSON].swingCoef = 0.0f; camData[CAMERA_THIRD_PERSON].springCoef = 3.5f; *************** *** 65,68 **** --- 67,72 ---- camData[CAMERA_THIRD_PERSON].maxDistance = 15.0f; camData[CAMERA_THIRD_PERSON].minDistance = 1.0f; + camData[CAMERA_THIRD_PERSON].turnSpeed = 0.0f; + camData[CAMERA_THIRD_PERSON].swingCoef = 0.0f; camData[CAMERA_M64_THIRD_PERSON].springCoef = 3.5f; *************** *** 72,75 **** --- 76,80 ---- camData[CAMERA_M64_THIRD_PERSON].maxDistance = 6.0f; camData[CAMERA_M64_THIRD_PERSON].turnSpeed = 1.0f; + camData[CAMERA_M64_THIRD_PERSON].swingCoef = 0.0f; camData[CAMERA_LARA_THIRD_PERSON].springCoef = 3.5f; *************** *** 86,97 **** --- 91,136 ---- camData[CAMERA_FREE].minDistance = 2.0f; camData[CAMERA_FREE].maxDistance = 16.0f; + camData[CAMERA_FREE].turnSpeed = 0.0f; + camData[CAMERA_FREE].swingCoef = 0.0f; + + camData[CAMERA_ACTUAL_DATA].springCoef = 0.0f; + camData[CAMERA_ACTUAL_DATA].InertialDampeningCoef = 0.0; + camData[CAMERA_ACTUAL_DATA].springLength = 0.01f; + camData[CAMERA_ACTUAL_DATA].minDistance = 0.0f; + camData[CAMERA_ACTUAL_DATA].maxDistance = 0.0f; + camData[CAMERA_ACTUAL_DATA].turnSpeed = 0.0f; + camData[CAMERA_ACTUAL_DATA].swingCoef = 0.0f; + + camData[CAMERA_LAST_ACTUAL].springCoef = 0.0f; + camData[CAMERA_LAST_ACTUAL].InertialDampeningCoef = 0.0; + camData[CAMERA_LAST_ACTUAL].springLength = 0.01f; + camData[CAMERA_LAST_ACTUAL].minDistance = 0.0f; + camData[CAMERA_LAST_ACTUAL].maxDistance = 0.0f; + camData[CAMERA_LAST_ACTUAL].turnSpeed = 0.0f; + camData[CAMERA_LAST_ACTUAL].swingCoef = 0.0f; camData[CAMERA_TRANSITION].springCoef = 3.5f; camData[CAMERA_TRANSITION].InertialDampeningCoef = 0.25f; camData[CAMERA_TRANSITION].springLength = 0.01f; + camData[CAMERA_TRANSITION].minDistance = 1.0f; + camData[CAMERA_TRANSITION].maxDistance = 16.0f; + camData[CAMERA_TRANSITION].turnSpeed = 0.0f; + camData[CAMERA_TRANSITION].swingCoef = 0.0f; camData[CAMERA_COLLISION].springCoef = 1.0f; camData[CAMERA_COLLISION].InertialDampeningCoef = 0.25f; camData[CAMERA_COLLISION].springLength = 0.01f; + camData[CAMERA_COLLISION].minDistance = 2.0f; + camData[CAMERA_COLLISION].maxDistance = 16.0f; + camData[CAMERA_COLLISION].turnSpeed = 0.0f; + camData[CAMERA_COLLISION].swingCoef = 0.0f; + + camData[CAMERA_ERR].springCoef = 0.0f; + camData[CAMERA_ERR].InertialDampeningCoef = 0.0; + camData[CAMERA_ERR].springLength = 0.01f; + camData[CAMERA_ERR].minDistance = 0.0f; + camData[CAMERA_ERR].maxDistance = 0.0f; + camData[CAMERA_ERR].turnSpeed = 0.0f; + camData[CAMERA_ERR].swingCoef = 0.0f; transitionThresholdSquared = 1.0f; Index: pscamera.h =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/pscamera.h,v retrieving revision 1.37 retrieving revision 1.38 diff -C2 -d -r1.37 -r1.38 *** pscamera.h 12 Dec 2005 12:11:16 -0000 1.37 --- pscamera.h 21 Dec 2005 18:48:37 -0000 1.38 *************** *** 37,40 **** --- 37,41 ---- class GEMClientActor; + /* enum CameraMode { *************** *** 44,47 **** --- 45,49 ---- CAMERA_MAX }; + */ class psCamera *************** *** 68,75 **** CAMERA_TRANSITION, ! // A camera mode that is used when a collision occurs. ! // It allows for collisions to be rectified faster than normal ! CAMERA_COLLISION, ! CAMERA_ERR, // this is the error between the actual camera pos and its ideal CAMERA_MODES_COUNT --- 70,77 ---- CAMERA_TRANSITION, ! // A camera mode that is used when a collision occurs. ! // It allows for collisions to be rectified faster than normal ! CAMERA_COLLISION, ! CAMERA_ERR, // this is the error between the actual camera pos and its ideal CAMERA_MODES_COUNT Index: pscelclient.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/pscelclient.cpp,v retrieving revision 1.253 retrieving revision 1.254 diff -C2 -d -r1.253 -r1.254 *** pscelclient.cpp 21 Dec 2005 13:19:36 -0000 1.253 --- pscelclient.cpp 21 Dec 2005 18:48:37 -0000 1.254 *************** *** 963,966 **** --- 963,968 ---- factname = mesg.factname; ownerID = mesg.ownerID; + lastSentVelocity = lastSentRotation = csVector3(0); + stationary = true; Debug3( LOG_CELPERSIST, "Actor %s(%d) Received", mesg.name.GetData(), mesg.entityid ); *************** *** 993,996 **** --- 995,999 ---- alive = true; + ready = false; } Index: pscharcontrol.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/pscharcontrol.cpp,v retrieving revision 1.144 retrieving revision 1.145 diff -C2 -d -r1.144 -r1.145 *** pscharcontrol.cpp 20 Dec 2005 08:40:46 -0000 1.144 --- pscharcontrol.cpp 21 Dec 2005 18:48:37 -0000 1.145 *************** *** 1062,1066 **** { if(value) ! if (psengine->GetPSCamera()->GetCameraMode() == CAMERA_FIRST_PERSON) psengine->GetPAWS()->GetMouse()->WantCrosshair(); else --- 1062,1066 ---- { if(value) ! if (psengine->GetPSCamera()->GetCameraMode() == psCamera::CAMERA_FIRST_PERSON) psengine->GetPAWS()->GetMouse()->WantCrosshair(); else Index: psengine.cpp =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/psengine.cpp,v retrieving revision 1.542 retrieving revision 1.543 diff -C2 -d -r1.542 -r1.543 *** psengine.cpp 20 Dec 2005 23:21:04 -0000 1.542 --- psengine.cpp 21 Dec 2005 18:48:37 -0000 1.543 *************** *** 232,236 **** camera = NULL; ! cal3DCallbackLoader = csPtr<psCal3DCallbackLoader> (new psCal3DCallbackLoader(objectreg)); targetPetitioner = "None"; --- 232,236 ---- camera = NULL; ! cal3DCallbackLoader = csPtr<psCal3DCallbackLoader> (new psCal3DCallbackLoader(objectreg)); targetPetitioner = "None"; *************** *** 255,258 **** --- 255,259 ---- psEngine::~psEngine () { + printf("psEngine destroyed.\n"); } *************** *** 270,277 **** queue->RemoveListener (scfiEventHandler); ! delete paws; ! delete slotManager; delete cachemanager; delete meshUtil; delete mouseBinds; --- 271,279 ---- queue->RemoveListener (scfiEventHandler); ! delete paws; // Include delete of mainWidget ! delete questionclient; delete cachemanager; + delete slotManager; delete meshUtil; delete mouseBinds; *************** *** 1342,1347 **** unsigned int callbackcount; ! vmAnimCallback() {} ! virtual ~vmAnimCallback() {} // Not using this for now. --- 1344,1349 ---- unsigned int callbackcount; ! vmAnimCallback() {printf("vmAnimCallback constructed\n");} ! virtual ~vmAnimCallback() {printf("vmAnimCallback destroyed\n");} // Not using this for now. *************** *** 1441,1445 **** callback->SetRepeatCount((int)repeat); callback->SetRepeatSpriteAnim(sprite, spstate, animation); ! sprite->RegisterAnimCallback(animation,callback,99999999999.9F); // Make time huge as we do want only the end here } --- 1443,1451 ---- callback->SetRepeatCount((int)repeat); callback->SetRepeatSpriteAnim(sprite, spstate, animation); ! if (!sprite->RegisterAnimCallback(animation,callback,99999999999.9F)) // Make time huge as we do want only the end here ! { ! Error2("Failed to register callback for animation %s",animation); ! delete callback; ! } } Index: psengine.h =================================================================== RCS file: /cvsroot/planeshift/planeshift/src/client/psengine.h,v retrieving revision 1.183 retrieving revision 1.184 diff -C2 -d -r1.183 -r1.184 *** psengine.h 20 Dec 2005 23:21:04 -0000 1.183 --- psengine.h 21 Dec 2005 18:48:37 -0000 1.184 *************** *** 403,407 **** csRef<ActionHandler> actionhandler; csRef<ZoneHandler> zonehandler; ///< Region/map file memory manager. ! csRef<psCal3DCallbackLoader> cal3DCallbackLoader; psClientCharManager* charmanager; ///< Holds the charactermanager psMeshUtil* meshUtil; --- 403,407 ---- csRef<ActionHandler> actionhandler; csRef<ZoneHandler> zonehandler; ///< Region/map file memory manager. ! csRef<psCal3DCallbackLoader> cal3DCallbackLoader; psClientCharManager* charmanager; ///< Holds the charactermanager psMeshUtil* meshUtil; |