Mercurial > mm7

comparison mm7_6.cpp @ 223:1bd823f52e3a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Gloval
date Sun, 17 Feb 2013 11:41:44 +0400
parents 8113753ed2ae 650d96af8855
children 9917d3b4925e
comparison
equal deleted inserted replaced
222:8113753ed2ae 223:1bd823f52e3a
8146 if ( pRenderer->pRenderD3D ) 8146 if ( pRenderer->pRenderD3D )
8147 { 8147 {
8148 v6 = a3 != 0; 8148 v6 = a3 != 0;
8149 if ( a4 ) 8149 if ( a4 )
8150 LOBYTE(v6) = v6 | 8; 8150 LOBYTE(v6) = v6 | 8;
8151 v7 = pGame->pVisInstance->_4C1944(3, a2, v6, 657456, -1); 8151 v7 = pGame->pVisInstance->_4C1944(OBJECT_Actor, a2, v6, 657456, -1);
8152 if ( v7 != -1 ) 8152 if ( v7 != -1 )
8153 return (unsigned __int16)v7; 8153 return (unsigned __int16)v7;
8154 } 8154 }
8155 else 8155 else
8156 { 8156 {