Mercurial > mm7
comparison mm7_2.cpp @ 1475:d7720c1f1d3b
Слияние
author | Ritor1 |
---|---|
date | Wed, 28 Aug 2013 14:39:01 +0600 |
parents | 0a7ceb4b25b7 |
children | 7ef4b64f6329 |
comparison
equal
deleted
inserted
replaced
1474:3cda66022a77 | 1475:d7720c1f1d3b |
---|---|
3420 float v33; // ST04_4@246 | 3420 float v33; // ST04_4@246 |
3421 float v34; // ST04_4@254 | 3421 float v34; // ST04_4@254 |
3422 struct tagPAINTSTRUCT Paint; // [sp+24h] [bp-48h]@13 | 3422 struct tagPAINTSTRUCT Paint; // [sp+24h] [bp-48h]@13 |
3423 int pXY[2]; // [sp+64h] [bp-8h]@261 | 3423 int pXY[2]; // [sp+64h] [bp-8h]@261 |
3424 int a2; // [sp+7Ch] [bp+10h]@50 | 3424 int a2; // [sp+7Ch] [bp+10h]@50 |
3425 | 3425 |
3426 switch (Msg) | 3426 switch (Msg) |
3427 { | 3427 { |
3428 case WM_SIZING: return 1; | 3428 case WM_SIZING: return 1; |
3429 case WM_SHOWWINDOW: | |
3430 case WM_GETTEXT: | |
3429 case WM_SETTEXT: return DefWindowProcW(hWnd, Msg, wParam, lParam); | 3431 case WM_SETTEXT: return DefWindowProcW(hWnd, Msg, wParam, lParam); |
3432 | |
3433 case WM_WINDOWPOSCHANGED: | |
3434 { | |
3435 if (pVideoPlayer && pVideoPlayer->AnyMovieLoaded() && pVideoPlayer->pBinkBuffer) | |
3436 BinkBufferSetOffset(pVideoPlayer->pBinkBuffer, 0, 0); | |
3437 | |
3438 return DefWindowProcW(hWnd, Msg, wParam, lParam); | |
3439 } | |
3440 | |
3430 case WM_CHAR: | 3441 case WM_CHAR: |
3431 { | 3442 { |
3432 if (!pKeyActionMap->_459F10(wParam) && !viewparams->field_4C) | 3443 if (!pKeyActionMap->_459F10(wParam) && !viewparams->field_4C) |
3433 GUI_HandleHotkey(wParam); | 3444 GUI_HandleHotkey(wParam); |
3434 } | 3445 } |
3771 //goto _def_wnd_proc; | 3782 //goto _def_wnd_proc; |
3772 return DefWindowProcA(hWnd, Msg, wParam, lParam); | 3783 return DefWindowProcA(hWnd, Msg, wParam, lParam); |
3773 } | 3784 } |
3774 if ( Msg > WM_ACTIVATEAPP ) | 3785 if ( Msg > WM_ACTIVATEAPP ) |
3775 { | 3786 { |
3776 if ( Msg == WM_WINDOWPOSCHANGED ) | 3787 if ( Msg != WM_KEYFIRST && Msg != WM_WINDOWPOSCHANGED) |
3777 { | |
3778 if (pVideoPlayer && pVideoPlayer->AnyMovieLoaded() && pVideoPlayer->pBinkBuffer) | |
3779 { | |
3780 BinkBufferSetOffset(pVideoPlayer->pBinkBuffer, 0, 0); | |
3781 } | |
3782 return DefWindowProcA(hWnd, Msg, wParam, lParam); | |
3783 } | |
3784 if ( Msg != WM_KEYFIRST ) | |
3785 { | 3788 { |
3786 if ( Msg == WM_KEYUP && wParam == VK_CONTROL ) | 3789 if ( Msg == WM_KEYUP && wParam == VK_CONTROL ) |
3787 { | 3790 { |
3788 dword_507B98_ctrl_pressed = 0; | 3791 dword_507B98_ctrl_pressed = 0; |
3789 } | 3792 } |