OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'scripting'

Browse source 
Conflicts:
	src/actor.h
	src/g_doom/a_doomweaps.cpp
	src/g_hexen/a_blastradius.cpp
	src/p_enemy.cpp
	src/p_enemy.h
	src/thingdef/thingdef.h
	src/thingdef/thingdef_codeptr.cpp
	wadsrc/static/actors/constants.txt
This commit is contained in:
Randy Heit 2016-02-04 15:15:29 -06:00
commit b3b0886b64
230 changed files with 24061 additions and 8641 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/r_things.cpp
View file

@ -134,6 +134,7 @@ BYTE *OffscreenColorBuffer;
FCoverageBuffer *OffscreenCoverageBuffer;
//
// GAME FUNCTIONS
//
int MaxVisSprites;
@ -151,6 +152,7 @@ static int vsprcount;
static void R_ProjectWallSprite(AActor *thing, fixed_t fx, fixed_t fy, fixed_t fz, FTextureID picnum, fixed_t xscale, fixed_t yscale, INTBOOL flip);
void R_DeinitSprites()
{
// Free vissprites
@ -331,6 +333,11 @@ void R_DrawVisSprite (vissprite_t *vis)
fixed_t xiscale;
ESPSResult mode;
if (vis->xscale == 0 || vis->yscale == 0)
{ // scaled to 0; can't see
return;
}
dc_colormap = vis->Style.colormap;
mode = R_SetPatchStyle (vis->Style.RenderStyle, vis->Style.alpha, vis->Translation, vis->FillColor);