Mercurial > mm7
comparison Render.cpp @ 1458:934074e7fcc1
ModalWindow
__thiscall and __cdecl removed
Some random renames & refactors
author | Nomad |
---|---|
date | Wed, 21 Aug 2013 14:26:36 +0200 |
parents | bfe342ae0c1f |
children | a27cdb3d753e ab6bf38b2940 86cb7398d2a8 |
comparison
equal
deleted
inserted
replaced
1457:9dc33590f93e | 1458:934074e7fcc1 |
---|---|
89 HRESULT __stdcall DDrawDisplayModesEnumerator(DDSURFACEDESC2 *pSurfaceDesc, __int16 *a2); | 89 HRESULT __stdcall DDrawDisplayModesEnumerator(DDSURFACEDESC2 *pSurfaceDesc, __int16 *a2); |
90 HRESULT __stdcall D3DDeviceEnumerator(const GUID *lpGUID, const char *lpDeviceDesc, const char *lpDeviceName, D3DDEVICEDESC *pHWDesc, D3DDEVICEDESC *pSWDesc, struct RenderD3D_aux *a6); | 90 HRESULT __stdcall D3DDeviceEnumerator(const GUID *lpGUID, const char *lpDeviceDesc, const char *lpDeviceName, D3DDEVICEDESC *pHWDesc, D3DDEVICEDESC *pSWDesc, struct RenderD3D_aux *a6); |
91 signed int __stdcall RenderD3D__DeviceEnumerator(GUID *lpGUID, const char *lpDevDesc, const char *lpDriverName, RenderD3D__DevInfo *pOut); // idb | 91 signed int __stdcall RenderD3D__DeviceEnumerator(GUID *lpGUID, const char *lpDevDesc, const char *lpDriverName, RenderD3D__DevInfo *pOut); // idb |
92 | 92 |
93 //----- (0049E79F) -------------------------------------------------------- | 93 //----- (0049E79F) -------------------------------------------------------- |
94 bool __cdecl CheckTextureStages() | 94 bool CheckTextureStages() |
95 { | 95 { |
96 bool v0; // edi@1 | 96 bool v0; // edi@1 |
97 IDirectDrawSurface4 *pSurface2; // [sp+Ch] [bp-14h]@1 | 97 IDirectDrawSurface4 *pSurface2; // [sp+Ch] [bp-14h]@1 |
98 IDirectDrawSurface4 *pSurface1; // [sp+10h] [bp-10h]@1 | 98 IDirectDrawSurface4 *pSurface1; // [sp+10h] [bp-10h]@1 |
99 DWORD v4; // [sp+14h] [bp-Ch]@1 | 99 DWORD v4; // [sp+14h] [bp-Ch]@1 |
180 } | 180 } |
181 } | 181 } |
182 } | 182 } |
183 | 183 |
184 //----- (004A16A5) -------------------------------------------------------- | 184 //----- (004A16A5) -------------------------------------------------------- |
185 bool __cdecl AreRenderSurfacesOk() | 185 bool AreRenderSurfacesOk() |
186 { | 186 { |
187 char v0; // zf@4 | 187 char v0; // zf@4 |
188 bool result; // eax@8 | 188 bool result; // eax@8 |
189 | 189 |
190 if ( pVersion->pVersionInfo.dwPlatformId != VER_PLATFORM_WIN32_NT || pVersion->pVersionInfo.dwMajorVersion != 4 ) | 190 if ( pVersion->pVersionInfo.dwPlatformId != VER_PLATFORM_WIN32_NT || pVersion->pVersionInfo.dwMajorVersion != 4 ) |
8376 const char *v8; // [sp-4h] [bp-28h]@33 | 8376 const char *v8; // [sp-4h] [bp-28h]@33 |
8377 struct tagRECT Rect; // [sp+14h] [bp-10h]@15 | 8377 struct tagRECT Rect; // [sp+14h] [bp-10h]@15 |
8378 | 8378 |
8379 if ( !pRenderer->bWindowMode && (dword_6BE364_game_settings_1 & 2) ) | 8379 if ( !pRenderer->bWindowMode && (dword_6BE364_game_settings_1 & 2) ) |
8380 { | 8380 { |
8381 ModalWindow(pGlobalTXT_LocalizationStrings[62], 0);// "Might and Magic VII requires your desktop to be in 16bit (32k or 65k) Color mode in order to operate in a window." | 8381 ModalWindow(pGlobalTXT_LocalizationStrings[62], UIMSG_0);// "Might and Magic VII requires your desktop to be in 16bit (32k or 65k) Color mode in order to operate in a window." |
8382 return; | 8382 return; |
8383 } | 8383 } |
8384 if ( pRenderer->bWindowMode || !pRenderer->pRenderD3D || pRenderer->pRenderD3D->pAvailableDevices->bIsDeviceCompatible ) | 8384 if ( pRenderer->bWindowMode || !pRenderer->pRenderD3D || pRenderer->pRenderD3D->pAvailableDevices->bIsDeviceCompatible ) |
8385 { | 8385 { |
8386 if ( pEventTimer->bPaused ) | 8386 if ( pEventTimer->bPaused ) |
8819 assert(false); | 8819 assert(false); |
8820 break; | 8820 break; |
8821 } | 8821 } |
8822 } | 8822 } |
8823 //----- (0040DF3D) -------------------------------------------------------- | 8823 //----- (0040DF3D) -------------------------------------------------------- |
8824 void __cdecl CallRenderPresent() | 8824 void CallRenderPresent() |
8825 { | 8825 { |
8826 pRenderer->Present(); | 8826 pRenderer->Present(); |
8827 } | 8827 } |
8828 | |
8829 | |
8830 | |
8831 //----- (0044EC20) -------------------------------------------------------- | |
8832 /*bool RenderD3D::DoesRaiseExceptions() | |
8833 { | |
8834 return true; | |
8835 }*/ |