Mercurial > mm7

comparison Render.cpp @ 2356:08c4f1799ca1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Elements of VideoPlayer structure moved
author Ritor1
date Thu, 10 Apr 2014 17:34:50 +0600
parents d6407efaa4ea
children 23192f5b41d4
comparison
equal deleted inserted replaced
2347:d57505d3c70c 2356:08c4f1799ca1
9033 if ( pCurrentScreen != SCREEN_GAME 9033 if ( pCurrentScreen != SCREEN_GAME
9034 && pCurrentScreen != SCREEN_NPC_DIALOGUE 9034 && pCurrentScreen != SCREEN_NPC_DIALOGUE
9035 && pCurrentScreen != SCREEN_CHANGE_LOCATION ) 9035 && pCurrentScreen != SCREEN_CHANGE_LOCATION )
9036 { 9036 {
9037 if (pCurrentScreen == SCREEN_INPUT_BLV) 9037 if (pCurrentScreen == SCREEN_INPUT_BLV)
9038 return pVideoPlayer->pMovie;//pSmackerMovie != 0; 9038 return pMovie;//pSmackerMovie != 0;
9039 if ( pCurrentScreen != SCREEN_BRANCHLESS_NPC_DIALOG ) 9039 if ( pCurrentScreen != SCREEN_BRANCHLESS_NPC_DIALOG )
9040 return true; 9040 return true;
9041 } 9041 }
9042 return false; 9042 return false;
9043 } 9043 }