Browse Source

Merge pull request #1391 from Azaezel/C4706

warning C4706: assignment within conditional expression
Daniel Buckmaster 10 years ago
parent
commit
c0e82d72a2
1 changed files with 2 additions and 2 deletions
  1. 2 2
      Engine/source/forest/forestWindEmitter.cpp

+ 2 - 2
Engine/source/forest/forestWindEmitter.cpp

@@ -521,8 +521,8 @@ void ForestWindEmitter::_renderEmitterInfo( ObjectRenderInst *ri, SceneRenderSta
    {
    {
       // If the camera is close to the sphere, shrink the sphere so it remains visible.
       // If the camera is close to the sphere, shrink the sphere so it remains visible.
       GameConnection* gc = GameConnection::getConnectionToServer();
       GameConnection* gc = GameConnection::getConnectionToServer();
-      GameBase* gb;
-      if ( gc && (gb = gc->getCameraObject()) )
+      GameBase *gb = gc ? gc->getCameraObject() : NULL;
+      if (gb)
       {
       {
          F32 camDist = (gb->getPosition() - getPosition()).len();
          F32 camDist = (gb->getPosition() - getPosition()).len();
          if ( camDist < mWindRadius )
          if ( camDist < mWindRadius )