Sfoglia il codice sorgente

Merge pull request #1804 from Azaezel/greatestZero

clang: unsigned>0 checks
Areloch 9 anni fa
parent
commit
269b195355

+ 2 - 2
Engine/source/T3D/debris.h

@@ -62,8 +62,8 @@ struct DebrisData : public GameBaseData
    F32      elasticity;
    F32      lifetime;
    F32      lifetimeVariance;
-   U32      numBounces;
-   U32      bounceVariance;
+   S32      numBounces;
+   S32      bounceVariance;
    F32      minSpinSpeed;
    F32      maxSpinSpeed;
    bool     explodeOnMaxBounce;  // explodes after it has bounced max times

+ 1 - 1
Engine/source/T3D/fx/particleEmitter.h

@@ -87,7 +87,7 @@ class ParticleEmitterData : public GameBaseData
    /// of the ambient color on the particle.
    F32 ambientFactor;
 
-   U32   lifetimeMS;                         ///< Lifetime of particles
+   S32   lifetimeMS;                         ///< Lifetime of particles
    U32   lifetimeVarianceMS;                 ///< Varience in lifetime from 0 to n
 
    bool  overrideAdvance;                    ///<

+ 1 - 1
Engine/source/T3D/fx/ribbon.cpp

@@ -354,7 +354,7 @@ void Ribbon::addSegmentPoint(Point3F &point, MatrixF &mat) {
    U32 segmentsToDelete = checkRibbonDistance(mDataBlock->segmentsPerUpdate);
 
    for (U32 i = 0; i < segmentsToDelete; i++) {
-      U32 last = mSegmentPoints.size() - 1;
+      S32 last = mSegmentPoints.size() - 1;
       if (last < 0)
          break;
       mTravelledDistance += last ? (mSegmentPoints[last] - mSegmentPoints[last-1]).len() : 0;

+ 1 - 1
Engine/source/T3D/player.h

@@ -484,7 +484,7 @@ protected:
    /// @{
 
    struct ActionAnimation {
-      U32 action;
+      S32 action;
       TSThread* thread;
       S32 delayTicks;               // before picking another.
       bool forward;