OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into scripting

Browse source 
Conflicts:
	src/d_player.h
	src/g_doom/a_archvile.cpp
	src/thingdef/thingdef.h
	src/thingdef/thingdef_properties.cpp
This commit is contained in:
Christoph Oelckers 2013-08-09 13:03:28 +02:00
commit bba092cc0b
44 changed files with 821 additions and 356 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/decallib.cpp
View file

@ -452,7 +452,7 @@ void FDecalLib::ParseDecal (FScanner &sc)
decalNum = GetDecalID (sc);
sc.MustGetStringName ("{");
memset (&newdecal, 0, sizeof(newdecal));
memset ((void *)&newdecal, 0, sizeof(newdecal));
newdecal.PicNum.SetInvalid();
newdecal.ScaleX = newdecal.ScaleY = FRACUNIT;
newdecal.RenderFlags = RF_WALLSPRITE;