mirror of
https://github.com/DrBeef/Raze.git
synced 2025-04-04 23:12:58 +00:00
- RR: cleaned up and floatified the mine cart code
This commit is contained in:
Christoph Oelckers
parent
13d01bc98b
commit
6fbecf2348
9 changed files with 120 additions and 164 deletions
|
|
@ -185,7 +185,7 @@ void calcSlope(const sectortype* sec, float xpos, float ypos, float* pceilz, flo
|
|||
|
||||
void PlanesAtPoint(const sectortype* sec, float dax, float day, float* pceilz, float* pflorz)
|
||||
{
|
||||
calcSlope(sec, dax * worldtomap, day * worldtomap, pceilz, pflorz);
|
||||
calcSlope(sec, dax * worldtoint, day * worldtoint, pceilz, pflorz);
|
||||
if (pceilz) *pceilz *= -(1 / 256.f);
|
||||
if (pflorz) *pflorz *= -(1 / 256.f);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -36,8 +36,13 @@ Prepared for public release: 03/21/2003 - Charlie Wiederhold, 3D Realms
|
|||
|
||||
void MarkVerticesForSector(int sector);
|
||||
|
||||
static constexpr double maptoworld = (1 / 16.);
|
||||
static constexpr double worldtomap = 16.;
|
||||
static constexpr double maptoworld = (1 / 16.); // this for necessary conversions to convert map data to floating point representation.
|
||||
static constexpr double inttoworld = (1 / 16.); // this is for conversions needed to make floats coexist with existing code.
|
||||
static constexpr double worldtoint = 16.;
|
||||
|
||||
static constexpr double zmaptoworld = (1 / 256.); // this for necessary conversions to convert map data to floating point representation.
|
||||
static constexpr double zinttoworld = (1 / 256.); // this is for conversions needed to make floats coexist with existing code.
|
||||
static constexpr double zworldtoint = 256.;
|
||||
|
||||
//=============================================================================
|
||||
//
|
||||
|
|
@ -363,7 +368,7 @@ struct walltype
|
|||
{
|
||||
DVector2 pos;
|
||||
|
||||
vec2_t wall_int_pos() const { return vec2_t(pos.X * worldtomap, pos.Y * worldtomap); };
|
||||
vec2_t wall_int_pos() const { return vec2_t(pos.X * worldtoint, pos.Y * worldtoint); };
|
||||
void setPosFromLoad(int x, int y) { pos = { x * maptoworld, y * maptoworld }; }
|
||||
|
||||
int32_t point2;
|
||||
|
|
@ -561,8 +566,8 @@ inline void walltype::moved()
|
|||
|
||||
inline void walltype::movexy(int newx, int newy)
|
||||
{
|
||||
pos.X = newx * maptoworld;
|
||||
pos.Y = newy * maptoworld;
|
||||
pos.X = newx * inttoworld;
|
||||
pos.Y = newy * inttoworld;
|
||||
lengthflags = 3;
|
||||
sectorp()->dirty = EDirty::AllDirty;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -847,8 +847,8 @@ void TranslateSector(sectortype* pSector, int a2, int a3, int a4, int a5, int a6
|
|||
int ang = interpolatedvalue(a8, a11, a3);
|
||||
int v14 = ang - v44;
|
||||
|
||||
DVector2 pivot = { a4 * maptoworld, a5 * maptoworld };
|
||||
DVector2 offset = { (vc - a4) * maptoworld, (v8 - a5) * maptoworld };
|
||||
DVector2 pivot = { a4 * inttoworld, a5 * inttoworld };
|
||||
DVector2 offset = { (vc - a4) * inttoworld, (v8 - a5) * inttoworld };
|
||||
auto angle = buildang(ang);
|
||||
|
||||
auto rotatewall = [=](walltype* wal, binangle angle, const DVector2& offset)
|
||||
|
|
|
|||
|
|
@ -213,7 +213,7 @@ static void geometryEffect(int cposx, int cposy, int cposz, binangle cang, fixed
|
|||
while (auto act = it.Next())
|
||||
{
|
||||
ChangeActorSect(act, geosectorwarp[gs]);
|
||||
SetActor(act, { act->spr.pos.X -= int(geox[gs] * worldtomap), act->spr.pos.Y -= int(geoy[gs] * worldtomap), act->spr.pos.Z });
|
||||
SetActor(act, { act->spr.pos.X -= int(geox[gs] * worldtoint), act->spr.pos.Y -= int(geoy[gs] * worldtoint), act->spr.pos.Z });
|
||||
}
|
||||
if (geosector[gs] == sectp)
|
||||
{
|
||||
|
|
@ -221,11 +221,11 @@ static void geometryEffect(int cposx, int cposy, int cposz, binangle cang, fixed
|
|||
geoid = gs;
|
||||
}
|
||||
}
|
||||
cposx -= int(geox[geoid] * worldtomap);
|
||||
cposy -= int(geoy[geoid] * worldtomap);
|
||||
cposx -= int(geox[geoid] * worldtoint);
|
||||
cposy -= int(geoy[geoid] * worldtoint);
|
||||
renderDrawRoomsQ16(cposx, cposy, cposz, cang.asq16(), choriz.asq16(), sect, false);
|
||||
cposx += int(geox[geoid] * worldtomap);
|
||||
cposy += int(geoy[geoid] * worldtomap);
|
||||
cposx += int(geox[geoid] * worldtoint);
|
||||
cposy += int(geoy[geoid] * worldtoint);
|
||||
for (gs = 0; gs < geocnt; gs++)
|
||||
{
|
||||
tgsect = geosectorwarp[gs];
|
||||
|
|
@ -233,7 +233,7 @@ static void geometryEffect(int cposx, int cposy, int cposz, binangle cang, fixed
|
|||
while (auto act = it.Next())
|
||||
{
|
||||
ChangeActorSect(act, geosector[gs]);
|
||||
SetActor(act, { act->spr.pos.X += int(geox[gs] * worldtomap), act->spr.pos.Y += int(geoy[gs] * worldtomap), act->spr.pos.Z });
|
||||
SetActor(act, { act->spr.pos.X += int(geox[gs] * worldtoint), act->spr.pos.Y += int(geoy[gs] * worldtoint), act->spr.pos.Z });
|
||||
}
|
||||
}
|
||||
fi.animatesprites(pm_tsprite, pm_spritesortcnt, cposx, cposy, cang.asbuild(), smoothratio);
|
||||
|
|
@ -245,7 +245,7 @@ static void geometryEffect(int cposx, int cposy, int cposz, binangle cang, fixed
|
|||
while (auto act = it.Next())
|
||||
{
|
||||
ChangeActorSect(act, geosectorwarp2[gs]);
|
||||
SetActor(act, { act->spr.pos.X -= int(geox2[gs] * worldtomap), act->spr.pos.Y -= int(geoy2[gs] * worldtomap), act->spr.pos.Z });
|
||||
SetActor(act, { act->spr.pos.X -= int(geox2[gs] * worldtoint), act->spr.pos.Y -= int(geoy2[gs] * worldtoint), act->spr.pos.Z });
|
||||
}
|
||||
if (geosector[gs] == sectp)
|
||||
{
|
||||
|
|
@ -253,11 +253,11 @@ static void geometryEffect(int cposx, int cposy, int cposz, binangle cang, fixed
|
|||
geoid = gs;
|
||||
}
|
||||
}
|
||||
cposx -= int(geox2[geoid] * worldtomap);
|
||||
cposy -= int(geoy2[geoid] * worldtomap);
|
||||
cposx -= int(geox2[geoid] * worldtoint);
|
||||
cposy -= int(geoy2[geoid] * worldtoint);
|
||||
renderDrawRoomsQ16(cposx, cposy, cposz, cang.asq16(), choriz.asq16(), sect, false);
|
||||
cposx += int(geox2[geoid] * worldtomap);
|
||||
cposy += int(geoy2[geoid] * worldtomap);
|
||||
cposx += int(geox2[geoid] * worldtoint);
|
||||
cposy += int(geoy2[geoid] * worldtoint);
|
||||
for (gs = 0; gs < geocnt; gs++)
|
||||
{
|
||||
tgsect = geosectorwarp2[gs];
|
||||
|
|
@ -265,7 +265,7 @@ static void geometryEffect(int cposx, int cposy, int cposz, binangle cang, fixed
|
|||
while (auto act = it.Next())
|
||||
{
|
||||
ChangeActorSect(act, geosector[gs]);
|
||||
SetActor(act, { act->spr.pos.X += int(geox2[gs] * worldtomap), act->spr.pos.Y += int(geoy2[gs] * worldtomap), act->spr.pos.Z });
|
||||
SetActor(act, { act->spr.pos.X += int(geox2[gs] * worldtoint), act->spr.pos.Y += int(geoy2[gs] * worldtoint), act->spr.pos.Z });
|
||||
}
|
||||
}
|
||||
fi.animatesprites(pm_tsprite, pm_spritesortcnt, cposx, cposy, cang.asbuild(), smoothratio);
|
||||
|
|
|
|||
|
|
@ -37,7 +37,6 @@ BEGIN_DUKE_NS
|
|||
|
||||
static int torchcnt;
|
||||
static int jaildoorcnt;
|
||||
static int minecartcnt;
|
||||
static int lightnincnt;
|
||||
|
||||
static sectortype* torchsector[64];
|
||||
|
|
@ -53,14 +52,32 @@ static short jaildoordir[32];
|
|||
static short jaildooropen[32];
|
||||
static sectortype* jaildoorsect[32];
|
||||
|
||||
static short minecartdir[16];
|
||||
static int minecartspeed[16];
|
||||
struct minecart
|
||||
{
|
||||
sectortype* sect;
|
||||
sectortype* childsect;
|
||||
float speed;
|
||||
float dist;
|
||||
float drag;
|
||||
int16_t direction;
|
||||
int16_t sound;
|
||||
int16_t open;
|
||||
};
|
||||
|
||||
static TArray<minecart> minecarts;
|
||||
|
||||
/*
|
||||
static int minecartcnt;
|
||||
static sectortype* minecartsect[16];
|
||||
static sectortype* minecartchildsect[16];
|
||||
static short minecartsound[16];
|
||||
static int minecartspeed[16];
|
||||
static int minecartdist[16];
|
||||
static int minecartdrag[16];
|
||||
*/
|
||||
|
||||
static short minecartdir[16];
|
||||
static short minecartsound[16];
|
||||
static short minecartopen[16];
|
||||
static sectortype* minecartsect[16];
|
||||
|
||||
static sectortype* lightninsector[64];
|
||||
static short lightninsectorshade[64];
|
||||
|
|
@ -76,16 +93,32 @@ static int windertime;
|
|||
void lava_cleararrays()
|
||||
{
|
||||
jaildoorcnt = 0;
|
||||
minecartcnt = 0;
|
||||
minecarts.Clear();
|
||||
torchcnt = 0;
|
||||
lightnincnt = 0;
|
||||
}
|
||||
|
||||
FSerializer& Serialize(FSerializer& arc, const char* key, minecart& c, minecart* def)
|
||||
{
|
||||
if (arc.BeginObject(key))
|
||||
{
|
||||
arc("sect", c.sect)
|
||||
("childsect", c.childsect)
|
||||
("speed", c.speed)
|
||||
("dist", c.dist)
|
||||
("drag", c.drag)
|
||||
("dir", c.direction)
|
||||
("sound", c.sound)
|
||||
("open", c.open)
|
||||
.EndObject();
|
||||
}
|
||||
return arc;
|
||||
}
|
||||
|
||||
void lava_serialize(FSerializer& arc)
|
||||
{
|
||||
arc("torchcnt", torchcnt)
|
||||
("jaildoorcnt", jaildoorcnt)
|
||||
("minecartcnt", minecartcnt)
|
||||
("lightnincnt", lightnincnt);
|
||||
|
||||
if (torchcnt)
|
||||
|
|
@ -103,16 +136,6 @@ void lava_serialize(FSerializer& arc)
|
|||
.Array("jaildooropen", jaildooropen, jaildoorcnt)
|
||||
.Array("jaildoorsect", jaildoorsect, jaildoorcnt);
|
||||
|
||||
if (minecartcnt)
|
||||
arc.Array("minecartdir", minecartdir, minecartcnt)
|
||||
.Array("minecartspeed", minecartspeed, minecartcnt)
|
||||
.Array("minecartchildsect", minecartchildsect, minecartcnt)
|
||||
.Array("minecartsound", minecartsound, minecartcnt)
|
||||
.Array("minecartdist", minecartdist, minecartcnt)
|
||||
.Array("minecartdrag", minecartdrag, minecartcnt)
|
||||
.Array("minecartopen", minecartopen, minecartcnt)
|
||||
.Array("minecartsect", minecartsect, minecartcnt);
|
||||
|
||||
if (lightnincnt)
|
||||
arc.Array("lightninsector", lightninsector, lightnincnt)
|
||||
.Array("lightninsectorshade", lightninsectorshade, lightnincnt);
|
||||
|
|
@ -170,18 +193,17 @@ void addjaildoor(int p1, int p2, int iht, int jlt, int p3, sectortype* j)
|
|||
|
||||
void addminecart(int p1, int p2, sectortype* i, int iht, int p3, sectortype* childsectnum)
|
||||
{
|
||||
if (minecartcnt >= 16)
|
||||
I_Error("Too many minecart sectors");
|
||||
minecartdist[minecartcnt] = p1;
|
||||
minecartspeed[minecartcnt] = p2;
|
||||
minecartsect[minecartcnt] = i;
|
||||
minecartdir[minecartcnt] = i->hitag;
|
||||
minecartdrag[minecartcnt] = p1;
|
||||
minecartopen[minecartcnt] = 1;
|
||||
minecartsound[minecartcnt] = p3;
|
||||
minecartchildsect[minecartcnt] = childsectnum;
|
||||
minecarts.Reserve(1);
|
||||
auto& mc = minecarts.Last();
|
||||
mc.dist = p1;
|
||||
mc.speed = p2 * maptoworld;
|
||||
mc.sect = i;
|
||||
mc.direction = i->hitag;
|
||||
mc.drag = p1;
|
||||
mc.open = 1;
|
||||
mc.sound = p3;
|
||||
mc.childsect = childsectnum;
|
||||
setsectinterpolate(i);
|
||||
minecartcnt++;
|
||||
}
|
||||
|
||||
//---------------------------------------------------------------------------
|
||||
|
|
@ -374,43 +396,31 @@ void dojaildoor(void)
|
|||
|
||||
void moveminecart(void)
|
||||
{
|
||||
int i;
|
||||
int speed;
|
||||
int y;
|
||||
int x;
|
||||
int cx;
|
||||
int cy;
|
||||
int max_x;
|
||||
int min_y;
|
||||
int max_y;
|
||||
int min_x;
|
||||
for (i = 0; i < minecartcnt; i++)
|
||||
for(auto& mc : minecarts)
|
||||
{
|
||||
auto sectp = minecartsect[i];
|
||||
speed = minecartspeed[i];
|
||||
if (speed < 2)
|
||||
speed = 2;
|
||||
auto sectp = mc.sect;
|
||||
auto speed = max<double>(2 * maptoworld, mc.speed);
|
||||
|
||||
if (minecartopen[i] == 1)
|
||||
if (mc.open == 1 || mc.open == 2)
|
||||
{
|
||||
minecartdrag[i] -= speed;
|
||||
if (minecartdrag[i] <= 0)
|
||||
mc.drag -= speed;
|
||||
if (mc.drag <= 0)
|
||||
{
|
||||
minecartdrag[i] = minecartdist[i];
|
||||
minecartopen[i] = 2;
|
||||
switch (minecartdir[i])
|
||||
mc.drag = mc.dist;
|
||||
mc.open ^= 3;
|
||||
switch (mc.direction)
|
||||
{
|
||||
case 10:
|
||||
minecartdir[i] = 30;
|
||||
mc.direction = 30;
|
||||
break;
|
||||
case 20:
|
||||
minecartdir[i] = 40;
|
||||
mc.direction = 40;
|
||||
break;
|
||||
case 30:
|
||||
minecartdir[i] = 10;
|
||||
mc.direction = 10;
|
||||
break;
|
||||
case 40:
|
||||
minecartdir[i] = 20;
|
||||
mc.direction = 20;
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
|
@ -418,94 +428,35 @@ void moveminecart(void)
|
|||
{
|
||||
for (auto& wal : wallsofsector(sectp))
|
||||
{
|
||||
switch (minecartdir[i])
|
||||
auto pos = wal.pos;
|
||||
switch (mc.direction)
|
||||
{
|
||||
default: // make case of bad parameters well defined.
|
||||
x = wal.wall_int_pos().X;
|
||||
y = wal.wall_int_pos().Y;
|
||||
break;
|
||||
case 10:
|
||||
x = wal.wall_int_pos().X;
|
||||
y = wal.wall_int_pos().Y + speed;
|
||||
pos.Y += speed;
|
||||
break;
|
||||
case 20:
|
||||
x = wal.wall_int_pos().X - speed;
|
||||
y = wal.wall_int_pos().Y;
|
||||
pos.X -= speed;
|
||||
break;
|
||||
case 30:
|
||||
x = wal.wall_int_pos().X;
|
||||
y = wal.wall_int_pos().Y - speed;
|
||||
pos.Y -= speed;
|
||||
break;
|
||||
case 40:
|
||||
x = wal.wall_int_pos().X + speed;
|
||||
y = wal.wall_int_pos().Y;
|
||||
pos.X += speed;
|
||||
break;
|
||||
}
|
||||
dragpoint(&wal, x, y);
|
||||
dragpoint(&wal, pos);
|
||||
}
|
||||
}
|
||||
}
|
||||
if (minecartopen[i] == 2)
|
||||
{
|
||||
minecartdrag[i] -= speed;
|
||||
if (minecartdrag[i] <= 0)
|
||||
{
|
||||
minecartdrag[i] = minecartdist[i];
|
||||
minecartopen[i] = 1;
|
||||
switch (minecartdir[i])
|
||||
{
|
||||
case 10:
|
||||
minecartdir[i] = 30;
|
||||
break;
|
||||
case 20:
|
||||
minecartdir[i] = 40;
|
||||
break;
|
||||
case 30:
|
||||
minecartdir[i] = 10;
|
||||
break;
|
||||
case 40:
|
||||
minecartdir[i] = 20;
|
||||
break;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
for (auto& wal : wallsofsector(sectp))
|
||||
{
|
||||
switch (minecartdir[i])
|
||||
{
|
||||
default: // make case of bad parameters well defined.
|
||||
x = wal.wall_int_pos().X;
|
||||
y = wal.wall_int_pos().Y;
|
||||
break;
|
||||
case 10:
|
||||
x = wal.wall_int_pos().X;
|
||||
y = wal.wall_int_pos().Y + speed;
|
||||
break;
|
||||
case 20:
|
||||
x = wal.wall_int_pos().X - speed;
|
||||
y = wal.wall_int_pos().Y;
|
||||
break;
|
||||
case 30:
|
||||
x = wal.wall_int_pos().X;
|
||||
y = wal.wall_int_pos().Y - speed;
|
||||
break;
|
||||
case 40:
|
||||
x = wal.wall_int_pos().X + speed;
|
||||
y = wal.wall_int_pos().Y;
|
||||
break;
|
||||
}
|
||||
dragpoint(&wal, x, y);
|
||||
}
|
||||
}
|
||||
}
|
||||
auto csect = minecartchildsect[i];
|
||||
max_x = max_y = -0x20000;
|
||||
min_x = min_y = 0x20000;
|
||||
|
||||
auto csect = mc.childsect;
|
||||
double max_x = INT32_MIN, max_y = INT32_MIN, min_x = INT32_MAX, min_y = INT32_MAX;
|
||||
for (auto& wal : wallsofsector(csect))
|
||||
{
|
||||
x = wal.wall_int_pos().X;
|
||||
y = wal.wall_int_pos().Y;
|
||||
double x = wal.pos.X;
|
||||
double y = wal.pos.Y;
|
||||
if (x > max_x)
|
||||
max_x = x;
|
||||
if (y > max_y)
|
||||
|
|
@ -515,13 +466,13 @@ void moveminecart(void)
|
|||
if (y < min_y)
|
||||
min_y = y;
|
||||
}
|
||||
cx = (max_x + min_x) >> 1;
|
||||
cy = (max_y + min_y) >> 1;
|
||||
double cx = (max_x + min_x) * 0.5;
|
||||
double cy = (max_y + min_y) * 0.5;
|
||||
DukeSectIterator it(csect);
|
||||
while (auto a2 = it.Next())
|
||||
{
|
||||
if (badguy(a2))
|
||||
SetActor(a2, { cx, cy, a2->spr.pos.Z });
|
||||
SetActor(a2, { int(cx * worldtoint), int(cy * worldtoint), a2->spr.pos.Z });
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -47,9 +47,9 @@ x(ACCESSCARD, 60)
|
|||
x(BOOTS, 61)
|
||||
x(GUTMETER, 62)
|
||||
y(RRTILE63, 63)
|
||||
y(RRTILE64, 64)
|
||||
y(RRTILE65, 65)
|
||||
y(RRTILE66, 66)
|
||||
y(RRMINECART, 64)
|
||||
y(RRMINECARTSOUND, 65)
|
||||
y(RRMINECARTINNER, 66)
|
||||
y(RRTILE67, 67)
|
||||
y(RRTILE68, 68)
|
||||
x(MIRRORBROKE, 70)
|
||||
|
|
|
|||
|
|
@ -491,14 +491,14 @@ void prelevel_r(int g, TArray<DDukeActor*>& actors)
|
|||
DukeSectIterator it(sectp);
|
||||
while (auto act = it.Next())
|
||||
{
|
||||
if (act->spr.picnum == RRTILE64)
|
||||
if (act->spr.picnum == RRMINECART)
|
||||
{
|
||||
dist = act->spr.lotag << 4;
|
||||
dist = act->spr.lotag;
|
||||
speed = act->spr.hitag;
|
||||
DukeSpriteIterator itt;
|
||||
while(auto act1 = itt.Next())
|
||||
{
|
||||
if (act1->spr.picnum == RRTILE66)
|
||||
if (act1->spr.picnum == RRMINECARTINNER)
|
||||
if (act1->spr.lotag == act->sectno()) // bad map format design... Should have used a tag instead...
|
||||
{
|
||||
childsectnum = act1->sector();
|
||||
|
|
@ -507,7 +507,7 @@ void prelevel_r(int g, TArray<DDukeActor*>& actors)
|
|||
}
|
||||
deletesprite(act);
|
||||
}
|
||||
if (act->spr.picnum == RRTILE65)
|
||||
if (act->spr.picnum == RRMINECARTSOUND)
|
||||
{
|
||||
sound = act->spr.lotag;
|
||||
deletesprite(act);
|
||||
|
|
@ -605,15 +605,15 @@ void prelevel_r(int g, TArray<DDukeActor*>& actors)
|
|||
if (actor2->spr.hitag == 1)
|
||||
{
|
||||
geosectorwarp[geocnt] = actor2->sector();
|
||||
geox[geocnt] = (actor->spr.pos.X - actor2->spr.pos.X) * maptoworld;
|
||||
geoy[geocnt] = (actor->spr.pos.Y - actor2->spr.pos.Y) * maptoworld;
|
||||
geox[geocnt] = (actor->spr.pos.X - actor2->spr.pos.X) * inttoworld;
|
||||
geoy[geocnt] = (actor->spr.pos.Y - actor2->spr.pos.Y) * inttoworld;
|
||||
//geoz[geocnt] = actor->spr.z - actor2->spr.z;
|
||||
}
|
||||
if (actor2->spr.hitag == 2)
|
||||
{
|
||||
geosectorwarp2[geocnt] = actor2->sector();
|
||||
geox2[geocnt] = (actor->spr.pos.X - actor2->spr.pos.X) * maptoworld;
|
||||
geoy2[geocnt] = (actor->spr.pos.Y - actor2->spr.pos.Y) * maptoworld;
|
||||
geox2[geocnt] = (actor->spr.pos.X - actor2->spr.pos.X) * inttoworld;
|
||||
geoy2[geocnt] = (actor->spr.pos.Y - actor2->spr.pos.Y) * inttoworld;
|
||||
//geoz2[geocnt] = actor->spr.z - actor2->spr.z;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -318,13 +318,13 @@ void setanimatevalue(int type, int index, double value)
|
|||
sector[index].setceilingz((int)value);
|
||||
break;
|
||||
case anim_vertexx:
|
||||
wall[index].pos.X = value * worldtomap;
|
||||
wall[index].pos.X = value * maptoworld;
|
||||
|
||||
wall[index].pos.X = value * inttoworld;
|
||||
wall[index].moved();
|
||||
break;
|
||||
case anim_vertexy:
|
||||
wall[index].pos.Y = value * worldtomap;
|
||||
wall[index].pos.Y = value * maptoworld;
|
||||
|
||||
wall[index].pos.Y = value * inttoworld;
|
||||
wall[index].moved();
|
||||
break;
|
||||
default:
|
||||
|
|
|
|||
|
|
@ -1610,8 +1610,8 @@ void MovePoints(SECTOR_OBJECT* sop, short delta_ang, int nx, int ny)
|
|||
if ((sop->flags & SOBJ_ZMID_FLOOR))
|
||||
sop->pmid.Z = sop->mid_sector->floorz;
|
||||
|
||||
DVector2 pivot = { sop->pmid.X * maptoworld, sop->pmid.Y * maptoworld };
|
||||
DVector2 move = { nx * maptoworld, ny * maptoworld };
|
||||
DVector2 pivot = { sop->pmid.X * inttoworld, sop->pmid.Y * inttoworld };
|
||||
DVector2 move = { nx * inttoworld, ny * inttoworld };
|
||||
for (sectp = sop->sectp, j = 0; *sectp; sectp++, j++)
|
||||
{
|
||||
if ((sop->flags & (SOBJ_SPRITE_OBJ | SOBJ_DONT_ROTATE)))
|
||||
|
|
|
|||
Loading…
Reference in a new issue