zdoom
/
qzdoom
mirror of https://github.com/ZDoom/qzdoom.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge https://github.com/coelckers/gzdoom

This commit is contained in:
Rachael Alexanderson 2017-01-30 17:16:01 -05:00
parent eadeccd709 0e5aee48aa
commit e715e53c1d
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/gl/data/gl_data.cpp
View File

@ -413,7 +413,7 @@ void InitGLRMapinfoData()
if (opt != NULL) if (opt != NULL)
{ {
gl_SetFogParams(opt->fogdensity, level.info->outsidefog, opt->outsidefogdensity, opt->skyfog); gl_SetFogParams(clamp(opt->fogdensity, 0, 255), level.info->outsidefog, clamp(opt->outsidefogdensity, 0, 255), opt->skyfog);
glset.map_lightmode = opt->lightmode; glset.map_lightmode = opt->lightmode;
glset.map_lightadditivesurfaces = opt->lightadditivesurfaces; glset.map_lightadditivesurfaces = opt->lightadditivesurfaces;
glset.map_attenuate = opt->attenuate; glset.map_attenuate = opt->attenuate;

3
src/gl/scene/gl_sprite.cpp
View File

@ -737,7 +737,8 @@ void GLSprite::Process(AActor* thing, sector_t * sector, int thruportal)
int clipres = GLRenderer->mClipPortal->ClipPoint(thingpos); int clipres = GLRenderer->mClipPortal->ClipPoint(thingpos);
if (clipres == GLPortal::PClip_InFront) return; if (clipres == GLPortal::PClip_InFront) return;
} }
Angles = thing->InterpolatedAngles(r_TicFracF); // disabled because almost none of the actual game code is even remotely prepared for this. Sorry for the few cases where it may be desired, but the overall effect is too bad.
Angles = thing->Angles;// InterpolatedAngles(r_TicFracF);
player_t *player = &players[consoleplayer]; player_t *player = &players[consoleplayer];
FloatRect r; FloatRect r;

8
src/p_setup.cpp
View File

@ -2093,9 +2093,7 @@ void P_LoadLineDefs (MapData * map)
maplinedef_t *mld; maplinedef_t *mld;
int numlines = lumplen / sizeof(maplinedef_t); int numlines = lumplen / sizeof(maplinedef_t);
level.lines.Alloc(numlines);
linemap.Resize(numlines); linemap.Resize(numlines);
memset (&level.lines[0], 0, numlines*sizeof(line_t));
mldf = new char[lumplen]; mldf = new char[lumplen];
map->Read(ML_LINEDEFS, mldf); map->Read(ML_LINEDEFS, mldf);
@ -2140,6 +2138,8 @@ void P_LoadLineDefs (MapData * map)
i++; i++;
} }
} }
level.lines.Alloc(numlines);
memset(&level.lines[0], 0, numlines * sizeof(line_t));
P_AllocateSideDefs (map, sidecount); P_AllocateSideDefs (map, sidecount);
@ -2192,9 +2192,7 @@ void P_LoadLineDefs2 (MapData * map)
maplinedef2_t *mld; maplinedef2_t *mld;
int numlines = lumplen / sizeof(maplinedef2_t); int numlines = lumplen / sizeof(maplinedef2_t);
level.lines.Alloc(numlines);
linemap.Resize(numlines); linemap.Resize(numlines);
memset (&level.lines[0], 0, numlines*sizeof(line_t));
mldf = new char[lumplen]; mldf = new char[lumplen];
map->Read(ML_LINEDEFS, mldf); map->Read(ML_LINEDEFS, mldf);
@ -2233,6 +2231,8 @@ void P_LoadLineDefs2 (MapData * map)
{ {
ForceNodeBuild = true; ForceNodeBuild = true;
} }
level.lines.Alloc(numlines);
memset(&level.lines[0], 0, numlines * sizeof(line_t));
P_AllocateSideDefs (map, sidecount); P_AllocateSideDefs (map, sidecount);