mirror of
https://git.rip/DMCA_FUCKER/re3.git
synced 2024-12-23 07:50:01 +00:00
Fix/change some Windows define
This commit is contained in:
parent
b5b64ca351
commit
199d57b16c
|
@ -365,7 +365,7 @@ bool CGame::Initialise(const char* datFile)
|
||||||
CStreaming::LoadInitialPeds();
|
CStreaming::LoadInitialPeds();
|
||||||
CStreaming::RequestBigBuildings(LEVEL_GENERIC);
|
CStreaming::RequestBigBuildings(LEVEL_GENERIC);
|
||||||
CStreaming::LoadAllRequestedModels(false);
|
CStreaming::LoadAllRequestedModels(false);
|
||||||
printf("Streaming uses %dK of its memory", CStreaming::ms_memoryUsed / 1024);
|
printf("Streaming uses %zuK of its memory", CStreaming::ms_memoryUsed / 1024); // original modifier was %d
|
||||||
LoadingScreen("Loading the Game", "Load animations", GetRandomSplashScreen());
|
LoadingScreen("Loading the Game", "Load animations", GetRandomSplashScreen());
|
||||||
CAnimManager::LoadAnimFiles();
|
CAnimManager::LoadAnimFiles();
|
||||||
CPed::Initialise();
|
CPed::Initialise();
|
||||||
|
|
|
@ -14,14 +14,10 @@ enum eWinVersion
|
||||||
|
|
||||||
#ifdef _WIN32
|
#ifdef _WIN32
|
||||||
|
|
||||||
// As long as WITHWINDOWS isn't defined / <Windows.h> isn't included, include <windef.h>, which is lighter.
|
// As long as WITHWINDOWS isn't defined / <Windows.h> isn't included, we only need type definitions so let's include <IntSafe.h>.
|
||||||
|
// NOTE: It's perfectly fine to include <Windows.h> here, but it can increase build size and time in *some* conditions, and maybe substantially in future if we'll use crossplatform.h more.
|
||||||
#ifndef _INC_WINDOWS
|
#ifndef _INC_WINDOWS
|
||||||
#ifdef _WIN64
|
#include <IntSafe.h>
|
||||||
#define _ARM64_
|
|
||||||
#else
|
|
||||||
#define _X86_
|
|
||||||
#endif
|
|
||||||
#include <windef.h>
|
|
||||||
#endif
|
#endif
|
||||||
#if defined RW_D3D9 || defined RWLIBS
|
#if defined RW_D3D9 || defined RWLIBS
|
||||||
#include "win.h"
|
#include "win.h"
|
||||||
|
|
|
@ -309,34 +309,6 @@ psNativeTextureSupport(void)
|
||||||
return RwD3D8DeviceSupportsDXTTexture();
|
return RwD3D8DeviceSupportsDXTTexture();
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
|
||||||
*****************************************************************************
|
|
||||||
*/
|
|
||||||
static BOOL
|
|
||||||
InitApplication(HANDLE instance)
|
|
||||||
{
|
|
||||||
/*
|
|
||||||
* Perform any necessary MS Windows application initialization. Basically,
|
|
||||||
* this means registering the window class for this application.
|
|
||||||
*/
|
|
||||||
|
|
||||||
WNDCLASS windowClass;
|
|
||||||
|
|
||||||
windowClass.style = CS_BYTEALIGNWINDOW;
|
|
||||||
windowClass.lpfnWndProc = (WNDPROC) MainWndProc;
|
|
||||||
windowClass.cbClsExtra = 0;
|
|
||||||
windowClass.cbWndExtra = 0;
|
|
||||||
windowClass.hInstance = (HINSTANCE)instance;
|
|
||||||
windowClass.hIcon = nil;
|
|
||||||
windowClass.hCursor = LoadCursor(nil, IDC_ARROW);
|
|
||||||
windowClass.hbrBackground = nil;
|
|
||||||
windowClass.lpszMenuName = NULL;
|
|
||||||
windowClass.lpszClassName = AppClassName;
|
|
||||||
|
|
||||||
return RegisterClass(&windowClass);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*****************************************************************************
|
*****************************************************************************
|
||||||
*/
|
*/
|
||||||
|
@ -1292,6 +1264,34 @@ MainWndProc(HWND window, UINT message, WPARAM wParam, LPARAM lParam)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
/*
|
||||||
|
*****************************************************************************
|
||||||
|
*/
|
||||||
|
static BOOL
|
||||||
|
InitApplication(HANDLE instance)
|
||||||
|
{
|
||||||
|
/*
|
||||||
|
* Perform any necessary MS Windows application initialization. Basically,
|
||||||
|
* this means registering the window class for this application.
|
||||||
|
*/
|
||||||
|
|
||||||
|
WNDCLASS windowClass;
|
||||||
|
|
||||||
|
windowClass.style = CS_BYTEALIGNWINDOW;
|
||||||
|
windowClass.lpfnWndProc = (WNDPROC)MainWndProc;
|
||||||
|
windowClass.cbClsExtra = 0;
|
||||||
|
windowClass.cbWndExtra = 0;
|
||||||
|
windowClass.hInstance = (HINSTANCE)instance;
|
||||||
|
windowClass.hIcon = nil;
|
||||||
|
windowClass.hCursor = LoadCursor(nil, IDC_ARROW);
|
||||||
|
windowClass.hbrBackground = nil;
|
||||||
|
windowClass.lpszMenuName = NULL;
|
||||||
|
windowClass.lpszClassName = AppClassName;
|
||||||
|
|
||||||
|
return RegisterClass(&windowClass);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
*****************************************************************************
|
*****************************************************************************
|
||||||
*/
|
*/
|
||||||
|
|
|
@ -68,9 +68,6 @@ extern "C"
|
||||||
{
|
{
|
||||||
#endif /* __cplusplus */
|
#endif /* __cplusplus */
|
||||||
|
|
||||||
extern LRESULT CALLBACK
|
|
||||||
MainWndProc(HWND window, UINT message, WPARAM wParam, LPARAM lParam);
|
|
||||||
|
|
||||||
#ifdef __DINPUT_INCLUDED__
|
#ifdef __DINPUT_INCLUDED__
|
||||||
HRESULT _InputInitialise();
|
HRESULT _InputInitialise();
|
||||||
HRESULT CapturePad(RwInt32 padID);
|
HRESULT CapturePad(RwInt32 padID);
|
||||||
|
|
Loading…
Reference in a new issue