zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 23:01:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

- fixed: Heretic's 666 lower floor must be of type LowerToHighest unlike Doom which is LowerToLowest.

Browse source 
SVN r2342 (trunk)
This commit is contained in:
Christoph Oelckers 2010-05-28 21:29:28 +00:00
parent 6c4d070095
commit 862d6551bc
4 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/g_level.h
View file

@ -129,6 +129,7 @@ enum ELevelFlags
LEVEL_SPECLOWERFLOOR = 0x00000100, LEVEL_SPECLOWERFLOOR = 0x00000100,
LEVEL_SPECOPENDOOR = 0x00000200, LEVEL_SPECOPENDOOR = 0x00000200,
LEVEL_SPECLOWERFLOORTOHIGHEST= 0x00000300,
LEVEL_SPECACTIONSMASK = 0x00000300, LEVEL_SPECACTIONSMASK = 0x00000300,
LEVEL_MONSTERSTELEFRAG = 0x00000400, LEVEL_MONSTERSTELEFRAG = 0x00000400,

1
src/g_mapinfo.cpp
View file

@ -1324,6 +1324,7 @@ MapFlagHandlers[] =
{ "specialaction_exitlevel", MITYPE_SCFLAGS, 0, ~LEVEL_SPECACTIONSMASK }, { "specialaction_exitlevel", MITYPE_SCFLAGS, 0, ~LEVEL_SPECACTIONSMASK },
{ "specialaction_opendoor", MITYPE_SCFLAGS, LEVEL_SPECOPENDOOR, ~LEVEL_SPECACTIONSMASK }, { "specialaction_opendoor", MITYPE_SCFLAGS, LEVEL_SPECOPENDOOR, ~LEVEL_SPECACTIONSMASK },
{ "specialaction_lowerfloor", MITYPE_SCFLAGS, LEVEL_SPECLOWERFLOOR, ~LEVEL_SPECACTIONSMASK }, { "specialaction_lowerfloor", MITYPE_SCFLAGS, LEVEL_SPECLOWERFLOOR, ~LEVEL_SPECACTIONSMASK },
{ "specialaction_lowerfloortohighest",MITYPE_SCFLAGS,LEVEL_SPECLOWERFLOORTOHIGHEST, ~LEVEL_SPECACTIONSMASK },
{ "specialaction_killmonsters", MITYPE_SETFLAG, LEVEL_SPECKILLMONSTERS, 0 }, { "specialaction_killmonsters", MITYPE_SETFLAG, LEVEL_SPECKILLMONSTERS, 0 },
{ "lightning", MITYPE_SETFLAG, LEVEL_STARTLIGHTNING, 0 }, { "lightning", MITYPE_SETFLAG, LEVEL_STARTLIGHTNING, 0 },
{ "smoothlighting", MITYPE_SETFLAG2, LEVEL2_SMOOTHLIGHTING, 0 }, { "smoothlighting", MITYPE_SETFLAG2, LEVEL2_SMOOTHLIGHTING, 0 },

4
src/p_enemy.cpp
View file

@ -3160,6 +3160,10 @@ DEFINE_ACTION_FUNCTION(AActor, A_BossDeath)
EV_DoFloor (DFloor::floorLowerToLowest, NULL, 666, FRACUNIT, 0, 0, 0, false); EV_DoFloor (DFloor::floorLowerToLowest, NULL, 666, FRACUNIT, 0, 0, 0, false);
return; return;
case LEVEL_SPECLOWERFLOORTOHIGHEST:
EV_DoFloor (DFloor::floorLowerToHighest, NULL, 666, FRACUNIT, 0, 0, 0, false);
return;
case LEVEL_SPECOPENDOOR: case LEVEL_SPECOPENDOOR:
EV_DoDoor (DDoor::doorOpen, NULL, NULL, 666, 8*FRACUNIT, 0, 0, 0); EV_DoDoor (DDoor::doorOpen, NULL, NULL, 666, 8*FRACUNIT, 0, 0, 0);
return; return;

10
wadsrc/static/mapinfo/heretic.txt
View file

@ -193,7 +193,7 @@ map E1M8 lookup "HHUSTR_E1M8"
cluster = 1 cluster = 1
nointermission nointermission
ironlichspecial ironlichspecial
specialaction_lowerfloor specialaction_lowerfloortohighest
music = "MUS_E1M8" music = "MUS_E1M8"
} }
@ -279,7 +279,7 @@ map E2M8 lookup "HHUSTR_E2M8"
cluster = 2 cluster = 2
nointermission nointermission
minotaurspecial minotaurspecial
specialaction_lowerfloor specialaction_lowerfloortohighest
specialaction_killmonsters specialaction_killmonsters
music = "MUS_E2M8" music = "MUS_E2M8"
} }
@ -366,7 +366,7 @@ map E3M8 lookup "HHUSTR_E3M8"
cluster = 3 cluster = 3
nointermission nointermission
dsparilspecial dsparilspecial
specialaction_lowerfloor specialaction_lowerfloortohighest
specialaction_killmonsters specialaction_killmonsters
music = "MUS_E1M9" music = "MUS_E1M9"
} }
@ -453,7 +453,7 @@ map E4M8 lookup "HHUSTR_E4M8"
cluster = 4 cluster = 4
nointermission nointermission
ironlichspecial ironlichspecial
specialaction_lowerfloor specialaction_lowerfloortohighest
specialaction_killmonsters specialaction_killmonsters
music = "MUS_E1M8" music = "MUS_E1M8"
} }
@ -541,7 +541,7 @@ map E5M8 lookup "HHUSTR_E5M8"
nointermission nointermission
minotaurspecial minotaurspecial
specialaction_killmonsters specialaction_killmonsters
specialaction_lowerfloor specialaction_lowerfloortohighest
music = "MUS_E2M8" music = "MUS_E2M8"
} }