Просмотр исходного кода

Merge branch 'GarageGames/development' into ueberengine-dev

duion 10 лет назад
Родитель
Сommit
3def8cc221
2 измененных файлов с 2 добавлено и 2 удалено
  1. 1 1
      Engine/source/T3D/projectile.cpp
  2. 1 1
      Engine/source/core/stream/bitStream.cpp

+ 1 - 1
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();

+ 1 - 1
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);