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

stage1: fix move_towards deprecation warnings

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

2
src/stages/stage1/nonspells/boss_nonspell_1.c
View file

@ -16,7 +16,7 @@
DEFINE_EXTERN_TASK(stage1_boss_nonspell_1) {
Boss *boss = INIT_BOSS_ATTACK(&ARGS);
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);
BEGIN_BOSS_ATTACK(&ARGS);
for(;;) {

2
src/stages/stage1/nonspells/boss_nonspell_2.c
View file

@ -115,7 +115,7 @@ TASK(spiralshot, {
DEFINE_EXTERN_TASK(stage1_boss_nonspell_2) {
Boss *boss = INIT_BOSS_ATTACK(&ARGS);
boss->move = move_towards(VIEWPORT_W/2.0 + 100.0*I, 0.02);
boss->move = move_from_towards(boss->pos, VIEWPORT_W/2.0 + 100.0*I, 0.02);
BEGIN_BOSS_ATTACK(&ARGS);
for(;;) {

4
src/stages/stage1/nonspells/midboss_nonspell_1.c
View file

@ -91,9 +91,9 @@ TASK(make_snowflake, {
DEFINE_EXTERN_TASK(stage1_midboss_nonspell_1) {
Boss *boss = INIT_BOSS_ATTACK(&ARGS);
boss->move = move_towards(CMPLX(VIEWPORT_W/2, 200), 0.02);
boss->move = move_from_towards(boss->pos, CMPLX(VIEWPORT_W/2, 200), 0.02);
BEGIN_BOSS_ATTACK(&ARGS);
boss->move = move_stop(0.8);
boss->move = move_dampen(boss->move.velocity, 0.8);
int flake_spawn_interval = difficulty_value(11, 10, 9, 8);
int flakes_per_burst = difficulty_value(3, 5, 7, 9);

4
src/stages/stage1/spells/crystal_blizzard.c
View file

@ -65,7 +65,7 @@ TASK(cirno_frostbolt, { cmplx pos; cmplx vel; }) {
DEFINE_EXTERN_TASK(stage1_spell_crystal_blizzard) {
Boss *boss = INIT_BOSS_ATTACK(&ARGS);
boss->move = move_towards(VIEWPORT_W / 2.0 + 300 * I, 0.1);
boss->move = move_from_towards(boss->pos, VIEWPORT_W / 2.0 + 300 * I, 0.1);
BEGIN_BOSS_ATTACK(&ARGS);
int frostbolt_period = difficulty_value(4, 3, 2, 1);
@ -80,7 +80,7 @@ DEFINE_EXTERN_TASK(stage1_spell_crystal_blizzard) {
INVOKE_SUBTASK(common_charge, boss->pos, RGBA(0.5, 0.6, 2.0, 0.0), charge_time, .sound = COMMON_CHARGE_SOUNDS);
WAIT(charge_time);
boss->move = move_towards_power(global.plr.pos, 1, 0.1);
boss->move = move_towards_exp(boss->move.velocity, global.plr.pos, 1, 0.1);
for(int t = 0; t < 370; ++t) {
play_sfx_loop("shot1_loop");

2
src/stages/stage1/spells/crystal_rain.c
View file

@ -80,7 +80,7 @@ DEFINE_EXTERN_TASK(stage1_spell_crystal_rain) {
BEGIN_BOSS_ATTACK(&ARGS);
INVOKE_SUBTASK(crystal_rain_drops);
boss->move = move_towards_power(boss->pos, 0.1, 0.5);
boss->move = move_towards_exp(boss->move.velocity, boss->pos, 0.1, 0.5);
for(;;) {
WAIT(20);

2
src/stages/stage1/spells/icicle_cascade.c
View file

@ -39,7 +39,7 @@ TASK(cirno_icicle, { cmplx pos; cmplx vel; }) {
DEFINE_EXTERN_TASK(stage1_spell_icicle_cascade) {
Boss *boss = INIT_BOSS_ATTACK(&ARGS);
boss->move = move_towards(VIEWPORT_W / 2.0 + 120.0*I, 0.01);
boss->move = move_from_towards(boss->pos, VIEWPORT_W / 2.0 + 120.0*I, 0.01);
BEGIN_BOSS_ATTACK(&ARGS);
int icicle_interval = difficulty_value(30, 22, 16, 8);

2
src/stages/stage1/spells/perfect_freeze.c
View file

@ -41,7 +41,7 @@ DEFINE_EXTERN_TASK(stage1_spell_perfect_freeze) {
BEGIN_BOSS_ATTACK(&ARGS);
for(;;) {
boss->move = move_towards(VIEWPORT_W/2.0 + 100.0*I, 0.04);
boss->move = move_towards(boss->move.velocity, VIEWPORT_W/2.0 + 100.0*I, 0.04);
common_charge(40, &boss->pos, 0, RGBA(1.0, 0.5, 0.0, 0));
int n = global.diff;

6
src/stages/stage1/spells/snow_halation.c
View file

@ -75,7 +75,7 @@ TASK(halation_orb, {
.pos = ARGS.pos[0],
.max_viewport_dist = 200,
.flags = PFLAG_NOCLEAR | PFLAG_NOCOLLISION,
.move = move_towards(ARGS.pos[2], 0.1),
.move = move_from_towards(ARGS.pos[0], ARGS.pos[2], 0.1),
));
halation_color(&orb->color, 0);
@ -142,7 +142,7 @@ TASK(halation_orb, {
TASK(halation_chase, { BoxedBoss boss; }) {
Boss *boss = TASK_BIND(ARGS.boss);
boss->move = move_towards(global.plr.pos, 0.05);
boss->move = move_from_towards(boss->pos, global.plr.pos, 0.05);
for(;;) {
aniplayer_queue(&boss->ani, "(9)", 0);
boss->move.attraction_point = global.plr.pos;
@ -152,7 +152,7 @@ TASK(halation_chase, { BoxedBoss boss; }) {
DEFINE_EXTERN_TASK(stage1_spell_snow_halation) {
Boss *boss = INIT_BOSS_ATTACK(&ARGS);
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);
BEGIN_BOSS_ATTACK(&ARGS);
cmplx center;

18
src/stages/stage1/timeline.c
View file

@ -22,7 +22,7 @@
TASK(burst_fairy, { BoxedEnemy e; cmplx target_pos; cmplx exit_dir; }) {
Enemy *e = TASK_BIND(ARGS.e);
e->move = move_towards(ARGS.target_pos, 0.03);
e->move = move_from_towards(e->pos, ARGS.target_pos, 0.03);
WAIT(difficulty_value(120, 80, 60, 60));
@ -160,7 +160,7 @@ TASK(sinepass_swirl, { cmplx pos; cmplx vel; cmplx svel; }) {
TASK(circle_fairy, { cmplx pos; cmplx target_pos; }) {
Enemy *e = TASK_BIND(espawn_fairy_red(ARGS.pos, ITEMS(.power = 2)));
e->move = move_towards(ARGS.target_pos, 0.005);
e->move = move_from_towards(e->pos, ARGS.target_pos, 0.005);
e->move.retention = 0.8;
WAIT(60);
@ -226,7 +226,7 @@ TASK(drop_swirl, { cmplx pos; cmplx vel; cmplx accel; }) {
TASK(multiburst_fairy, { BoxedEnemy e; cmplx target_pos; cmplx exit_accel; }) {
Enemy *e = TASK_BIND(ARGS.e);
e->move = move_towards(ARGS.target_pos, 0.05);
e->move = move_from_towards(e->pos, ARGS.target_pos, 0.05);
WAIT(difficulty_value(120, 60, 60, 60));
@ -276,7 +276,7 @@ TASK(instantcircle_fairy_shoot, { BoxedEnemy e; int cnt; double speed; double bo
TASK(instantcircle_fairy, { cmplx pos; cmplx target_pos; cmplx exit_accel; }) {
Enemy *e = TASK_BIND(espawn_big_fairy(ARGS.pos, ITEMS(.points = 4, .power = 2)));
e->move = move_towards(ARGS.target_pos, 0.04);
e->move = move_from_towards(e->pos, ARGS.target_pos, 0.04);
BoxedEnemy be = ENT_BOX(e);
INVOKE_TASK_DELAYED(75, instantcircle_fairy_shoot, be,
@ -318,7 +318,7 @@ TASK(waveshot, { cmplx pos; real angle; real spread; real freq; int shots; int i
TASK(waveshot_fairy, { cmplx pos; cmplx target_pos; cmplx exit_accel; }) {
Enemy *e = TASK_BIND(espawn_big_fairy(ARGS.pos, ITEMS(.points = 4, .power = 2)));
e->move = move_towards(ARGS.target_pos, 0.03);
e->move = move_from_towards(e->pos, ARGS.target_pos, 0.03);
WAIT(60);
@ -344,7 +344,7 @@ TASK(waveshot_fairy, { cmplx pos; cmplx target_pos; cmplx exit_accel; }) {
TASK(explosion_fairy, { cmplx pos; cmplx target_pos; cmplx exit_accel; }) {
Enemy *e = TASK_BIND(espawn_huge_fairy(ARGS.pos, ITEMS(.points = 8)));
e->move = move_towards(ARGS.target_pos, 0.06);
e->move = move_from_towards(e->pos, ARGS.target_pos, 0.06);
WAIT(40);
common_charge(60, &e->pos, 0, RGBA(1.0, 0, 0.2, 0));
@ -574,13 +574,13 @@ TASK(waveshot_fairies, { int duration; }) {
TASK_WITH_INTERFACE(midboss_intro, BossAttack) {
Boss *boss = INIT_BOSS_ATTACK(&ARGS);
BEGIN_BOSS_ATTACK(&ARGS);
boss->move = move_towards(VIEWPORT_W/2.0 + 200.0*I, 0.035);
boss->move = move_from_towards(boss->pos, VIEWPORT_W/2.0 + 200.0*I, 0.035);
}
TASK_WITH_INTERFACE(midboss_flee, BossAttack) {
Boss *boss = INIT_BOSS_ATTACK(&ARGS);
BEGIN_BOSS_ATTACK(&ARGS);
boss->move = move_towards(-250 + 30 * I, 0.02);
boss->move = move_from_towards(boss->pos, -250 + 30 * I, 0.02);
}
TASK(spawn_midboss) {
@ -656,7 +656,7 @@ TASK(tritoss_fairy, { cmplx pos; cmplx velocity; cmplx end_velocity; }) {
TASK(boss_appear, { BoxedBoss boss; }) {
Boss *boss = NOT_NULL(ENT_UNBOX(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) {