OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge branch 'master' into scripting

Browse source 
Conflicts:
	src/p_interaction.cpp
	tools/lemon/lemon.c
This commit is contained in:
Christoph Oelckers 2015-04-30 16:13:32 +02:00
commit 1b29c3b6cf
9 changed files with 97 additions and 36 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/d_dehacked.cpp
View file

@ -1238,8 +1238,8 @@ static int PatchThing (int thingy)
else
info->renderflags &= ~RF_INVISIBLE;
}
DPrintf ("Bits: %d,%d (0x%08x,0x%08x)\n", info->flags, info->flags2,
info->flags, info->flags2);
DPrintf ("Bits: %d,%d (0x%08x,0x%08x)\n", info->flags.GetValue(), info->flags2.GetValue(),
info->flags.GetValue(), info->flags2.GetValue());
}
else if (stricmp (Line1, "ID #") == 0)
{