summaryrefslogtreecommitdiff
path: root/src/heretic
diff options
context:
space:
mode:
Diffstat (limited to 'src/heretic')
-rw-r--r--src/heretic/p_doors.c38
-rw-r--r--src/heretic/p_spec.c20
-rw-r--r--src/heretic/p_spec.h10
-rw-r--r--src/heretic/p_switch.c12
4 files changed, 40 insertions, 40 deletions
diff --git a/src/heretic/p_doors.c b/src/heretic/p_doors.c
index 9e244912..fcae83a1 100644
--- a/src/heretic/p_doors.c
+++ b/src/heretic/p_doors.c
@@ -45,11 +45,11 @@ void T_VerticalDoor(vldoor_t * door)
if (!--door->topcountdown)
switch (door->type)
{
- case normal:
+ case vld_normal:
door->direction = -1; // time to go back down
S_StartSound(&door->sector->soundorg, sfx_doropn);
break;
- case close30ThenOpen:
+ case vld_close30ThenOpen:
door->direction = 1;
S_StartSound(&door->sector->soundorg, sfx_doropn);
break;
@@ -62,9 +62,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;
default:
@@ -80,13 +80,13 @@ void T_VerticalDoor(vldoor_t * door)
{
switch (door->type)
{
- case normal:
- case close:
+ case vld_normal:
+ case vld_close:
door->sector->specialdata = NULL;
P_RemoveThinker(&door->thinker); // unlink and free
S_StartSound(&door->sector->soundorg, sfx_dorcls);
break;
- case close30ThenOpen:
+ case vld_close30ThenOpen:
door->direction = 0;
door->topcountdown = 35 * 30;
break;
@@ -98,7 +98,7 @@ void T_VerticalDoor(vldoor_t * door)
{
switch (door->type)
{
- case close: // DON'T GO BACK UP!
+ case vld_close: // DON'T GO BACK UP!
break;
default:
door->direction = 1;
@@ -114,12 +114,12 @@ void T_VerticalDoor(vldoor_t * door)
{
switch (door->type)
{
- case normal:
+ case vld_normal:
door->direction = 0; // wait at top
door->topcountdown = door->topwait;
break;
- case close30ThenOpen:
- case open:
+ case vld_close30ThenOpen:
+ case vld_open:
door->sector->specialdata = NULL;
P_RemoveThinker(&door->thinker); // unlink and free
S_StopSound(&door->sector->soundorg);
@@ -165,19 +165,19 @@ int EV_DoDoor(line_t * line, vldoor_e type, fixed_t speed)
door->sector = sec;
switch (type)
{
- case close:
+ case vld_close:
door->topheight = P_FindLowestCeilingSurrounding(sec);
door->topheight -= 4 * FRACUNIT;
door->direction = -1;
S_StartSound(&door->sector->soundorg, sfx_doropn);
break;
- case close30ThenOpen:
+ case vld_close30ThenOpen:
door->topheight = sec->ceilingheight;
door->direction = -1;
S_StartSound(&door->sector->soundorg, sfx_doropn);
break;
- case normal:
- case open:
+ case vld_normal:
+ case vld_open:
door->direction = 1;
door->topheight = P_FindLowestCeilingSurrounding(sec);
door->topheight -= 4 * FRACUNIT;
@@ -313,13 +313,13 @@ void EV_VerticalDoor(line_t * line, mobj_t * thing)
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;
}
@@ -349,7 +349,7 @@ void P_SpawnDoorCloseIn30(sector_t * sec)
door->thinker.function = T_VerticalDoor;
door->sector = sec;
door->direction = 0;
- door->type = normal;
+ door->type = vld_normal;
door->speed = VDOORSPEED;
door->topcountdown = 30 * 35;
}
@@ -370,7 +370,7 @@ void P_SpawnDoorRaiseIn5Mins(sector_t * sec, int secnum)
door->thinker.function = 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;
diff --git a/src/heretic/p_spec.c b/src/heretic/p_spec.c
index 4419da2c..4c7db554 100644
--- a/src/heretic/p_spec.c
+++ b/src/heretic/p_spec.c
@@ -571,15 +571,15 @@ void P_CrossSpecialLine(int linenum, int side, mobj_t * thing)
// TRIGGERS
//====================================================
case 2: // Open Door
- EV_DoDoor(line, open, VDOORSPEED);
+ EV_DoDoor(line, vld_open, VDOORSPEED);
line->special = 0;
break;
case 3: // Close Door
- EV_DoDoor(line, close, VDOORSPEED);
+ EV_DoDoor(line, vld_close, VDOORSPEED);
line->special = 0;
break;
case 4: // Raise Door
- EV_DoDoor(line, normal, VDOORSPEED);
+ EV_DoDoor(line, vld_normal, VDOORSPEED);
line->special = 0;
break;
case 5: // Raise Floor
@@ -611,7 +611,7 @@ void P_CrossSpecialLine(int linenum, int side, mobj_t * thing)
line->special = 0;
break;
case 16: // Close Door 30
- EV_DoDoor(line, close30ThenOpen, VDOORSPEED);
+ EV_DoDoor(line, vld_close30ThenOpen, VDOORSPEED);
line->special = 0;
break;
case 17: // Start Light Strobing
@@ -715,10 +715,10 @@ void P_CrossSpecialLine(int linenum, int side, mobj_t * thing)
EV_CeilingCrushStop(line);
break;
case 75: // Close Door
- EV_DoDoor(line, close, VDOORSPEED);
+ EV_DoDoor(line, vld_close, VDOORSPEED);
break;
case 76: // Close Door 30
- EV_DoDoor(line, close30ThenOpen, VDOORSPEED);
+ EV_DoDoor(line, vld_close30ThenOpen, VDOORSPEED);
break;
case 77: // Fast Ceiling Crush & Raise
EV_DoCeiling(line, fastCrushAndRaise);
@@ -742,7 +742,7 @@ void P_CrossSpecialLine(int linenum, int side, mobj_t * thing)
EV_DoFloor(line, lowerAndChange);
break;
case 86: // Open Door
- EV_DoDoor(line, open, VDOORSPEED);
+ EV_DoDoor(line, vld_open, VDOORSPEED);
break;
case 87: // Perpetual Platform Raise
EV_DoPlat(line, perpetualRaise, 0);
@@ -754,10 +754,10 @@ void P_CrossSpecialLine(int linenum, int side, mobj_t * thing)
EV_StopPlat(line);
break;
case 90: // Raise Door
- EV_DoDoor(line, normal, VDOORSPEED);
+ EV_DoDoor(line, vld_normal, VDOORSPEED);
break;
case 100: // Retrigger_Raise_Door_Turbo
- EV_DoDoor(line, normal, VDOORSPEED * 3);
+ EV_DoDoor(line, vld_normal, VDOORSPEED * 3);
break;
case 91: // Raise Floor
EV_DoFloor(line, raiseFloor);
@@ -815,7 +815,7 @@ void P_ShootSpecialLine(mobj_t * thing, line_t * line)
P_ChangeSwitchTexture(line, 0);
break;
case 46: // Impact_OpenDoor
- EV_DoDoor(line, open, VDOORSPEED);
+ EV_DoDoor(line, vld_open, VDOORSPEED);
P_ChangeSwitchTexture(line, 1);
break;
case 47: // Impact_RaiseFloorNear&Change
diff --git a/src/heretic/p_spec.h b/src/heretic/p_spec.h
index 2de14b18..b26244af 100644
--- a/src/heretic/p_spec.h
+++ b/src/heretic/p_spec.h
@@ -253,11 +253,11 @@ void P_ActivateInStasis(int tag);
*/
typedef enum
{
- normal,
- close30ThenOpen,
- close,
- open,
- raiseIn5Mins
+ vld_normal,
+ vld_close30ThenOpen,
+ vld_close,
+ vld_open,
+ vld_raiseIn5Mins
} vldoor_e;
typedef struct
diff --git a/src/heretic/p_switch.c b/src/heretic/p_switch.c
index e89b5fec..96d14074 100644
--- a/src/heretic/p_switch.c
+++ b/src/heretic/p_switch.c
@@ -302,7 +302,7 @@ boolean P_UseSpecialLine(mobj_t * thing, line_t * line)
P_ChangeSwitchTexture(line, 0);
break;
case 29: // Raise Door
- if (EV_DoDoor(line, normal, VDOORSPEED))
+ if (EV_DoDoor(line, vld_normal, VDOORSPEED))
P_ChangeSwitchTexture(line, 0);
break;
case 41: // Lower Ceiling to Floor
@@ -318,7 +318,7 @@ boolean P_UseSpecialLine(mobj_t * thing, line_t * line)
P_ChangeSwitchTexture(line, 0);
break;
case 50: // Close Door
- if (EV_DoDoor(line, close, VDOORSPEED))
+ if (EV_DoDoor(line, vld_close, VDOORSPEED))
P_ChangeSwitchTexture(line, 0);
break;
case 51: // Secret EXIT
@@ -338,14 +338,14 @@ boolean P_UseSpecialLine(mobj_t * thing, line_t * line)
P_ChangeSwitchTexture(line, 0);
break;
case 103: // Open Door
- if (EV_DoDoor(line, open, VDOORSPEED))
+ if (EV_DoDoor(line, vld_open, VDOORSPEED))
P_ChangeSwitchTexture(line, 0);
break;
//===============================================
// BUTTONS
//===============================================
case 42: // Close Door
- if (EV_DoDoor(line, close, VDOORSPEED))
+ if (EV_DoDoor(line, vld_close, VDOORSPEED))
P_ChangeSwitchTexture(line, 1);
break;
case 43: // Lower Ceiling to Floor
@@ -361,7 +361,7 @@ boolean P_UseSpecialLine(mobj_t * thing, line_t * line)
P_ChangeSwitchTexture(line, 1);
break;
case 61: // Open Door
- if (EV_DoDoor(line, open, VDOORSPEED))
+ if (EV_DoDoor(line, vld_open, VDOORSPEED))
P_ChangeSwitchTexture(line, 1);
break;
case 62: // PlatDownWaitUpStay
@@ -369,7 +369,7 @@ boolean P_UseSpecialLine(mobj_t * thing, line_t * line)
P_ChangeSwitchTexture(line, 1);
break;
case 63: // Raise Door
- if (EV_DoDoor(line, normal, VDOORSPEED))
+ if (EV_DoDoor(line, vld_normal, VDOORSPEED))
P_ChangeSwitchTexture(line, 1);
break;
case 64: // Raise Floor to ceiling
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-27 06:38:17 +0000