Mercurial > mm7
diff Game.cpp @ 327:a7f15da53e82
Слияние
author | Ritor1 |
---|---|
date | Wed, 20 Feb 2013 11:27:06 +0600 |
parents | d720a13e2273 |
children | 8e23edf57e27 |
line wrap: on
line diff
--- a/Game.cpp Wed Feb 20 11:26:54 2013 +0600 +++ b/Game.cpp Wed Feb 20 11:27:06 2013 +0600 @@ -624,7 +624,7 @@ } //depth = v2; - PickMouse(depth, y, x, true, v10, v11); + PickMouse(depth, y, x, false, v10, v11); pLightmapBuilder->std__vector_000004_size = 0; pLightmapBuilder->std__vector_183808_size = 0; pDecalBuilder->std__vector_pDecals_size = 0; @@ -1114,6 +1114,7 @@ } else assert(false); } + break; default: {