Mercurial > mm7

comparison VideoPlayer.cpp @ 2376:bcd7fadbf7d2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Слияние
author Ritor1
date Mon, 12 May 2014 12:28:06 +0600
parents bbf8a522dcec
children a29d9609f9b2
comparison
equal deleted inserted replaced
2375:14c05b876218 2376:bcd7fadbf7d2
230 return; 230 return;
231 } 231 }
232 } 232 }
233 ReadFile(hMightVid, &uNumMightVideoHeaders, 4, &NumberOfBytesRead, 0); 233 ReadFile(hMightVid, &uNumMightVideoHeaders, 4, &NumberOfBytesRead, 0);
234 ReadFile(hMagicVid, &uNumMagicVideoHeaders, 4, &NumberOfBytesRead, 0); 234 ReadFile(hMagicVid, &uNumMagicVideoHeaders, 4, &NumberOfBytesRead, 0);
235 pMagicVideoHeaders = 0;
236 pMightVideoHeaders = 0;
237 pMightVideoHeaders = (MovieHeader *)malloc(sizeof(MovieHeader) * uNumMightVideoHeaders + 2); 235 pMightVideoHeaders = (MovieHeader *)malloc(sizeof(MovieHeader) * uNumMightVideoHeaders + 2);
238 pMagicVideoHeaders = (MovieHeader *)malloc(sizeof(MovieHeader) * uNumMagicVideoHeaders + 2); 236 pMagicVideoHeaders = (MovieHeader *)malloc(sizeof(MovieHeader) * uNumMagicVideoHeaders + 2);
239 ReadFile(hMightVid, pMightVideoHeaders, 44 * uNumMightVideoHeaders, &NumberOfBytesRead, 0); 237 ReadFile(hMightVid, pMightVideoHeaders, 44 * uNumMightVideoHeaders, &NumberOfBytesRead, 0);
240 ReadFile(hMagicVid, pMagicVideoHeaders, 44 * uNumMagicVideoHeaders, &NumberOfBytesRead, 0); 238 ReadFile(hMagicVid, pMagicVideoHeaders, 44 * uNumMagicVideoHeaders, &NumberOfBytesRead, 0);
241 } 239 }
254 memset(pCurrentMovieName, 0, 0x40); 252 memset(pCurrentMovieName, 0, 0x40);
255 if ( pAudioPlayer->hAILRedbook && !bGameoverLoop ) 253 if ( pAudioPlayer->hAILRedbook && !bGameoverLoop )
256 AIL_redbook_resume(pAudioPlayer->hAILRedbook); 254 AIL_redbook_resume(pAudioPlayer->hAILRedbook);
257 pEventTimer->Resume(); 255 pEventTimer->Resume();
258 256
259 if (pMovie) 257 delete pMovie;
260 { 258 pMovie = nullptr;
261 delete pMovie;
262 pMovie = nullptr;
263 }
264 } 259 }
265 260
266 void VideoPlayer::_inlined_in_463149() 261 void VideoPlayer::_inlined_in_463149()
267 { 262 {
268 if (pMovie) 263 if (pMovie)