diff options
author | Simon Howard | 2014-09-13 05:15:05 -0400 |
---|---|---|
committer | Simon Howard | 2014-09-13 05:15:05 -0400 |
commit | f716939956e0da16d20b18ea63b5a49b4038da15 (patch) | |
tree | e0629bc70f6b822151a8267db49d6299d0c9c85d /src/heretic/p_spec.c | |
parent | cb72358ee930b29f4840b04bbb81f8d8444ce481 (diff) | |
download | chocolate-doom-f716939956e0da16d20b18ea63b5a49b4038da15.tar.gz chocolate-doom-f716939956e0da16d20b18ea63b5a49b4038da15.tar.bz2 chocolate-doom-f716939956e0da16d20b18ea63b5a49b4038da15.zip |
Add vld_ prefix for vldoor_e enum values.
It was pointed out to me recently that vldoor_e has enum values
named 'open' and 'close'. These can potentially conflict with POSIX
standard functions that have the same names, if the right header
files are included.
This doesn't currently cause any problems. However, to avoid any
possibility of a conflict occurring if a different compiler is used,
add a vld_ prefix to all the enum values, to namespace them.
Diffstat (limited to 'src/heretic/p_spec.c')
-rw-r--r-- | src/heretic/p_spec.c | 20 |
1 files changed, 10 insertions, 10 deletions
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 |