OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

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

Browse source 
Conflicts:
	src/p_3dfloors.cpp
This commit is contained in:
Christoph Oelckers 2015-04-25 19:45:27 +02:00
commit ab1d90038c
55 changed files with 967 additions and 557 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/p_3dfloors.cpp
View file

@ -850,7 +850,7 @@ void P_Spawn3DFloors (void)
{
if (line->args[1]&8)
{
line->id = line->args[4];
tagManager.AddLineID(i, line->args[4]);
}
else
{