Merge pull request #785 from machinelevel/dev4

Disable hand receive logic to keep team from crashing while a bug is bei...
This commit is contained in:
ZappoMan 2013-08-05 16:05:06 -07:00
commit cc8c92c4e0
2 changed files with 7 additions and 2 deletions

View file

@ -105,6 +105,9 @@ int HandData::encodeRemoteData(unsigned char* destinationBuffer) {
size_t checkLength = destinationBuffer - startPosition; size_t checkLength = destinationBuffer - startPosition;
*destinationBuffer++ = (unsigned char)checkLength; *destinationBuffer++ = (unsigned char)checkLength;
// just a double-check, while tracing a crash.
// decodeRemoteData(destinationBuffer - (destinationBuffer - startPosition));
return destinationBuffer - startPosition; return destinationBuffer - startPosition;
} }
@ -157,8 +160,9 @@ int HandData::decodeRemoteData(unsigned char* sourceBuffer) {
} }
setRaveGloveActive((gloveFlags & GLOVE_FLAG_RAVE) != 0); setRaveGloveActive((gloveFlags & GLOVE_FLAG_RAVE) != 0);
setRaveGloveMode(effectsMode); // This is disabled for crash tracing.
// setRaveGloveMode(effectsMode);
// One byte for error checking safety. // One byte for error checking safety.
unsigned char requiredLength = (unsigned char)(sourceBuffer - startPosition); unsigned char requiredLength = (unsigned char)(sourceBuffer - startPosition);
unsigned char checkLength = *sourceBuffer++; unsigned char checkLength = *sourceBuffer++;

View file

@ -44,6 +44,7 @@ enum RaveGloveEffectsMode
class HandData { class HandData {
public: public:
HandData(AvatarData* owningAvatar); HandData(AvatarData* owningAvatar);
virtual ~HandData() {}
// These methods return the positions in Leap-relative space. // These methods return the positions in Leap-relative space.
// To convert to world coordinates, use Hand::leapPositionToWorldPosition. // To convert to world coordinates, use Hand::leapPositionToWorldPosition.