diff options
Diffstat (limited to 'src/doom')
-rw-r--r-- | src/doom/p_doors.c | 60 | ||||
-rw-r--r-- | src/doom/p_enemy.c | 4 | ||||
-rw-r--r-- | src/doom/p_spec.c | 30 | ||||
-rw-r--r-- | src/doom/p_spec.h | 16 | ||||
-rw-r--r-- | src/doom/p_switch.c | 28 |
5 files changed, 69 insertions, 69 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; diff --git a/src/doom/p_enemy.c b/src/doom/p_enemy.c index a7df6a01..f2b44d13 100644 --- a/src/doom/p_enemy.c +++ b/src/doom/p_enemy.c @@ -574,7 +574,7 @@ void A_KeenDie (mobj_t* mo) } junk.tag = 666; - EV_DoDoor(&junk,open); + EV_DoDoor(&junk, vld_open); } @@ -1737,7 +1737,7 @@ void A_BossDeath (mobj_t* mo) { case 6: junk.tag = 666; - EV_DoDoor (&junk, blazeOpen); + EV_DoDoor (&junk, vld_blazeOpen); return; break; diff --git a/src/doom/p_spec.c b/src/doom/p_spec.c index 2e22ad03..17446b5d 100644 --- a/src/doom/p_spec.c +++ b/src/doom/p_spec.c @@ -552,19 +552,19 @@ P_CrossSpecialLine // All from here to RETRIGGERS. case 2: // Open Door - EV_DoDoor(line,open); + EV_DoDoor(line,vld_open); line->special = 0; break; case 3: // Close Door - EV_DoDoor(line,close); + EV_DoDoor(line,vld_close); line->special = 0; break; case 4: // Raise Door - EV_DoDoor(line,normal); + EV_DoDoor(line,vld_normal); line->special = 0; break; @@ -606,7 +606,7 @@ P_CrossSpecialLine case 16: // Close Door 30 - EV_DoDoor(line,close30ThenOpen); + EV_DoDoor(line,vld_close30ThenOpen); line->special = 0; break; @@ -733,13 +733,13 @@ P_CrossSpecialLine case 108: // Blazing Door Raise (faster than TURBO!) - EV_DoDoor (line,blazeRaise); + EV_DoDoor (line,vld_blazeRaise); line->special = 0; break; case 109: // Blazing Door Open (faster than TURBO!) - EV_DoDoor (line,blazeOpen); + EV_DoDoor (line,vld_blazeOpen); line->special = 0; break; @@ -751,7 +751,7 @@ P_CrossSpecialLine case 110: // Blazing Door Close (faster than TURBO!) - EV_DoDoor (line,blazeClose); + EV_DoDoor (line,vld_blazeClose); line->special = 0; break; @@ -811,12 +811,12 @@ P_CrossSpecialLine case 75: // Close Door - EV_DoDoor(line,close); + EV_DoDoor(line,vld_close); break; case 76: // Close Door 30 - EV_DoDoor(line,close30ThenOpen); + EV_DoDoor(line,vld_close30ThenOpen); break; case 77: @@ -856,7 +856,7 @@ P_CrossSpecialLine case 86: // Open Door - EV_DoDoor(line,open); + EV_DoDoor(line,vld_open); break; case 87: @@ -876,7 +876,7 @@ P_CrossSpecialLine case 90: // Raise Door - EV_DoDoor(line,normal); + EV_DoDoor(line,vld_normal); break; case 91: @@ -923,17 +923,17 @@ P_CrossSpecialLine case 105: // Blazing Door Raise (faster than TURBO!) - EV_DoDoor (line,blazeRaise); + EV_DoDoor (line,vld_blazeRaise); break; case 106: // Blazing Door Open (faster than TURBO!) - EV_DoDoor (line,blazeOpen); + EV_DoDoor (line,vld_blazeOpen); break; case 107: // Blazing Door Close (faster than TURBO!) - EV_DoDoor (line,blazeClose); + EV_DoDoor (line,vld_blazeClose); break; case 120: @@ -997,7 +997,7 @@ P_ShootSpecialLine case 46: // OPEN DOOR - EV_DoDoor(line,open); + EV_DoDoor(line,vld_open); P_ChangeSwitchTexture(line,1); break; diff --git a/src/doom/p_spec.h b/src/doom/p_spec.h index 04ab98e9..a1343bfa 100644 --- a/src/doom/p_spec.h +++ b/src/doom/p_spec.h @@ -324,14 +324,14 @@ void P_ActivateInStasis(int tag); // typedef enum { - normal, - close30ThenOpen, - close, - open, - raiseIn5Mins, - blazeRaise, - blazeOpen, - blazeClose + vld_normal, + vld_close30ThenOpen, + vld_close, + vld_open, + vld_raiseIn5Mins, + vld_blazeRaise, + vld_blazeOpen, + vld_blazeClose } vldoor_e; diff --git a/src/doom/p_switch.c b/src/doom/p_switch.c index 46c08d58..ed4feeca 100644 --- a/src/doom/p_switch.c +++ b/src/doom/p_switch.c @@ -394,7 +394,7 @@ P_UseSpecialLine case 29: // Raise Door - if (EV_DoDoor(line,normal)) + if (EV_DoDoor(line,vld_normal)) P_ChangeSwitchTexture(line,0); break; @@ -418,7 +418,7 @@ P_UseSpecialLine case 50: // Close Door - if (EV_DoDoor(line,close)) + if (EV_DoDoor(line,vld_close)) P_ChangeSwitchTexture(line,0); break; @@ -448,25 +448,25 @@ P_UseSpecialLine case 103: // Open Door - if (EV_DoDoor(line,open)) + if (EV_DoDoor(line,vld_open)) P_ChangeSwitchTexture(line,0); break; case 111: // Blazing Door Raise (faster than TURBO!) - if (EV_DoDoor (line,blazeRaise)) + if (EV_DoDoor (line,vld_blazeRaise)) P_ChangeSwitchTexture(line,0); break; case 112: // Blazing Door Open (faster than TURBO!) - if (EV_DoDoor (line,blazeOpen)) + if (EV_DoDoor (line,vld_blazeOpen)) P_ChangeSwitchTexture(line,0); break; case 113: // Blazing Door Close (faster than TURBO!) - if (EV_DoDoor (line,blazeClose)) + if (EV_DoDoor (line,vld_blazeClose)) P_ChangeSwitchTexture(line,0); break; @@ -494,7 +494,7 @@ P_UseSpecialLine // BlzOpenDoor RED case 137: // BlzOpenDoor YELLOW - if (EV_DoLockedDoor (line,blazeOpen,thing)) + if (EV_DoLockedDoor (line,vld_blazeOpen,thing)) P_ChangeSwitchTexture(line,0); break; @@ -507,7 +507,7 @@ P_UseSpecialLine // BUTTONS case 42: // Close Door - if (EV_DoDoor(line,close)) + if (EV_DoDoor(line,vld_close)) P_ChangeSwitchTexture(line,1); break; @@ -531,7 +531,7 @@ P_UseSpecialLine case 61: // Open Door - if (EV_DoDoor(line,open)) + if (EV_DoDoor(line,vld_open)) P_ChangeSwitchTexture(line,1); break; @@ -543,7 +543,7 @@ P_UseSpecialLine case 63: // Raise Door - if (EV_DoDoor(line,normal)) + if (EV_DoDoor(line,vld_normal)) P_ChangeSwitchTexture(line,1); break; @@ -591,19 +591,19 @@ P_UseSpecialLine case 114: // Blazing Door Raise (faster than TURBO!) - if (EV_DoDoor (line,blazeRaise)) + if (EV_DoDoor (line,vld_blazeRaise)) P_ChangeSwitchTexture(line,1); break; case 115: // Blazing Door Open (faster than TURBO!) - if (EV_DoDoor (line,blazeOpen)) + if (EV_DoDoor (line,vld_blazeOpen)) P_ChangeSwitchTexture(line,1); break; case 116: // Blazing Door Close (faster than TURBO!) - if (EV_DoDoor (line,blazeClose)) + if (EV_DoDoor (line,vld_blazeClose)) P_ChangeSwitchTexture(line,1); break; @@ -625,7 +625,7 @@ P_UseSpecialLine // BlzOpenDoor RED case 136: // BlzOpenDoor YELLOW - if (EV_DoLockedDoor (line,blazeOpen,thing)) + if (EV_DoLockedDoor (line,vld_blazeOpen,thing)) P_ChangeSwitchTexture(line,1); break; |