zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2024-11-16 01:11:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix compilation with winlayer

Browse source 
There are still a bunch of warnings, but fixing warnings in deprecated code that only one guy uses anymore isn't an efficient use of time.

git-svn-id: https://svn.eduke32.com/eduke32@7387 1a8010ca-5511-0410-912e-c29ae57300e0
This commit is contained in:
terminx 2019-03-04 23:48:50 +00:00
parent ea66c0a682
commit b72dec2940
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/build/include/winlayer.h
View file

@ -4,6 +4,7 @@
#ifndef build_interface_layer_ #ifndef build_interface_layer_
#define build_interface_layer_ WIN #define build_interface_layer_ WIN
#include "compat.h"
#include "windows_inc.h" #include "windows_inc.h"
extern uint32_t maxrefreshfreq; extern uint32_t maxrefreshfreq;

8
source/build/src/winlayer.cpp
View file

@ -1035,7 +1035,7 @@ static BOOL InitDirectInput(void)
else if (result != DI_OK) initprintf(" Fetched controller capabilities with warning: %s\n",GetDInputError(result)); else if (result != DI_OK) initprintf(" Fetched controller capabilities with warning: %s\n",GetDInputError(result));
joystick.numAxes = (uint8_t)didc.dwAxes; joystick.numAxes = (uint8_t)didc.dwAxes;
joystick.numButtons = min(32,(uint8_t)didc.dwButtons); joystick.numButtons = min<uint8_t>(32,didc.dwButtons);
joystick.numHats = (uint8_t)didc.dwPOVs; joystick.numHats = (uint8_t)didc.dwPOVs;
initprintf("Controller has %d axes, %d buttons, and %d hat(s).\n",joystick.numAxes,joystick.numButtons,joystick.numHats); initprintf("Controller has %d axes, %d buttons, and %d hat(s).\n",joystick.numAxes,joystick.numButtons,joystick.numHats);
@ -2134,7 +2134,7 @@ int32_t videoSetGamma(void)
if (gamma != 1) val = pow(val, invgamma) / norm; if (gamma != 1) val = pow(val, invgamma) / norm;
val += bright * 128; val += bright * 128;
gammaTable.red[i] = gammaTable.green[i] = gammaTable.blue[i] = (WORD)max(0.f,(double)min(0xffff,val*256)); gammaTable.red[i] = gammaTable.green[i] = gammaTable.blue[i] = (uint16_t)max(0.f, min<float>(65535.f, val * 256.f));
} }
return setgammaramp(&gammaTable); return setgammaramp(&gammaTable);
@ -2218,7 +2218,7 @@ static BOOL InitDirectDraw(void)
} }
// get the pointer to DirectDrawEnumerate // get the pointer to DirectDrawEnumerate
aDirectDrawEnumerate = (HRESULT(WINAPI *)(LPDDENUMCALLBACK, LPVOID))GetProcAddress(hDDrawDLL, "DirectDrawEnumerateA"); aDirectDrawEnumerate = (decltype(aDirectDrawEnumerate))GetProcAddress(hDDrawDLL, "DirectDrawEnumerateA");
if (!aDirectDrawEnumerate) if (!aDirectDrawEnumerate)
{ {
ShowErrorBox("Error fetching DirectDrawEnumerate()"); ShowErrorBox("Error fetching DirectDrawEnumerate()");
@ -2231,7 +2231,7 @@ static BOOL InitDirectDraw(void)
aDirectDrawEnumerate(InitDirectDraw_enum, NULL); aDirectDrawEnumerate(InitDirectDraw_enum, NULL);
// get the pointer to DirectDrawCreate // get the pointer to DirectDrawCreate
aDirectDrawCreate = (HRESULT(WINAPI *)(GUID *, LPDIRECTDRAW *, IUnknown *))GetProcAddress(hDDrawDLL, "DirectDrawCreate"); aDirectDrawCreate = (decltype(aDirectDrawCreate))GetProcAddress(hDDrawDLL, "DirectDrawCreate");
if (!aDirectDrawCreate) if (!aDirectDrawCreate)
{ {
ShowErrorBox("Error fetching DirectDrawCreate()"); ShowErrorBox("Error fetching DirectDrawCreate()");