Mercurial > mm7

comparison Render.cpp @ 2142:ca548138d6aa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
some code cleaning in video playing, loops play but there is a memory leak
author zipi
date Thu, 02 Jan 2014 18:25:42 +0000
parents e99081a3a66a
children 92511cd8fcdb
comparison
equal deleted inserted replaced
2141:1283eedcc028 2142:ca548138d6aa
9125 { 9125 {
9126 if ( pCurrentScreen != SCREEN_GAME 9126 if ( pCurrentScreen != SCREEN_GAME
9127 && pCurrentScreen != SCREEN_NPC_DIALOGUE 9127 && pCurrentScreen != SCREEN_NPC_DIALOGUE
9128 && pCurrentScreen != SCREEN_CHANGE_LOCATION ) 9128 && pCurrentScreen != SCREEN_CHANGE_LOCATION )
9129 { 9129 {
9130 if ( pCurrentScreen == SCREEN_INPUT_BLV ) 9130 if (pCurrentScreen == SCREEN_INPUT_BLV)
9131 return pVideoPlayer->pSmackerMovie != 0; 9131 return pVideoPlayer->pMovie;//pSmackerMovie != 0;
9132 if ( pCurrentScreen != SCREEN_BRANCHLESS_NPC_DIALOG ) 9132 if ( pCurrentScreen != SCREEN_BRANCHLESS_NPC_DIALOG )
9133 return true; 9133 return true;
9134 } 9134 }
9135 return false; 9135 return false;
9136 } 9136 }