Mercurial > mm7

comparison mm7_2.cpp @ 1031:f93d17337113

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
UI stuff.
author Nomad
date Tue, 21 May 2013 14:34:14 +0200
parents 7735bdb3c30f
children 3a5c8df8381d
comparison
equal deleted inserted replaced
1030:7735bdb3c30f 1031:f93d17337113
6884 pParty->alignment = PartyAlignment_Evil; 6884 pParty->alignment = PartyAlignment_Evil;
6885 SetUserInterface(pParty->alignment, true); 6885 SetUserInterface(pParty->alignment, true);
6886 return 0; 6886 return 0;
6887 6887
6888 //SubMenu "Time" 6888 //SubMenu "Time"
6889 case 40009: pParty->uTimePlayed += Day; return 0; 6889 case 40009: pParty->uTimePlayed += Timer::Day; return 0;
6890 case 40010: pParty->uTimePlayed += Week; return 0; 6890 case 40010: pParty->uTimePlayed += Timer::Week; return 0;
6891 case 40011: pParty->uTimePlayed += Month; return 0; 6891 case 40011: pParty->uTimePlayed += Timer::Month; return 0;
6892 case 40012: pParty->uTimePlayed += Year; return 0; 6892 case 40012: pParty->uTimePlayed += Timer::Year; return 0;
6893 6893
6894 //SubMenu "Items" 6894 //SubMenu "Items"
6895 case 40015: 6895 case 40015:
6896 { 6896 {
6897 int pItemID = rand() % 500; 6897 int pItemID = rand() % 500;
7233 //goto _def_wnd_proc; 7233 //goto _def_wnd_proc;
7234 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7234 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7235 } 7235 }
7236 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7236 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7237 } 7237 }
7238 if ( dword_506E68 != -1 ) 7238 if ( uGameMenuUI_CurentlySelectedKeyIdx != -1 )
7239 { 7239 {
7240 pKeyActionMap->_459F10(wParam); 7240 pKeyActionMap->_459F10(wParam);
7241 return DefWindowProcA(hWnd, Msg, wParam, lParam); 7241 return DefWindowProcA(hWnd, Msg, wParam, lParam);
7242 } 7242 }
7243 if ( !pArcomageGame->bGameInProgress ) 7243 if ( !pArcomageGame->bGameInProgress )