OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'make-qzdoom-gzdoom-again' of https://github.com/raa-eruanna/qzdoom into 3.0_work

Browse source 
# Conflicts:
#	src/win32/win32gliface.h
#	src/win32/win32iface.h

This compiles but no guarantees otherwise.
This commit is contained in:
Christoph Oelckers 2017-03-09 19:09:13 +01:00
commit cc1241a4b8
231 changed files with 52588 additions and 18674 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/win32/fb_ddraw.cpp
View file

@ -32,7 +32,6 @@
**
*/
// HEADER FILES ------------------------------------------------------------
#define DIRECTDRAW_VERSION 0x0300
@ -121,7 +120,7 @@ cycle_t BlitCycles;
// CODE --------------------------------------------------------------------
DDrawFB::DDrawFB (int width, int height, bool fullscreen)
: BaseWinFB (width, height)
: BaseWinFB (width, height, false)
{
int i;