- merged polyobject branch into trunk and made some adjustments for savegame compatibility.
SVN r2448 (trunk)
This commit is contained in:
parent
3a48da2c56
commit
4ac64b6df7
22 changed files with 1524 additions and 1010 deletions
|
|
@ -49,6 +49,7 @@
|
|||
#include "templates.h"
|
||||
#include "timidity/timidity.h"
|
||||
#include "g_level.h"
|
||||
#include "po_man.h"
|
||||
|
||||
// MACROS ------------------------------------------------------------------
|
||||
|
||||
|
|
@ -795,11 +796,11 @@ static void CalcSectorSoundOrg(const sector_t *sec, int channum, fixed_t *x, fix
|
|||
|
||||
static void CalcPolyobjSoundOrg(const FPolyObj *poly, fixed_t *x, fixed_t *y, fixed_t *z)
|
||||
{
|
||||
seg_t *seg;
|
||||
side_t *side;
|
||||
sector_t *sec;
|
||||
|
||||
PO_ClosestPoint(poly, *x, *y, *x, *y, &seg);
|
||||
sec = seg->frontsector;
|
||||
poly->ClosestPoint(*x, *y, *x, *y, &side);
|
||||
sec = side->sector;
|
||||
*z = clamp(*z, sec->floorplane.ZatPoint(*x, *y), sec->ceilingplane.ZatPoint(*x, *y));
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue