diff --git a/src/stage.h b/src/stage.h index ab5a1d1c..52136e1c 100644 --- a/src/stage.h +++ b/src/stage.h @@ -21,6 +21,10 @@ #include "dynarray.h" #include "stageinfo.h" +#define MODERNIZE_THIS_FILE_AND_REMOVE_ME \ + PRAGMA(message "This file needs to be modernized") \ + DIAGNOSTIC(ignored "-Wdeprecated-declarations") + /* taisei's strange macro language. * * sorry, I guess it is bad style, but I hardcode everything and in that case diff --git a/src/stages/corotest.c b/src/stages/corotest.c index 93fbe83a..552f555f 100644 --- a/src/stages/corotest.c +++ b/src/stages/corotest.c @@ -13,6 +13,8 @@ #include "global.h" #include "common_tasks.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + DIAGNOSTIC(ignored "-Wunused-variable") TASK(laserproj_death, { Projectile *p; }) { diff --git a/src/stages/extra.c b/src/stages/extra.c index 7030b62f..949de818 100644 --- a/src/stages/extra.c +++ b/src/stages/extra.c @@ -18,6 +18,8 @@ #include "stagetext.h" #include "stageutils.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + TASK(glider_bullet, { cmplx pos; double dir; double spacing; int interval; }) { diff --git a/src/stages/stage3.c b/src/stages/stage3.c index 876794fb..20144de0 100644 --- a/src/stages/stage3.c +++ b/src/stages/stage3.c @@ -17,8 +17,7 @@ #include "util/glm.h" #include "portrait.h" -PRAGMA(message "Remove when this stage is modernized") -DIAGNOSTIC(ignored "-Wdeprecated-declarations") +MODERNIZE_THIS_FILE_AND_REMOVE_ME /* * See the definition of AttackInfo in boss.h for information on how to set up the idmaps. diff --git a/src/stages/stage3_events.c b/src/stages/stage3_events.c index 037513b2..990a5c61 100644 --- a/src/stages/stage3_events.c +++ b/src/stages/stage3_events.c @@ -15,8 +15,7 @@ #include "enemy.h" #include "common_tasks.h" -PRAGMA(message "Remove when this stage is modernized") -DIAGNOSTIC(ignored "-Wdeprecated-declarations") +MODERNIZE_THIS_FILE_AND_REMOVE_ME TASK(boss_appear_stub, NO_ARGS) { log_warn("FIXME"); diff --git a/src/stages/stage4/kurumi.c b/src/stages/stage4/kurumi.c index a1b875ce..c98a2d51 100644 --- a/src/stages/stage4/kurumi.c +++ b/src/stages/stage4/kurumi.c @@ -12,6 +12,8 @@ #include "global.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + static void kurumi_global_rule(Boss *b, int time) { // FIXME: avoid running this every frame! diff --git a/src/stages/stage4/nonspells/boss_nonspell_1.c b/src/stages/stage4/nonspells/boss_nonspell_1.c index 5b9e06fd..75c0ec3f 100644 --- a/src/stages/stage4/nonspells/boss_nonspell_1.c +++ b/src/stages/stage4/nonspells/boss_nonspell_1.c @@ -13,6 +13,8 @@ #include "global.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + void kurumi_sbreaker(Boss *b, int time) { if(time < 0) return; diff --git a/src/stages/stage4/nonspells/boss_nonspell_2.c b/src/stages/stage4/nonspells/boss_nonspell_2.c index e4837311..d28e2347 100644 --- a/src/stages/stage4/nonspells/boss_nonspell_2.c +++ b/src/stages/stage4/nonspells/boss_nonspell_2.c @@ -13,6 +13,8 @@ #include "global.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + void kurumi_breaker(Boss *b, int time) { int t = time % 400; int i; diff --git a/src/stages/stage4/spells/animate_wall.c b/src/stages/stage4/spells/animate_wall.c index 183a64df..46e924ac 100644 --- a/src/stages/stage4/spells/animate_wall.c +++ b/src/stages/stage4/spells/animate_wall.c @@ -13,6 +13,8 @@ #include "global.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + static int aniwall_bullet(Projectile *p, int t) { if(t < 0) { return ACTION_ACK; diff --git a/src/stages/stage4/spells/blow_the_walls.c b/src/stages/stage4/spells/blow_the_walls.c index 6e6e8146..c23dd098 100644 --- a/src/stages/stage4/spells/blow_the_walls.c +++ b/src/stages/stage4/spells/blow_the_walls.c @@ -12,6 +12,8 @@ #include "global.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + static int blowwall_slave(Enemy *e, int t) { float re, im; diff --git a/src/stages/stage4/spells/gate_of_walachia.c b/src/stages/stage4/spells/gate_of_walachia.c index 8932586a..ed107357 100644 --- a/src/stages/stage4/spells/gate_of_walachia.c +++ b/src/stages/stage4/spells/gate_of_walachia.c @@ -13,6 +13,8 @@ #include "global.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + static int kurumi_burstslave(Enemy *e, int t) { TIMER(&t); AT(EVENT_BIRTH) diff --git a/src/stages/stage4/spells/red_spike.c b/src/stages/stage4/spells/red_spike.c index 0a03ba49..6e01493b 100644 --- a/src/stages/stage4/spells/red_spike.c +++ b/src/stages/stage4/spells/red_spike.c @@ -13,6 +13,8 @@ #include "global.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + static int kurumi_spikeslave(Enemy *e, int t) { TIMER(&t); AT(EVENT_BIRTH) diff --git a/src/stages/stage4/spells/vampiric_vapour.c b/src/stages/stage4/spells/vampiric_vapour.c index 1d36d4ae..24eb4fba 100644 --- a/src/stages/stage4/spells/vampiric_vapour.c +++ b/src/stages/stage4/spells/vampiric_vapour.c @@ -13,6 +13,7 @@ #include "global.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME static Projectile *vapor_particle(cmplx pos, const Color *clr) { return PARTICLE( diff --git a/src/stages/stage4/spells/vlads_army.c b/src/stages/stage4/spells/vlads_army.c index 96632148..19b8b3d0 100644 --- a/src/stages/stage4/spells/vlads_army.c +++ b/src/stages/stage4/spells/vlads_army.c @@ -13,6 +13,7 @@ #include "global.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME static void kurumi_extra_shield_pos(Enemy *e, int time) { double dst = 75 + 100 * fmax((60 - time) / 60.0, 0); diff --git a/src/stages/stage4/timeline.c b/src/stages/stage4/timeline.c index d5a73ae0..f606da4d 100644 --- a/src/stages/stage4/timeline.c +++ b/src/stages/stage4/timeline.c @@ -22,8 +22,7 @@ #include "common_tasks.h" #include "../stage6/elly.h" -PRAGMA(message "Remove when this stage is modernized") -DIAGNOSTIC(ignored "-Wdeprecated-declarations") +MODERNIZE_THIS_FILE_AND_REMOVE_ME TASK(boss_appear_stub, NO_ARGS) { log_warn("FIXME"); diff --git a/src/stages/stage5/background_anim.c b/src/stages/stage5/background_anim.c index e9b479dc..de56a613 100644 --- a/src/stages/stage5/background_anim.c +++ b/src/stages/stage5/background_anim.c @@ -14,6 +14,8 @@ #include "global.h" #include "stageutils.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + void stage5_update(void) { stage_3d_context.cam.aspect = STAGE3D_DEFAULT_ASPECT; // FIXME stage_3d_context.cam.near = 100; diff --git a/src/stages/stage5/iku.c b/src/stages/stage5/iku.c index 352cd553..0c15d8d9 100644 --- a/src/stages/stage5/iku.c +++ b/src/stages/stage5/iku.c @@ -14,6 +14,8 @@ #include "common_tasks.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + void iku_lightning_particle(cmplx pos, int t) { if(!(t % 5)) { char *part = frand() > 0.5 ? "lightning0" : "lightning1"; diff --git a/src/stages/stage5/nonspells/boss_nonspell_1.c b/src/stages/stage5/nonspells/boss_nonspell_1.c index a97efd53..82599525 100644 --- a/src/stages/stage5/nonspells/boss_nonspell_1.c +++ b/src/stages/stage5/nonspells/boss_nonspell_1.c @@ -10,6 +10,8 @@ #include "nonspells.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + void iku_bolts(Boss *b, int time) { int t = time % 400; TIMER(&t); diff --git a/src/stages/stage5/nonspells/boss_nonspell_2.c b/src/stages/stage5/nonspells/boss_nonspell_2.c index 3f717d99..e5da1f2c 100644 --- a/src/stages/stage5/nonspells/boss_nonspell_2.c +++ b/src/stages/stage5/nonspells/boss_nonspell_2.c @@ -10,6 +10,8 @@ #include "nonspells.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + static cmplx bolts2_laser(Laser *l, float t) { if(t == EVENT_BIRTH) { l->shader = r_shader_get_optional("lasers/iku_lightning"); diff --git a/src/stages/stage5/nonspells/boss_nonspell_3.c b/src/stages/stage5/nonspells/boss_nonspell_3.c index efe6fb4b..f5671f6d 100644 --- a/src/stages/stage5/nonspells/boss_nonspell_3.c +++ b/src/stages/stage5/nonspells/boss_nonspell_3.c @@ -10,6 +10,8 @@ #include "nonspells.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + void iku_bolts3(Boss *b, int time) { int t = time % 400; TIMER(&t); diff --git a/src/stages/stage5/spells/artificial_lightning.c b/src/stages/stage5/spells/artificial_lightning.c index bb595034..ef2e6e13 100644 --- a/src/stages/stage5/spells/artificial_lightning.c +++ b/src/stages/stage5/spells/artificial_lightning.c @@ -10,6 +10,8 @@ #include "spells.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + static int zigzag_bullet(Projectile *p, int t) { if(t < 0) { return ACTION_ACK; diff --git a/src/stages/stage5/spells/atmospheric_discharge.c b/src/stages/stage5/spells/atmospheric_discharge.c index 92afe6d5..83967b03 100644 --- a/src/stages/stage5/spells/atmospheric_discharge.c +++ b/src/stages/stage5/spells/atmospheric_discharge.c @@ -10,6 +10,8 @@ #include "spells.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + void iku_atmospheric(Boss *b, int time) { if(time < 0) { GO_TO(b, VIEWPORT_W/2+200.0*I, 0.06); diff --git a/src/stages/stage5/spells/induction.c b/src/stages/stage5/spells/induction.c index eb1da2b4..434e6766 100644 --- a/src/stages/stage5/spells/induction.c +++ b/src/stages/stage5/spells/induction.c @@ -10,6 +10,8 @@ #include "spells.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + void iku_induction(Boss *b, int t) { // thwarf safespots cmplx ofs = global.diff > D_Normal ? 10*I : 0; diff --git a/src/stages/stage5/spells/natural_cathode.c b/src/stages/stage5/spells/natural_cathode.c index 804368f6..a5f72990 100644 --- a/src/stages/stage5/spells/natural_cathode.c +++ b/src/stages/stage5/spells/natural_cathode.c @@ -10,6 +10,8 @@ #include "spells.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + static cmplx cathode_laser(Laser *l, float t) { if(t == EVENT_BIRTH) { l->shader = r_shader_get_optional("lasers/iku_cathode"); diff --git a/src/stages/stage5/spells/overload.c b/src/stages/stage5/spells/overload.c index e083582c..ad5834f2 100644 --- a/src/stages/stage5/spells/overload.c +++ b/src/stages/stage5/spells/overload.c @@ -10,6 +10,8 @@ #include "spells.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + static Enemy* iku_overload_find_next_slave(cmplx from, double playerbias) { Enemy *nearest = NULL, *e; double dist, mindist = INFINITY; diff --git a/src/stages/stage5/spells/static_bomb.c b/src/stages/stage5/spells/static_bomb.c index 5a4edbac..014f0120 100644 --- a/src/stages/stage5/spells/static_bomb.c +++ b/src/stages/stage5/spells/static_bomb.c @@ -10,6 +10,8 @@ #include "spells.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + static int iku_explosion(Enemy *e, int t) { TIMER(&t) AT(EVENT_KILLED) { diff --git a/src/stages/stage5/timeline.c b/src/stages/stage5/timeline.c index fc685653..8c5d380d 100644 --- a/src/stages/stage5/timeline.c +++ b/src/stages/stage5/timeline.c @@ -13,6 +13,8 @@ #include "nonspells/nonspells.h" #include "spells/spells.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + TASK(boss_appear_stub, NO_ARGS) { log_warn("FIXME"); } diff --git a/src/stages/stage6/draw.c b/src/stages/stage6/draw.c index aae79924..d0e1e078 100644 --- a/src/stages/stage6/draw.c +++ b/src/stages/stage6/draw.c @@ -12,6 +12,8 @@ #include "global.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + static Stage6DrawData *stage6_draw_data; Stage6DrawData *stage6_get_draw_data(void) { diff --git a/src/stages/stage6/elly.c b/src/stages/stage6/elly.c index a8da471a..4604ca52 100644 --- a/src/stages/stage6/elly.c +++ b/src/stages/stage6/elly.c @@ -12,6 +12,8 @@ #include "elly.h" #include "draw.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + void scythe_common(Enemy *e, int t) { e->args[1] += cimag(e->args[1]); } diff --git a/src/stages/stage6/nonspells/boss_nonspell_1.c b/src/stages/stage6/nonspells/boss_nonspell_1.c index 9078c350..f6e9bc1a 100644 --- a/src/stages/stage6/nonspells/boss_nonspell_1.c +++ b/src/stages/stage6/nonspells/boss_nonspell_1.c @@ -10,6 +10,8 @@ #include "nonspells.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + void elly_frequency(Boss *b, int t) { TIMER(&t); Enemy *scythe; diff --git a/src/stages/stage6/nonspells/boss_nonspell_2.c b/src/stages/stage6/nonspells/boss_nonspell_2.c index 9dc047d9..fb67b586 100644 --- a/src/stages/stage6/nonspells/boss_nonspell_2.c +++ b/src/stages/stage6/nonspells/boss_nonspell_2.c @@ -10,6 +10,8 @@ #include "nonspells.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + void elly_frequency2(Boss *b, int t) { TIMER(&t); diff --git a/src/stages/stage6/nonspells/boss_nonspell_3.c b/src/stages/stage6/nonspells/boss_nonspell_3.c index 82d11548..fe17d7aa 100644 --- a/src/stages/stage6/nonspells/boss_nonspell_3.c +++ b/src/stages/stage6/nonspells/boss_nonspell_3.c @@ -11,6 +11,8 @@ #include "nonspells.h" #include "stagetext.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + void elly_paradigm_shift(Boss *b, int t) { if(global.stage->type == STAGE_SPELL) { GO_TO(b, BOSS_DEFAULT_GO_POS, 0.1) diff --git a/src/stages/stage6/nonspells/boss_nonspell_4.c b/src/stages/stage6/nonspells/boss_nonspell_4.c index c4919f36..39c9c404 100644 --- a/src/stages/stage6/nonspells/boss_nonspell_4.c +++ b/src/stages/stage6/nonspells/boss_nonspell_4.c @@ -10,6 +10,8 @@ #include "nonspells.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + static int baryon_nattack(Enemy *e, int t) { if(t < 0) return 1; diff --git a/src/stages/stage6/nonspells/boss_nonspell_5.c b/src/stages/stage6/nonspells/boss_nonspell_5.c index d6f7802c..8020ab7b 100644 --- a/src/stages/stage6/nonspells/boss_nonspell_5.c +++ b/src/stages/stage6/nonspells/boss_nonspell_5.c @@ -10,6 +10,8 @@ #include "nonspells.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + static int baryon_explode(Enemy *e, int t) { TIMER(&t); AT(EVENT_DEATH) { diff --git a/src/stages/stage6/spells/broglie.c b/src/stages/stage6/spells/broglie.c index d6583cdf..1d5c155b 100644 --- a/src/stages/stage6/spells/broglie.c +++ b/src/stages/stage6/spells/broglie.c @@ -12,6 +12,8 @@ #include "common_tasks.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + #define BROGLIE_PERIOD (420 - 30 * global.diff) static int broglie_particle(Projectile *p, int t) { diff --git a/src/stages/stage6/spells/eigenstate.c b/src/stages/stage6/spells/eigenstate.c index 23a13d35..5302542e 100644 --- a/src/stages/stage6/spells/eigenstate.c +++ b/src/stages/stage6/spells/eigenstate.c @@ -12,6 +12,8 @@ #include "common_tasks.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + static int eigenstate_proj(Projectile *p, int t) { if(t < 0) { return ACTION_ACK; diff --git a/src/stages/stage6/spells/forgotten.c b/src/stages/stage6/spells/forgotten.c index 26ce281f..c6787b47 100644 --- a/src/stages/stage6/spells/forgotten.c +++ b/src/stages/stage6/spells/forgotten.c @@ -12,6 +12,8 @@ #include "common_tasks.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + static int baryon_curvature(Enemy *e, int t) { int num = creal(e->args[2])+0.5; int odd = num&1; diff --git a/src/stages/stage6/spells/kepler.c b/src/stages/stage6/spells/kepler.c index b24a4e20..d2cbc4ac 100644 --- a/src/stages/stage6/spells/kepler.c +++ b/src/stages/stage6/spells/kepler.c @@ -12,6 +12,8 @@ #include "common_tasks.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + static int scythe_kepler(Enemy *e, int t) { if(t < 0) { scythe_common(e, t); diff --git a/src/stages/stage6/spells/lhc.c b/src/stages/stage6/spells/lhc.c index 1c3f6b43..18399d1e 100644 --- a/src/stages/stage6/spells/lhc.c +++ b/src/stages/stage6/spells/lhc.c @@ -12,6 +12,8 @@ #include "common_tasks.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + static void lhc_laser_logic(Laser *l, int t) { Enemy *e; diff --git a/src/stages/stage6/spells/maxwell.c b/src/stages/stage6/spells/maxwell.c index 40a13967..64542c0a 100644 --- a/src/stages/stage6/spells/maxwell.c +++ b/src/stages/stage6/spells/maxwell.c @@ -12,6 +12,8 @@ #include "common_tasks.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + static cmplx maxwell_laser(Laser *l, float t) { if(t == EVENT_BIRTH) { l->unclearable = true; diff --git a/src/stages/stage6/spells/newton.c b/src/stages/stage6/spells/newton.c index 419d91a0..e3c874f1 100644 --- a/src/stages/stage6/spells/newton.c +++ b/src/stages/stage6/spells/newton.c @@ -12,6 +12,8 @@ #include "common_tasks.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + static int scythe_newton(Enemy *e, int t) { if(t < 0) { scythe_common(e, t); diff --git a/src/stages/stage6/spells/ricci.c b/src/stages/stage6/spells/ricci.c index ffcc4097..a397015c 100644 --- a/src/stages/stage6/spells/ricci.c +++ b/src/stages/stage6/spells/ricci.c @@ -12,6 +12,8 @@ #include "common_tasks.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + /* !!! You are entering Akari danmaku code !!! */ #define SAFE_RADIUS_DELAY 300 #define SAFE_RADIUS_BASE 100 diff --git a/src/stages/stage6/spells/toe.c b/src/stages/stage6/spells/toe.c index cd8aa051..c1f54f10 100644 --- a/src/stages/stage6/spells/toe.c +++ b/src/stages/stage6/spells/toe.c @@ -12,6 +12,8 @@ #include "stagetext.h" #include "common_tasks.h" +MODERNIZE_THIS_FILE_AND_REMOVE_ME + #define LASER_EXTENT (4+1.5*global.diff-D_Normal) #define LASER_LENGTH 60 diff --git a/src/stages/stage6/stage6.c b/src/stages/stage6/stage6.c index e612564f..9202effb 100644 --- a/src/stages/stage6/stage6.c +++ b/src/stages/stage6/stage6.c @@ -19,8 +19,7 @@ #include "portrait.h" #include "common_tasks.h" -PRAGMA(message "Remove when this stage is modernized") -DIAGNOSTIC(ignored "-Wdeprecated-declarations") +MODERNIZE_THIS_FILE_AND_REMOVE_ME /* * See the definition of AttackInfo in boss.h for information on how to set up the idmaps. diff --git a/src/stages/stage6/timeline.c b/src/stages/stage6/timeline.c index 98922eb9..ae062f34 100644 --- a/src/stages/stage6/timeline.c +++ b/src/stages/stage6/timeline.c @@ -18,8 +18,7 @@ #include "common_tasks.h" -PRAGMA(message "Remove when this stage is modernized") -DIAGNOSTIC(ignored "-Wdeprecated-declarations") +MODERNIZE_THIS_FILE_AND_REMOVE_ME TASK(boss_appear_stub, NO_ARGS) { log_warn("FIXME");