Ben Payne 10 vuotta sitten
vanhempi
commit
f67a0353d0

+ 1 - 1
Engine/source/core/strings/stringFunctions.cpp

@@ -472,7 +472,7 @@ S32 dSscanf(const char *buffer, const char *format, ...)
 #else
    va_list args;
    va_start(args, format);
-   int res = vsscanf(buffer, format, args);
+   S32 res = vsscanf(buffer, format, args);
    va_end(args);
    return res;
 #endif

+ 4 - 4
Engine/source/environment/basicClouds.cpp

@@ -63,10 +63,10 @@ BasicClouds::BasicClouds()
    mTypeMask |= EnvironmentObjectType | StaticObjectType;
    mNetFlags.set(Ghostable | ScopeAlways);
 
-   mTimeSC =
-   mModelViewProjSC =
-   mTexScaleSC =
-   mTexDirectionSC =
+   mTimeSC = 0;
+   mModelViewProjSC = 0;
+   mTexScaleSC = 0;
+   mTexDirectionSC = 0;
    mTexOffsetSC = 0;
 
    mLayerEnabled[0] = true;

+ 0 - 2
Engine/source/gfx/bitmap/ddsLoader.cpp

@@ -606,8 +606,6 @@ bool DDSFile::read(Stream &s, U32 dropMipCount)
          mPitchOrLinearSize = getSurfaceSize( dropMipCount );
       else if ( mFlags.test( PitchSizeFlag ) )
          mPitchOrLinearSize = getSurfacePitch( dropMipCount );
-      else
-         ; // Do nothing?
 
       // Now fix up the rest of the 
       mMipMapCount = getMax( (U32)1, mMipMapCount - dropMipCount );