summaryrefslogtreecommitdiff
path: root/src/heretic/p_doors.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/heretic/p_doors.c')
-rw-r--r--src/heretic/p_doors.c31
1 files changed, 13 insertions, 18 deletions
diff --git a/src/heretic/p_doors.c b/src/heretic/p_doors.c
index 303922c8..e0e82fbe 100644
--- a/src/heretic/p_doors.c
+++ b/src/heretic/p_doors.c
@@ -54,13 +54,11 @@ void T_VerticalDoor(vldoor_t * door)
{
case normal:
door->direction = -1; // time to go back down
- S_StartSound((mobj_t *)
- & door->sector->soundorg, sfx_doropn);
+ S_StartSound(&door->sector->soundorg, sfx_doropn);
break;
case close30ThenOpen:
door->direction = 1;
- S_StartSound((mobj_t *)
- & door->sector->soundorg, sfx_doropn);
+ S_StartSound(&door->sector->soundorg, sfx_doropn);
break;
default:
break;
@@ -74,8 +72,7 @@ void T_VerticalDoor(vldoor_t * door)
case raiseIn5Mins:
door->direction = 1;
door->type = normal;
- S_StartSound((mobj_t *)
- & door->sector->soundorg, sfx_doropn);
+ S_StartSound(&door->sector->soundorg, sfx_doropn);
break;
default:
break;
@@ -94,8 +91,7 @@ void T_VerticalDoor(vldoor_t * door)
case close:
door->sector->specialdata = NULL;
P_RemoveThinker(&door->thinker); // unlink and free
- S_StartSound((mobj_t *)
- & door->sector->soundorg, sfx_dorcls);
+ S_StartSound(&door->sector->soundorg, sfx_dorcls);
break;
case close30ThenOpen:
door->direction = 0;
@@ -113,8 +109,7 @@ void T_VerticalDoor(vldoor_t * door)
break;
default:
door->direction = 1;
- S_StartSound((mobj_t *)
- & door->sector->soundorg, sfx_doropn);
+ S_StartSound(&door->sector->soundorg, sfx_doropn);
break;
}
}
@@ -134,7 +129,7 @@ void T_VerticalDoor(vldoor_t * door)
case open:
door->sector->specialdata = NULL;
P_RemoveThinker(&door->thinker); // unlink and free
- S_StopSound((mobj_t *) & door->sector->soundorg);
+ S_StopSound(&door->sector->soundorg);
break;
default:
break;
@@ -181,12 +176,12 @@ int EV_DoDoor(line_t * line, vldoor_e type, fixed_t speed)
door->topheight = P_FindLowestCeilingSurrounding(sec);
door->topheight -= 4 * FRACUNIT;
door->direction = -1;
- S_StartSound((mobj_t *) & door->sector->soundorg, sfx_doropn);
+ S_StartSound(&door->sector->soundorg, sfx_doropn);
break;
case close30ThenOpen:
door->topheight = sec->ceilingheight;
door->direction = -1;
- S_StartSound((mobj_t *) & door->sector->soundorg, sfx_doropn);
+ S_StartSound(&door->sector->soundorg, sfx_doropn);
break;
case normal:
case open:
@@ -195,7 +190,7 @@ int EV_DoDoor(line_t * line, vldoor_e type, fixed_t speed)
door->topheight -= 4 * FRACUNIT;
if (door->topheight != sec->ceilingheight)
{
- S_StartSound((mobj_t *) & door->sector->soundorg,
+ S_StartSound(&door->sector->soundorg,
sfx_doropn);
}
break;
@@ -303,12 +298,12 @@ void EV_VerticalDoor(line_t * line, mobj_t * thing)
{
case 1: // NORMAL DOOR SOUND
case 31:
- S_StartSound((mobj_t *) & sec->soundorg, sfx_doropn);
- //S_StartSound((mobj_t *)&sec->soundorg, sfx_dormov);
+ S_StartSound(&sec->soundorg, sfx_doropn);
+ //S_StartSound(&sec->soundorg, sfx_dormov);
break;
default: // LOCKED DOOR SOUND
- S_StartSound((mobj_t *) & sec->soundorg, sfx_doropn);
- //S_StartSound((mobj_t *)&sec->soundorg, sfx_dormov);
+ S_StartSound(&sec->soundorg, sfx_doropn);
+ //S_StartSound(&sec->soundorg, sfx_dormov);
break;
}