OrdinaryMagician/vkdoom_m
OrdinaryMagician/vkdoom_m
1
Fork 0
Code Activity

Merge commit 'fb9231a38d' into scripting

Browse source 
Conflicts:
	src/info.cpp
	src/thingdef/thingdef_expression.cpp
	wadsrc/static/actors/constants.txt

(Scripting branch update part 2)
This commit is contained in:
Christoph Oelckers 2015-04-28 09:57:01 +02:00
commit d6e3fc0567
76 changed files with 562 additions and 312 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/g_shared/a_artifacts.cpp
View file

@ -997,7 +997,8 @@ void APowerFlight::EndEffect ()
{
return;
}
if (!(Owner->player->cheats & CF_FLY))
if (!(Owner->flags7 & MF7_FLYCHEAT))
{
if (Owner->z != Owner->floorz)
{