80486DX2-66/taisei
1
0
Fork 1
Code Issues Activity

stage3: fix move_towards deprecation warnings

Browse source
This commit is contained in:
Andrei Alexeyev 2023-02-27 07:10:57 +01:00
parent b43fcde1ce
commit a673af25f2
No known key found for this signature in database
GPG key ID: 72D26128040B9690
9 changed files with 12 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/stages/stage3/nonspells/boss_nonspells.c
View file

@ -76,7 +76,7 @@ static void wriggle_nonspell_common(Boss *boss, int level) {
wander_bounds.bottom = 180 + 20 * level;
real wander_dist = 60 + 10 * level;
boss->move = move_towards(boss->pos, 0.02);
boss->move = move_towards(0, boss->pos, 0.02);
for(;;) {
WAIT(120);

2
src/stages/stage3/nonspells/midboss_nonspell_1.c
View file

@ -80,7 +80,7 @@ DEFINE_EXTERN_TASK(stage3_midboss_nonspell_1) {
STAGE_BOOKMARK(non1);
Boss *boss = INIT_BOSS_ATTACK(&ARGS);
boss->move = move_towards(VIEWPORT_W/2 + 100.0*I, 0.03);
boss->move = move_from_towards(boss->pos, VIEWPORT_W/2 + 100.0*I, 0.03);
BEGIN_BOSS_ATTACK(&ARGS);
Rect bounds = viewport_bounds(80);

2
src/stages/stage3/spells/deadly_dance.c
View file

@ -105,7 +105,7 @@ DEFINE_EXTERN_TASK(stage3_spell_deadly_dance) {
STAGE_BOOKMARK(dance);
Boss *boss = INIT_BOSS_ATTACK(&ARGS);
boss->move = move_towards(VIEWPORT_W/2 + VIEWPORT_H*I/2, 0.08);
boss->move = move_from_towards(boss->pos, VIEWPORT_W/2 + VIEWPORT_H*I/2, 0.08);
BEGIN_BOSS_ATTACK(&ARGS);
boss->move.attraction = 0;

2
src/stages/stage3/spells/firefly_storm.c
View file

@ -78,7 +78,7 @@ TASK(fstorm_bullet, { BoxedBoss boss; ProjPrototype *proto; cmplx pos; cmplx vel
DEFINE_EXTERN_TASK(stage3_spell_firefly_storm) {
Boss *boss = INIT_BOSS_ATTACK(&ARGS);
boss->move = move_towards(VIEWPORT_W/2 + VIEWPORT_H*I/2, 0.05);
boss->move = move_from_towards(boss->pos, VIEWPORT_W/2 + VIEWPORT_H*I/2, 0.05);
BEGIN_BOSS_ATTACK(&ARGS);
bool lun = global.diff == D_Lunatic;

2
src/stages/stage3/spells/light_singularity.c
View file

@ -40,7 +40,7 @@ TASK(singularity_laser, { cmplx pos; cmplx vel; real amp; real freq; }) {
DEFINE_EXTERN_TASK(stage3_spell_light_singularity) {
Boss *boss = INIT_BOSS_ATTACK(&ARGS);
boss->move = move_towards(VIEWPORT_W/2 + VIEWPORT_H*I/2, 0.05);
boss->move = move_from_towards(boss->pos, VIEWPORT_W/2 + VIEWPORT_H*I/2, 0.05);
BEGIN_BOSS_ATTACK(&ARGS);
WAIT(100);

2
src/stages/stage3/spells/moonlight_rocket.c
View file

@ -190,7 +190,7 @@ TASK(rocket_slave, { BoxedBoss boss; real rot_speed; real rot_initial; }) {
DEFINE_EXTERN_TASK(stage3_spell_moonlight_rocket) {
Boss *boss = INIT_BOSS_ATTACK(&ARGS);
boss->move = move_towards(VIEWPORT_W/2 + VIEWPORT_H*I/2.5, 0.05);
boss->move = move_from_towards(boss->pos, VIEWPORT_W/2 + VIEWPORT_H*I/2.5, 0.05);
BEGIN_BOSS_ATTACK(&ARGS);
int nslaves = difficulty_value(2, 3, 4, 5);

2
src/stages/stage3/spells/night_ignite.c
View file

@ -93,7 +93,7 @@ TASK(laserbullet, { ProjPrototype *proto; Color *color; BoxedLaser laser; cmplx
DEFINE_EXTERN_TASK(stage3_spell_night_ignite) {
Boss *boss = INIT_BOSS_ATTACK(&ARGS);
boss->move = move_towards(VIEWPORT_W/2 + VIEWPORT_H*I/3, 0.05);
boss->move = move_from_towards(boss->pos, VIEWPORT_W/2 + VIEWPORT_H*I/3, 0.05);
BEGIN_BOSS_ATTACK(&ARGS);
int nslaves = 7;

8
src/stages/stage3/timeline.c
View file

@ -307,7 +307,7 @@ TASK(circle_twist_fairy, { cmplx pos; cmplx target_pos; }) {
.bomb_fragment = 1,
)));
e->move = move_towards(ARGS.target_pos, 0.01);
e->move = move_from_towards(e->pos, ARGS.target_pos, 0.01);
WAIT(50);
int circle_count = 10;
@ -410,7 +410,7 @@ TASK(laserball_fairy, { cmplx pos; cmplx target_pos; real freq_factor; }) {
.points = 5,
)));
e->move = move_towards(ARGS.target_pos, 0.04);
e->move = move_from_towards(e->pos, ARGS.target_pos, 0.04);
WAIT(30);
common_charge(90, &e->pos, 0, RGBA(0.5, 1, 0.25, 0));
@ -529,7 +529,7 @@ TASK_WITH_INTERFACE(midboss_intro, BossAttack) {
Boss *boss = INIT_BOSS_ATTACK(&ARGS);
BEGIN_BOSS_ATTACK(&ARGS);
boss->move = move_towards(VIEWPORT_W/2 + 100.0*I, 0.04);
boss->move = move_from_towards(boss->pos, VIEWPORT_W/2 + 100.0*I, 0.04);
}
TASK_WITH_INTERFACE(midboss_outro, BossAttack) {
@ -559,7 +559,7 @@ TASK(spawn_midboss) {
TASK(boss_appear, { BoxedBoss boss; }) {
Boss *boss = TASK_BIND(ARGS.boss);
boss->move = move_towards(VIEWPORT_W/2.0 + 100.0*I, 0.05);
boss->move = move_from_towards(boss->pos, VIEWPORT_W/2.0 + 100.0*I, 0.05);
}
TASK(spawn_boss) {

2
src/stages/stage3/wriggle.c
View file

@ -127,7 +127,7 @@ DEFINE_EXTERN_TASK(wriggle_slave_follow) {
WriggleSlave *slave = TASK_BIND(ARGS.slave);
Boss *boss = NOT_NULL(ENT_UNBOX(ARGS.boss));
MoveParams move = move_towards(0, 0.03);
MoveParams move = move_towards(0, 0, 0.03);
cmplx dir = cdir(ARGS.rot_initial);
cmplx r = cdir(ARGS.rot_speed);