Mercurial > mm7
diff Vis.cpp @ 64:f6e7d7110512
Слияние
author | Ritor1 |
---|---|
date | Wed, 23 Jan 2013 13:14:41 +0600 |
parents | a96ebf3123d2 80484cf3a683 |
children | 31feb3432bbd |
line wrap: on
line diff
--- a/Vis.cpp Wed Jan 23 13:14:10 2013 +0600 +++ b/Vis.cpp Wed Jan 23 13:14:41 2013 +0600 @@ -1605,7 +1605,7 @@ stru1.uNumPointers = 0; CastPickRay(pMouseRay, fMouseX, fMouseY, fDepth); - //PickBillboards(fDepth, fMouseX, fMouseY, &stru1, a5); + PickBillboards(fDepth, fMouseX, fMouseY, &stru1, a5);//Ritor1: do comment to test if (uCurrentlyLoadedLevelType == LEVEL_Indoor) PickIndoor(fDepth, pMouseRay, &stru1, a6); else