Mercurial > mm7
comparison mm7_2.cpp @ 184:428cbb33872c
Слияние
author | Ritor1 |
---|---|
date | Fri, 15 Feb 2013 18:34:53 +0600 |
parents | 27573ee0d434 c5bd7a825ef2 |
children | d65528fc3bda 038a4d09406f |
comparison
equal
deleted
inserted
replaced
183:27573ee0d434 | 184:428cbb33872c |
---|---|
5102 pWindow.uFrameY = 60; | 5102 pWindow.uFrameY = 60; |
5103 pWindow.uFrameWidth = 469; | 5103 pWindow.uFrameWidth = 469; |
5104 pWindow.uFrameHeight = 338; | 5104 pWindow.uFrameHeight = 338; |
5105 pWindow.uFrameZ = 543; | 5105 pWindow.uFrameZ = 543; |
5106 pWindow.uFrameW = 397; | 5106 pWindow.uFrameW = 397; |
5107 pFont = LoadFont("endgame.fnt", "FONTPAL", 0); | 5107 pFont = LoadFont("endgame.fnt", "FONTPAL", NULL); |
5108 if ( (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 99) ) | 5108 if ( (unsigned __int16)_449B57_test_bit(pParty->_award_bits, 99) ) |
5109 { | 5109 { |
5110 v1 = pGlobalTXT_LocalizationStrings[675]; | 5110 v1 = pGlobalTXT_LocalizationStrings[675]; |
5111 } | 5111 } |
5112 else | 5112 else |
13896 unsigned int v12; // ecx@56 | 13896 unsigned int v12; // ecx@56 |
13897 HANDLE v13; // eax@68 | 13897 HANDLE v13; // eax@68 |
13898 unsigned int startms; // [sp+8h] [bp-24h]@55 | 13898 unsigned int startms; // [sp+8h] [bp-24h]@55 |
13899 RECT Rect; // [sp+Ch] [bp-20h]@15 | 13899 RECT Rect; // [sp+Ch] [bp-20h]@15 |
13900 int a2[4]; // [sp+1Ch] [bp-10h]@15 | 13900 int a2[4]; // [sp+1Ch] [bp-10h]@15 |
13901 | 13901 #ifdef MM7_TEXT_DLL |
13902 auto mm7text_dll = LoadLibraryW(L"mm7text.dll"); | 13902 auto mm7text_dll = LoadLibraryW(L"mm7text.dll"); |
13903 sprintfex = (int (__cdecl *)(char *a1, const char *a2, ...))GetProcAddress(mm7text_dll, "_sprintfex"); | 13903 sprintfex = (int (__cdecl *)(char *a1, const char *a2, ...))GetProcAddress(mm7text_dll, "_sprintfex"); |
13904 #endif | |
13905 | |
13904 | 13906 |
13905 if (pCmdLine && *pCmdLine) | 13907 if (pCmdLine && *pCmdLine) |
13906 { | 13908 { |
13907 if (wcsstr(pCmdLine, L"-usedefs")) | 13909 if (wcsstr(pCmdLine, L"-usedefs")) |
13908 bDebugResouces = 1; | 13910 bDebugResouces = 1; |