teambeef/raze
0
0
Fork 0
mirror of https://github.com/DrBeef/Raze.git synced 2025-04-05 15:30:49 +00:00
Code Issues Projects Releases Packages Wiki Activity

- added wrappers, part 7 and final

Browse source
This commit is contained in:
Christoph Oelckers 2022-10-03 21:37:18 +02:00
parent 329a912041
commit d35785f1ee
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
source/games/sw/src/game.h
View file

@ -1515,6 +1515,7 @@ struct SECTOR_OBJECT
void set_int_i_ang(int i) { __i_ang = i; }
void set_int_i_ang_tgt(int i) { __i_ang_tgt = i; }
void set_int_i_ang_moving(int i) { __i_ang_moving = i; }
void set_int_i_ang_orig(int i) { __i_ang_orig = i; }
int16_t clipbox_num,

12
source/games/sw/src/track.cpp
View file

@ -944,7 +944,7 @@ void SetupSectorObject(sectortype* sectp, short tag)
sop->wait_tics = 0;
sop->set_int_i_spin_speed(0);
sop->set_int_i_spin_ang(0);
sop->__i_ang_orig = 0;
sop->set_int_i_ang_orig(0);
sop->clipdist = 1024;
sop->target_dist = 0;
sop->turn_speed = 4;
@ -1204,7 +1204,7 @@ void SetupSectorObject(sectortype* sectp, short tag)
case SO_ANGLE:
sop->set_int_i_ang(actor->int_ang());
sop->set_int_i_ang_moving(actor->int_ang());
sop->__i_ang_orig = sop->int_i_ang();
sop->set_int_i_ang_orig(sop->int_i_ang());
sop->set_int_i_last_ang(sop->int_i_ang());
sop->set_int_i_spin_ang(0);
KillActor(actor);
@ -2639,10 +2639,10 @@ void DoTornadoObject(SECTOR_OBJECT* sop)
// this made them move together more or less - cool!
//static short ang = 1024;
int ret;
short *ang = &sop->__i_ang_moving;
short ang = sop->__i_ang_moving;
xvect = sop->vel * bcos(*ang);
yvect = sop->vel * bcos(*ang);
xvect = sop->vel * bcos(ang);
yvect = sop->vel * bcos(ang);
auto cursect = sop->op_main_sector; // for sop->vel
double floor_dist = (abs(cursect->ceilingz - cursect->floorz)) * 0.25;
@ -2654,7 +2654,7 @@ void DoTornadoObject(SECTOR_OBJECT* sop)
if (coll.type != kHitNone)
{
*ang = NORM_ANGLE(*ang + 1024 + RANDOM_P2(512) - 256);
sop->set_int_i_ang_moving(NORM_ANGLE(ang + 1024 + RANDOM_P2(512) - 256));
}
TornadoSpin(sop);