OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' of https://github.com/rheit/zdoom

Browse source 
# Conflicts:
#	src/CMakeLists.txt
#	src/p_setup.cpp
#	src/r_defs.h
#	src/version.h

This only updates to a compileable state. The new portals are not yet functional in the hardware renderer because they require some refactoring in the data management first.
This commit is contained in:
Christoph Oelckers 2016-02-05 12:31:41 +01:00
commit dda73b531c
260 changed files with 25391 additions and 8986 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/gl/data/gl_data.cpp
View file

@ -146,7 +146,7 @@ void AdjustSpriteOffsets()
// Normally this would be better placed in p_lnspec.cpp.
// But I have accidentally overwritten that file several times
// so I'd rather place it here.
static int LS_Sector_SetPlaneReflection (line_t *ln, AActor *it, bool backSide,
int LS_Sector_SetPlaneReflection (line_t *ln, AActor *it, bool backSide,
int arg0, int arg1, int arg2, int arg3, int arg4)
{
// Sector_SetPlaneReflection (tag, floor, ceiling)
@ -163,7 +163,7 @@ static int LS_Sector_SetPlaneReflection (line_t *ln, AActor *it, bool backSide,
return true;
}
static int LS_SetGlobalFogParameter (line_t *ln, AActor *it, bool backSide,
int LS_SetGlobalFogParameter (line_t *ln, AActor *it, bool backSide,
int arg0, int arg1, int arg2, int arg3, int arg4)
{
// SetGlobalFogParameter (type, value)
@ -484,8 +484,6 @@ void gl_RecalcVertexHeights(vertex_t * v)
void gl_InitData()
{
LineSpecials[157] = LS_SetGlobalFogParameter;
LineSpecials[159] = LS_Sector_SetPlaneReflection;
AdjustSpriteOffsets();
}