Mercurial > might-and-magic-trilogy
diff VideoPlayer.cpp @ 105:e633cde38d64
Слияние
author | Ritor1 |
---|---|
date | Fri, 02 Nov 2012 10:04:27 +0600 |
parents | 62bfa3ffe7db 8c6308bb19b3 |
children | 1e18102bd4d0 |
line wrap: on
line diff
--- a/VideoPlayer.cpp Fri Nov 02 10:04:08 2012 +0600 +++ b/VideoPlayer.cpp Fri Nov 02 10:04:27 2012 +0600 @@ -492,7 +492,7 @@ LABEL_3: v7 = "Can't open file - anims\\%s.smk"; LABEL_4: - sprintf(v3, v7, v8); + sprintfex(v3, v7, v8); MessageBoxA(0, v3, "Video File Error", 0); return; } @@ -1025,13 +1025,13 @@ MessageBoxA(nullptr, v12, v15, 0); return; } - sprintf(Str2, "%s.smk", pMovieName); + sprintfex(Str2, "%s.smk", pMovieName); v5 = OpenSmack(Str2); v3->pSmackerMovie = v5; if ( !v5 ) { v3->Unload(); - sprintf(pTmpBuf, "Can't load %s", &Str2); + sprintfex(pTmpBuf, "Can't load %s", &Str2); v15 = "E:\\WORK\\MSDEV\\MM7\\MM7\\Code\\Video.cpp:937"; v12 = pTmpBuf; goto LABEL_6; @@ -1105,7 +1105,7 @@ if ( !v6 ) { Unload(); - sprintf(pVideoName, "Can't load file - anims\\%s.smk", pFilename); + sprintfex(pVideoName, "Can't load file - anims\\%s.smk", pFilename); LABEL_17: MessageBoxA(0, pVideoName, "Smacker Error", 0); return; @@ -1121,7 +1121,7 @@ Unload(); v12 = "Can't allocate memory for buffer"; LABEL_16: - sprintf(pVideoName, v12); + sprintfex(pVideoName, v12); goto LABEL_17; } SmackToBuffer(v4->pSmackerMovie, 0, 0, v4->pSmackerMovie->Width, v4->pSmackerMovie->Height, v9, 0);