Mercurial > mm7

comparison mm7_2.cpp @ 875:b7246c149957

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 01 Apr 2013 17:37:42 +0600
parents 231523a39203 2db21a810d48
children b6573b99ca40
comparison
equal deleted inserted replaced
874:231523a39203 875:b7246c149957
7131 pMouse->SetMouseClick((unsigned __int16)lParam, lParam >> 16); 7131 pMouse->SetMouseClick((unsigned __int16)lParam, lParam >> 16);
7132 if (pGame) 7132 if (pGame)
7133 { 7133 {
7134 if (pAsyncMouse) 7134 if (pAsyncMouse)
7135 goto _def_wnd_proc; 7135 goto _def_wnd_proc;
7136 v33 = GetPickDepth(); 7136 v33 = pGame->pIndoorCameraD3D->GetPickDepth();
7137 pGame->PickMouse(v33, (unsigned __int16)lParam, lParam >> 16, v31, &vis_sprite_filter_2, &vis_door_filter); 7137 pGame->PickMouse(v33, (unsigned __int16)lParam, lParam >> 16, v31, &vis_sprite_filter_2, &vis_door_filter);
7138 } 7138 }
7139 if (!pAsyncMouse) 7139 if (!pAsyncMouse)
7140 { 7140 {
7141 sub_416D62_ShowPopupWindow_MonsterRecord_ItemInfo_etcsub_416D62(0); 7141 sub_416D62_ShowPopupWindow_MonsterRecord_ItemInfo_etcsub_416D62(0);
7150 case WM_MBUTTONDOWN: 7150 case WM_MBUTTONDOWN:
7151 if ( pRenderer->pRenderD3D ) 7151 if ( pRenderer->pRenderD3D )
7152 { 7152 {
7153 if ( pGame && !pAsyncMouse ) 7153 if ( pGame && !pAsyncMouse )
7154 { 7154 {
7155 v34 = GetPickDepth(); 7155 v34 = pGame->pIndoorCameraD3D->GetPickDepth();
7156 pGame->PickMouse(v34, (unsigned __int16)lParam, lParam >> 16, 1, &vis_sprite_filter_3, &vis_face_filter); 7156 pGame->PickMouse(v34, (unsigned __int16)lParam, lParam >> 16, 1, &vis_sprite_filter_3, &vis_face_filter);
7157 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7157 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7158 } 7158 }
7159 goto _def_wnd_proc; 7159 goto _def_wnd_proc;
7160 } 7160 }