zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-02-07 15:31:11 +00:00
Code Issues Projects Releases Packages Wiki Activity

- floatified and consolidated handle_se29.

Browse source
This commit is contained in:
Christoph Oelckers 2022-09-11 23:51:48 +02:00
parent 9a07dc5b7b
commit 03a0eb7284
4 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
source/games/duke/src/actors.cpp
View file

@ -4617,6 +4617,20 @@ void handle_se130(DDukeActor *actor, int countmax, int EXPLOSION2)
// //
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------
void handle_se29(DDukeActor* actor)
{
auto sc = actor->sector();
actor->spr.hitag += 64;
double val = actor->spr.yint * BobVal(actor->spr.hitag) / 64.;
sc->setfloorz(actor->spr.pos.Z + val);
}
//---------------------------------------------------------------------------
//
//
//
//---------------------------------------------------------------------------
void handle_se31(DDukeActor* actor, bool choosedir) void handle_se31(DDukeActor* actor, bool choosedir)
{ {
auto sec = actor->sector(); auto sec = actor->sector();

7
source/games/duke/src/actors_d.cpp
View file

@ -3292,8 +3292,6 @@ static void handle_se28(DDukeActor* actor)
void moveeffectors_d(void) //STATNUM 3 void moveeffectors_d(void) //STATNUM 3
{ {
int l;
clearfriction(); clearfriction();
DukeStatIterator it(STAT_EFFECTOR); DukeStatIterator it(STAT_EFFECTOR);
@ -3423,10 +3421,9 @@ void moveeffectors_d(void) //STATNUM 3
break; break;
case SE_29_WAVES: case SE_29_WAVES:
act->spr.hitag += 64; handle_se29(act);
l = MulScale(act->spr.yint, bsin(act->spr.hitag), 12);
sc->set_int_floorz(act->int_pos().Z + l);
break; break;
case SE_31_FLOOR_RISE_FALL: // True Drop Floor case SE_31_FLOOR_RISE_FALL: // True Drop Floor
handle_se31(act, true); handle_se31(act, true);
break; break;

6
source/games/duke/src/actors_r.cpp
View file

@ -3243,8 +3243,6 @@ void handle_se06_r(DDukeActor *actor)
void moveeffectors_r(void) //STATNUM 3 void moveeffectors_r(void) //STATNUM 3
{ {
int l;
clearfriction(); clearfriction();
DukeStatIterator it(STAT_EFFECTOR); DukeStatIterator it(STAT_EFFECTOR);
@ -3384,9 +3382,7 @@ void moveeffectors_r(void) //STATNUM 3
break; break;
case SE_29_WAVES: case SE_29_WAVES:
act->spr.hitag += 64; handle_se29(act);
l = MulScale(act->spr.yint, bsin(act->spr.hitag), 12);
sc->set_int_floorz(act->int_pos().Z + l);
break; break;
case SE_31_FLOOR_RISE_FALL: // True Drop Floor case SE_31_FLOOR_RISE_FALL: // True Drop Floor

1
source/games/duke/src/funct.h
View file

@ -89,6 +89,7 @@ void handle_se24(DDukeActor* actor, bool scroll, int shift);
void handle_se25(DDukeActor* a, int t_index, int snd1, int snd2); void handle_se25(DDukeActor* a, int t_index, int snd1, int snd2);
void handle_se26(DDukeActor* i); void handle_se26(DDukeActor* i);
void handle_se27(DDukeActor* i); void handle_se27(DDukeActor* i);
void handle_se29(DDukeActor* actor);
void handle_se31(DDukeActor* a, bool choosedir); void handle_se31(DDukeActor* a, bool choosedir);
void handle_se32(DDukeActor* i); void handle_se32(DDukeActor* i);
void handle_se35(DDukeActor* i, int SMALLSMOKE, int EXPLOSION2); void handle_se35(DDukeActor* i, int SMALLSMOKE, int EXPLOSION2);