Mercurial > mm7

comparison Render.cpp @ 376:615e6b6f55c2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Fri, 22 Feb 2013 20:03:15 +0400
parents edd2d8b7e3c4
children 58b71c1af7d8
comparison
equal deleted inserted replaced
375:c606cabd7cbf 376:615e6b6f55c2
10974 v5->uParticleTrailColor = v1; 10974 v5->uParticleTrailColor = v1;
10975 } 10975 }
10976 while ( v2 < (signed int)pObjectList->uNumObjects ); 10976 while ( v2 < (signed int)pObjectList->uNumObjects );
10977 } 10977 }
10978 LOBYTE(v1) = 1; 10978 LOBYTE(v1) = 1;
10979 SetUserInterface(pParty->uAlignment, v1); 10979 SetUserInterface(pParty->alignment, v1);
10980 if ( pVideoPlayer->pVideoFrame.pPixels ) 10980 if ( pVideoPlayer->pVideoFrame.pPixels )
10981 pVideoPlayer->pVideoFrame.Load(pVideoPlayer->pVideoFrameTextureFilename, 1); 10981 pVideoPlayer->pVideoFrame.Load(pVideoPlayer->pVideoFrameTextureFilename, 1);
10982 if ( uCurrentMenuID ) 10982 if ( uCurrentMenuID )
10983 { 10983 {
10984 if ( uCurrentMenuID != 6 ) 10984 if ( uCurrentMenuID != 6 )