From 9e935c417b2895dc8a6b8e086b2e50e3546e3d0e Mon Sep 17 00:00:00 2001 From: Azaezel Date: Sat, 29 Nov 2014 15:48:49 -0600 Subject: [PATCH 1/3] rotAroundNormal mangling outcome -reverted --- Engine/source/T3D/projectile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engine/source/T3D/projectile.cpp b/Engine/source/T3D/projectile.cpp index b59535366..ed45f6838 100644 --- a/Engine/source/T3D/projectile.cpp +++ b/Engine/source/T3D/projectile.cpp @@ -1018,7 +1018,7 @@ void Projectile::explode( const Point3F &p, const Point3F &n, const U32 collideT // Client (impact) decal. if ( mDataBlock->decal ) - gDecalManager->addDecal(p, n, mRandF(0.0f, M_2PI_F), mDataBlock->decal); + gDecalManager->addDecal(p, n, 0.0f, mDataBlock->decal); // Client object updateSound(); From 6201e48501b7db6be71a0e957fe64966c00b98fd Mon Sep 17 00:00:00 2001 From: Azaezel Date: Sun, 26 Apr 2015 20:25:40 -0500 Subject: [PATCH 2/3] crash out on net stream leaks. causes a fatal assertion when bitstream is passed an int value it cannot transmit given the provided bit length, and reports what the value and count were, respectively --- Engine/source/core/stream/bitStream.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engine/source/core/stream/bitStream.cpp b/Engine/source/core/stream/bitStream.cpp index 4ea46b6f5..f80389640 100644 --- a/Engine/source/core/stream/bitStream.cpp +++ b/Engine/source/core/stream/bitStream.cpp @@ -336,7 +336,7 @@ S32 BitStream::readInt(S32 bitCount) void BitStream::writeInt(S32 val, S32 bitCount) { - AssertWarn((bitCount == 32) || ((val >> bitCount) == 0), "BitStream::writeInt: value out of range"); + AssertFatal((bitCount == 32) || ((val >> bitCount) == 0), avar("BitStream::writeInt: value out of range: %i/%i (%i bits)", val, 1 << bitCount, bitCount)); val = convertHostToLEndian(val); writeBits(bitCount, &val); From 2fbf6bdb9d937bbaab485cd175cf4d9ff18f96f4 Mon Sep 17 00:00:00 2001 From: Daniel Buckmaster Date: Mon, 27 Apr 2015 21:30:09 +1000 Subject: [PATCH 3/3] Removed a space. --- Engine/source/T3D/projectile.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Engine/source/T3D/projectile.cpp b/Engine/source/T3D/projectile.cpp index ed45f6838..8bf47de36 100644 --- a/Engine/source/T3D/projectile.cpp +++ b/Engine/source/T3D/projectile.cpp @@ -1018,7 +1018,7 @@ void Projectile::explode( const Point3F &p, const Point3F &n, const U32 collideT // Client (impact) decal. if ( mDataBlock->decal ) - gDecalManager->addDecal(p, n, 0.0f, mDataBlock->decal); + gDecalManager->addDecal(p, n, 0.0f, mDataBlock->decal); // Client object updateSound();