Mercurial > mm7

comparison mm7_3.cpp @ 999:dcdfbb6eede9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Tue, 14 May 2013 17:38:14 +0600
parents e4383e6dfbef 3431f6abc786
children c45d51b3f4f4 8b492d4722d4
comparison
equal deleted inserted replaced
998:e4383e6dfbef 999:dcdfbb6eede9
11482 } 11482 }
11483 } 11483 }
11484 } 11484 }
11485 11485
11486 //----- (0044100D) -------------------------------------------------------- 11486 //----- (0044100D) --------------------------------------------------------
11487 bool __cdecl sub_44100D() 11487 bool sub_44100D()
11488 { 11488 {
11489 return pCurrentScreen == SCREEN_NPC_DIALOGUE || pCurrentScreen == SCREEN_CHARACTERS || 11489 return pCurrentScreen == SCREEN_NPC_DIALOGUE || pCurrentScreen == SCREEN_CHARACTERS ||
11490 pCurrentScreen > SCREEN_LOADGAME && pCurrentScreen <= SCREEN_E || 11490 pCurrentScreen > SCREEN_LOADGAME && pCurrentScreen <= SCREEN_E ||
11491 pCurrentScreen > SCREEN_VIDEO && pCurrentScreen <= SCREEN_INPUT_BLV || pCurrentScreen == SCREEN_CASTING; 11491 pCurrentScreen > SCREEN_VIDEO && pCurrentScreen <= SCREEN_INPUT_BLV || pCurrentScreen == SCREEN_CASTING;
11492 } 11492 }