Mercurial > mm7

comparison UI/UIMainMenu.cpp @ 1545:c4ab816fcc5e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
assert, Abortf, AbortWithError -> Assert, Error refactors here and there
author Nomad
date Sat, 07 Sep 2013 20:05:20 +0200
parents 53265d238d94
children 19f1735fca80
comparison
equal deleted inserted replaced
1544:499761153844 1545:c4ab816fcc5e
1 #ifdef _MSC_VER 1 #ifdef _MSC_VER
2 #define _CRT_SECURE_NO_WARNINGS 2 #define _CRT_SECURE_NO_WARNINGS
3 #endif 3 #endif
4
5 #include <assert.h>
6
7 4
8 #include "..\Mouse.h" 5 #include "..\Mouse.h"
9 #include "..\Keyboard.h" 6 #include "..\Keyboard.h"
10 7
11 #include "..\GUIWindow.h" 8 #include "..\GUIWindow.h"
276 v0 = (char *)pEvents_LOD->LoadRaw("credits.txt", 0); 273 v0 = (char *)pEvents_LOD->LoadRaw("credits.txt", 0);
277 v1 = v0; 274 v1 = v0;
278 ptr = v0; 275 ptr = v0;
279 pFile = pEvents_LOD->FindContainer("credits.txt", 0); 276 pFile = pEvents_LOD->FindContainer("credits.txt", 0);
280 if ( !pFile ) 277 if ( !pFile )
281 Abortf(pGlobalTXT_LocalizationStrings[63]); // "Might and Magic VII is having trouble loading files. 278 Error(pGlobalTXT_LocalizationStrings[63]); // "Might and Magic VII is having trouble loading files.
279
282 // Please re-install to fix this problem. Note: Re-installing will not destroy your save games." 280 // Please re-install to fix this problem. Note: Re-installing will not destroy your save games."
283 fread(&pTexture3, 1, 0x30, pFile); 281 fread(&pTexture3, 1, 0x30, pFile);
284 pSize = pTexture3.uDecompressedSize; 282 pSize = pTexture3.uDecompressedSize;
285 if ( !pTexture3.uDecompressedSize ) 283 if ( !pTexture3.uDecompressedSize )
286 pSize = pTexture3.uTextureSize; 284 pSize = pTexture3.uTextureSize;