diff options
Diffstat (limited to 'src/doom/p_doors.c')
| -rw-r--r-- | src/doom/p_doors.c | 60 |
1 files changed, 30 insertions, 30 deletions
diff --git a/src/doom/p_doors.c b/src/doom/p_doors.c index 697065ff..cafab0f4 100644 --- a/src/doom/p_doors.c +++ b/src/doom/p_doors.c @@ -66,17 +66,17 @@ void T_VerticalDoor (vldoor_t* door) { switch(door->type) { - case blazeRaise: + case vld_blazeRaise: door->direction = -1; // time to go back down S_StartSound(&door->sector->soundorg, sfx_bdcls); break; - case normal: + case vld_normal: door->direction = -1; // time to go back down S_StartSound(&door->sector->soundorg, sfx_dorcls); break; - case close30ThenOpen: + case vld_close30ThenOpen: door->direction = 1; S_StartSound(&door->sector->soundorg, sfx_doropn); break; @@ -93,9 +93,9 @@ void T_VerticalDoor (vldoor_t* door) { switch(door->type) { - case raiseIn5Mins: + case vld_raiseIn5Mins: door->direction = 1; - door->type = normal; + door->type = vld_normal; S_StartSound(&door->sector->soundorg, sfx_doropn); break; @@ -115,20 +115,20 @@ void T_VerticalDoor (vldoor_t* door) { switch(door->type) { - case blazeRaise: - case blazeClose: + case vld_blazeRaise: + case vld_blazeClose: door->sector->specialdata = NULL; P_RemoveThinker (&door->thinker); // unlink and free S_StartSound(&door->sector->soundorg, sfx_bdcls); break; - case normal: - case close: + case vld_normal: + case vld_close: door->sector->specialdata = NULL; P_RemoveThinker (&door->thinker); // unlink and free break; - case close30ThenOpen: + case vld_close30ThenOpen: door->direction = 0; door->topcountdown = TICRATE*30; break; @@ -141,8 +141,8 @@ void T_VerticalDoor (vldoor_t* door) { switch(door->type) { - case blazeClose: - case close: // DO NOT GO BACK UP! + case vld_blazeClose: + case vld_close: // DO NOT GO BACK UP! break; default: @@ -164,15 +164,15 @@ void T_VerticalDoor (vldoor_t* door) { switch(door->type) { - case blazeRaise: - case normal: + case vld_blazeRaise: + case vld_normal: door->direction = 0; // wait at top door->topcountdown = door->topwait; break; - case close30ThenOpen: - case blazeOpen: - case open: + case vld_close30ThenOpen: + case vld_blazeOpen: + case vld_open: door->sector->specialdata = NULL; P_RemoveThinker (&door->thinker); // unlink and free break; @@ -281,7 +281,7 @@ EV_DoDoor switch(type) { - case blazeClose: + case vld_blazeClose: door->topheight = P_FindLowestCeilingSurrounding(sec); door->topheight -= 4*FRACUNIT; door->direction = -1; @@ -289,21 +289,21 @@ EV_DoDoor S_StartSound(&door->sector->soundorg, sfx_bdcls); break; - case close: + case vld_close: door->topheight = P_FindLowestCeilingSurrounding(sec); door->topheight -= 4*FRACUNIT; door->direction = -1; S_StartSound(&door->sector->soundorg, sfx_dorcls); break; - case close30ThenOpen: + case vld_close30ThenOpen: door->topheight = sec->ceilingheight; door->direction = -1; S_StartSound(&door->sector->soundorg, sfx_dorcls); break; - case blazeRaise: - case blazeOpen: + case vld_blazeRaise: + case vld_blazeOpen: door->direction = 1; door->topheight = P_FindLowestCeilingSurrounding(sec); door->topheight -= 4*FRACUNIT; @@ -312,8 +312,8 @@ EV_DoDoor S_StartSound(&door->sector->soundorg, sfx_bdopn); break; - case normal: - case open: + case vld_normal: + case vld_open: door->direction = 1; door->topheight = P_FindLowestCeilingSurrounding(sec); door->topheight -= 4*FRACUNIT; @@ -485,23 +485,23 @@ EV_VerticalDoor case 26: case 27: case 28: - door->type = normal; + door->type = vld_normal; break; case 31: case 32: case 33: case 34: - door->type = open; + door->type = vld_open; line->special = 0; break; case 117: // blazing door raise - door->type = blazeRaise; + door->type = vld_blazeRaise; door->speed = VDOORSPEED*4; break; case 118: // blazing door open - door->type = blazeOpen; + door->type = vld_blazeOpen; line->special = 0; door->speed = VDOORSPEED*4; break; @@ -530,7 +530,7 @@ void P_SpawnDoorCloseIn30 (sector_t* sec) door->thinker.function.acp1 = (actionf_p1)T_VerticalDoor; door->sector = sec; door->direction = 0; - door->type = normal; + door->type = vld_normal; door->speed = VDOORSPEED; door->topcountdown = 30 * TICRATE; } @@ -555,7 +555,7 @@ P_SpawnDoorRaiseIn5Mins door->thinker.function.acp1 = (actionf_p1)T_VerticalDoor; door->sector = sec; door->direction = 2; - door->type = raiseIn5Mins; + door->type = vld_raiseIn5Mins; door->speed = VDOORSPEED; door->topheight = P_FindLowestCeilingSurrounding(sec); door->topheight -= 4*FRACUNIT; |