OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge remote-tracking branch 'remotes/zdoom/master'

Browse source 
# Conflicts:
#	src/win32/i_system.cpp
#	tools/re2c/re2c.vcproj
This commit is contained in:
Christoph Oelckers 2016-02-08 21:47:19 +01:00
commit 0678a469de
244 changed files with 26106 additions and 17385 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/win32/i_system.cpp
View file

@ -1424,8 +1424,8 @@ static HCURSOR CreateBitmapCursor(int xhot, int yhot, HBITMAP and_mask, HBITMAP
ICONINFO iconinfo =
{
FALSE, // fIcon
xhot, // xHotspot
yhot, // yHotspot
(DWORD)xhot, // xHotspot
(DWORD)yhot, // yHotspot
and_mask, // hbmMask
color_mask // hbmColor
};