archivemirrors/re3
1
0
Fork 0
mirror of https://github.com/halpz/re3.git synced 2025-07-05 19:48:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into miami

Browse Source 
# Conflicts:
#	premake5.lua
#	src/core/ZoneCull.cpp
#	src/core/Zones.cpp
#	src/objects/CutsceneHead.cpp
#	src/render/Clouds.cpp
This commit is contained in:
Sergeanur
2020-05-13 00:19:21 +03:00
parent dc444b9ca0 c40fcdf39a
commit 33dfaf7da1
56 changed files with 1418 additions and 385 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/skel/win/win.cpp
View File

@ -100,10 +100,10 @@ IVideoWindow *pVW = nil;
IMediaSeeking *pMS = nil;
DWORD dwDXVersion;
DWORD _dwMemTotalPhys;
DWORD _dwMemAvailPhys;
DWORD _dwMemTotalVirtual;
DWORD _dwMemAvailVirtual;
SIZE_T _dwMemTotalPhys;
SIZE_T _dwMemAvailPhys;
SIZE_T _dwMemTotalVirtual;
SIZE_T _dwMemAvailVirtual;
DWORD _dwMemTotalVideo;
DWORD _dwMemAvailVideo;
DWORD _dwOperatingSystemVersion;
@ -687,10 +687,10 @@ psInitialise(void)
_GetVideoMemInfo(&_dwMemTotalVideo, &_dwMemAvailVideo);
#ifdef FIX_BUGS
debug("Physical memory size %u\n", _dwMemTotalPhys);
debug("Available physical memory %u\n", _dwMemAvailPhys);
debug("Video memory size %u\n", _dwMemTotalVideo);
debug("Available video memory %u\n", _dwMemAvailVideo);
debug("Physical memory size %lu\n", _dwMemTotalPhys);
debug("Available physical memory %lu\n", _dwMemAvailPhys);
debug("Video memory size %lu\n", _dwMemTotalVideo);
debug("Available video memory %lu\n", _dwMemAvailVideo);
#else
debug("Physical memory size %d\n", _dwMemTotalPhys);
debug("Available physical memory %d\n", _dwMemAvailPhys);

1
src/skel/win/win.h
View File

@ -22,7 +22,6 @@ enum eWinVersion
OS_WINXP,
};
extern DWORD _dwOperatingSystemVersion;
#ifdef __DINPUT_INCLUDED__
/* platform specfic global data */