comparison UI/UIMainMenu.cpp @ 1572:19f1735fca80

Слияние
author Ritor1
date Sun, 08 Sep 2013 17:07:58 +0600
parents ef20d4608b1a c4ab816fcc5e
children 75fafd8ced59
comparison
equal deleted inserted replaced
1571:ef20d4608b1a 1572:19f1735fca80
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"
109 pIconsFrameTable->InitializeAnimation(pIconsFrameTable->FindIcon("wizeyeA")); 106 pIconsFrameTable->InitializeAnimation(pIconsFrameTable->FindIcon("wizeyeA"));
110 pIconsFrameTable->InitializeAnimation(pIconsFrameTable->FindIcon("torchC")); 107 pIconsFrameTable->InitializeAnimation(pIconsFrameTable->FindIcon("torchC"));
111 pIconsFrameTable->InitializeAnimation(pIconsFrameTable->FindIcon("torchB")); 108 pIconsFrameTable->InitializeAnimation(pIconsFrameTable->FindIcon("torchB"));
112 pIconsFrameTable->InitializeAnimation(pIconsFrameTable->FindIcon("torchA")); 109 pIconsFrameTable->InitializeAnimation(pIconsFrameTable->FindIcon("torchA"));
113 110
114 pTextureIDs_pMapDirs[0] = pIcons_LOD->LoadTexture("MAPDIR8", TEXTURE_16BIT_PALETTE); 111 pTextureIDs_pMapDirs[0] = pIcons_LOD->LoadTexture("MAPDIR1", TEXTURE_16BIT_PALETTE);
115 pTextureIDs_pMapDirs[1] = pIcons_LOD->LoadTexture("MAPDIR1", TEXTURE_16BIT_PALETTE); 112 pTextureIDs_pMapDirs[1] = pIcons_LOD->LoadTexture("MAPDIR2", TEXTURE_16BIT_PALETTE);
116 pTextureIDs_pMapDirs[2] = pIcons_LOD->LoadTexture("MAPDIR2", TEXTURE_16BIT_PALETTE); 113 pTextureIDs_pMapDirs[2] = pIcons_LOD->LoadTexture("MAPDIR3", TEXTURE_16BIT_PALETTE);
117 pTextureIDs_pMapDirs[3] = pIcons_LOD->LoadTexture("MAPDIR3", TEXTURE_16BIT_PALETTE); 114 pTextureIDs_pMapDirs[3] = pIcons_LOD->LoadTexture("MAPDIR4", TEXTURE_16BIT_PALETTE);
118 pTextureIDs_pMapDirs[4] = pIcons_LOD->LoadTexture("MAPDIR4", TEXTURE_16BIT_PALETTE); 115 pTextureIDs_pMapDirs[4] = pIcons_LOD->LoadTexture("MAPDIR5", TEXTURE_16BIT_PALETTE);
119 pTextureIDs_pMapDirs[5] = pIcons_LOD->LoadTexture("MAPDIR5", TEXTURE_16BIT_PALETTE); 116 pTextureIDs_pMapDirs[5] = pIcons_LOD->LoadTexture("MAPDIR6", TEXTURE_16BIT_PALETTE);
120 pTextureIDs_pMapDirs[6] = pIcons_LOD->LoadTexture("MAPDIR6", TEXTURE_16BIT_PALETTE); 117 pTextureIDs_pMapDirs[6] = pIcons_LOD->LoadTexture("MAPDIR7", TEXTURE_16BIT_PALETTE);
121 pTextureIDs_pMapDirs[7] = pIcons_LOD->LoadTexture("MAPDIR7", TEXTURE_16BIT_PALETTE); 118 pTextureIDs_pMapDirs[7] = pIcons_LOD->LoadTexture("MAPDIR8", TEXTURE_16BIT_PALETTE);
122 119
123 uTextureID_BarBlue = pIcons_LOD->LoadTexture("ib-statB", TEXTURE_16BIT_PALETTE); 120 uTextureID_BarBlue = pIcons_LOD->LoadTexture("ib-statB", TEXTURE_16BIT_PALETTE);
124 uTextureID_BarGreen = pIcons_LOD->LoadTexture("ib-statG", TEXTURE_16BIT_PALETTE); 121 uTextureID_BarGreen = pIcons_LOD->LoadTexture("ib-statG", TEXTURE_16BIT_PALETTE);
125 uTextureID_BarYellow = pIcons_LOD->LoadTexture("ib-statY", TEXTURE_16BIT_PALETTE); 122 uTextureID_BarYellow = pIcons_LOD->LoadTexture("ib-statY", TEXTURE_16BIT_PALETTE);
126 uTextureID_BarRed = pIcons_LOD->LoadTexture("ib-statR", TEXTURE_16BIT_PALETTE); 123 uTextureID_BarRed = pIcons_LOD->LoadTexture("ib-statR", TEXTURE_16BIT_PALETTE);
270 v0 = (char *)pEvents_LOD->LoadRaw("credits.txt", 0); 267 v0 = (char *)pEvents_LOD->LoadRaw("credits.txt", 0);
271 v1 = v0; 268 v1 = v0;
272 ptr = v0; 269 ptr = v0;
273 pFile = pEvents_LOD->FindContainer("credits.txt", 0); 270 pFile = pEvents_LOD->FindContainer("credits.txt", 0);
274 if ( !pFile ) 271 if ( !pFile )
275 Abortf(pGlobalTXT_LocalizationStrings[63]); // "Might and Magic VII is having trouble loading files. 272 Error(pGlobalTXT_LocalizationStrings[63]); // "Might and Magic VII is having trouble loading files.
273
276 // Please re-install to fix this problem. Note: Re-installing will not destroy your save games." 274 // Please re-install to fix this problem. Note: Re-installing will not destroy your save games."
277 fread(&pTexture3, 1, 0x30, pFile); 275 fread(&pTexture3, 1, 0x30, pFile);
278 pSize = pTexture3.uDecompressedSize; 276 pSize = pTexture3.uDecompressedSize;
279 if ( !pTexture3.uDecompressedSize ) 277 if ( !pTexture3.uDecompressedSize )
280 pSize = pTexture3.uTextureSize; 278 pSize = pTexture3.uTextureSize;