diff options
| author | Simon Howard | 2007-06-16 16:02:58 +0000 |
|---|---|---|
| committer | Simon Howard | 2007-06-16 16:02:58 +0000 |
| commit | a9feab0830ecdf0b3e52e9339522918e3f12226f (patch) | |
| tree | e2eb921859fba84c39215e6024071f30d0ca4158 /src/p_doors.c | |
| parent | c447a5da8c8087d94867560764b59f03d0e70b1d (diff) | |
| download | chocolate-doom-a9feab0830ecdf0b3e52e9339522918e3f12226f.tar.gz chocolate-doom-a9feab0830ecdf0b3e52e9339522918e3f12226f.tar.bz2 chocolate-doom-a9feab0830ecdf0b3e52e9339522918e3f12226f.zip | |
Shut up strict aliasing warnings
Subversion-branch: /trunk/chocolate-doom
Subversion-revision: 909
Diffstat (limited to 'src/p_doors.c')
| -rw-r--r-- | src/p_doors.c | 39 |
1 files changed, 14 insertions, 25 deletions
diff --git a/src/p_doors.c b/src/p_doors.c index ed0bf039..10ad600b 100644 --- a/src/p_doors.c +++ b/src/p_doors.c @@ -76,20 +76,17 @@ void T_VerticalDoor (vldoor_t* door) { case blazeRaise: door->direction = -1; // time to go back down - S_StartSound((mobj_t *)&door->sector->soundorg, - sfx_bdcls); + S_StartSound(&door->sector->soundorg, sfx_bdcls); break; case normal: door->direction = -1; // time to go back down - S_StartSound((mobj_t *)&door->sector->soundorg, - sfx_dorcls); + S_StartSound(&door->sector->soundorg, sfx_dorcls); break; case close30ThenOpen: door->direction = 1; - S_StartSound((mobj_t *)&door->sector->soundorg, - sfx_doropn); + S_StartSound(&door->sector->soundorg, sfx_doropn); break; default: @@ -107,8 +104,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: @@ -131,8 +127,7 @@ void T_VerticalDoor (vldoor_t* door) case blazeClose: door->sector->specialdata = NULL; P_RemoveThinker (&door->thinker); // unlink and free - S_StartSound((mobj_t *)&door->sector->soundorg, - sfx_bdcls); + S_StartSound(&door->sector->soundorg, sfx_bdcls); break; case normal: @@ -160,8 +155,7 @@ void T_VerticalDoor (vldoor_t* door) default: door->direction = 1; - S_StartSound((mobj_t *)&door->sector->soundorg, - sfx_doropn); + S_StartSound(&door->sector->soundorg, sfx_doropn); break; } } @@ -300,23 +294,20 @@ EV_DoDoor door->topheight -= 4*FRACUNIT; door->direction = -1; door->speed = VDOORSPEED * 4; - S_StartSound((mobj_t *)&door->sector->soundorg, - sfx_bdcls); + S_StartSound(&door->sector->soundorg, sfx_bdcls); break; case close: door->topheight = P_FindLowestCeilingSurrounding(sec); door->topheight -= 4*FRACUNIT; door->direction = -1; - S_StartSound((mobj_t *)&door->sector->soundorg, - sfx_dorcls); + S_StartSound(&door->sector->soundorg, sfx_dorcls); break; case close30ThenOpen: door->topheight = sec->ceilingheight; door->direction = -1; - S_StartSound((mobj_t *)&door->sector->soundorg, - sfx_dorcls); + S_StartSound(&door->sector->soundorg, sfx_dorcls); break; case blazeRaise: @@ -326,8 +317,7 @@ EV_DoDoor door->topheight -= 4*FRACUNIT; door->speed = VDOORSPEED * 4; if (door->topheight != sec->ceilingheight) - S_StartSound((mobj_t *)&door->sector->soundorg, - sfx_bdopn); + S_StartSound(&door->sector->soundorg, sfx_bdopn); break; case normal: @@ -336,8 +326,7 @@ EV_DoDoor door->topheight = P_FindLowestCeilingSurrounding(sec); door->topheight -= 4*FRACUNIT; if (door->topheight != sec->ceilingheight) - S_StartSound((mobj_t *)&door->sector->soundorg, - sfx_doropn); + S_StartSound(&door->sector->soundorg, sfx_doropn); break; default: @@ -443,16 +432,16 @@ EV_VerticalDoor { case 117: // BLAZING DOOR RAISE case 118: // BLAZING DOOR OPEN - S_StartSound((mobj_t *)&sec->soundorg,sfx_bdopn); + S_StartSound(&sec->soundorg,sfx_bdopn); break; case 1: // NORMAL DOOR SOUND case 31: - S_StartSound((mobj_t *)&sec->soundorg,sfx_doropn); + S_StartSound(&sec->soundorg,sfx_doropn); break; default: // LOCKED DOOR SOUND - S_StartSound((mobj_t *)&sec->soundorg,sfx_doropn); + S_StartSound(&sec->soundorg,sfx_doropn); break; } |