Workaround skip_background_anim brokenness

This commit is contained in:
Andrei Alexeyev 2018-04-18 02:32:50 +03:00
parent c0ee72d58b
commit 73901b004a
No known key found for this signature in database
GPG key ID: 363707CD4C7FE8A4
4 changed files with 10 additions and 6 deletions

View file

@ -1371,7 +1371,7 @@ void stage3_events(void) {
AT(0) {
stage_start_bgm("stage3");
// stage3_skip(env_get("STAGE3_TEST", 0));
stage3_skip(env_get("STAGE3_TEST", 0));
}
FROM_TO(160, 300, 10) {

View file

@ -435,7 +435,7 @@ void kurumi_redspike(Boss *b, int time) {
AT(499) {
aniplayer_queue(&b->ani, "main", 0);
}
FROM_TO_INT(80, 500, 40,200,2+2*(global.diff == D_Hard)) {
tsrand_fill(2);
complex offset = 100*afrand(0)*cexp(2.0*I*M_PI*afrand(1));
@ -830,7 +830,7 @@ void kurumi_blowwall(Boss *b, int time) {
AT(0) {
aniplayer_queue(&b->ani,"muda",0);
}
AT(50)
bwlaser(b, 0.4, 1);
@ -1426,7 +1426,7 @@ void stage4_events(void) {
AT(0) {
stage_start_bgm("stage4");
// stage4_skip(env_get("STAGE4_TEST", 0));
stage4_skip(env_get("STAGE4_TEST", 0));
}
AT(70) {

View file

@ -563,7 +563,7 @@ void iku_bolts2(Boss *b, int time) {
aniplayer_queue(&b->ani, flip_laser ? "dashdown_left" : "dashdown_right", 1);
aniplayer_queue(&b->ani, "main", 0);
create_lasercurve3c(creal(global.plr.pos), 100, 200, rgb(0.3,1,1), bolts2_laser, global.plr.pos, flip_laser*2-1, global.diff);
play_sound_ex("laser1", 0, false);
play_sound_ex("laser1", 0, false);
}
FROM_TO_SND("shot1_loop", 0, 400, 5-global.diff)
@ -1133,7 +1133,7 @@ void stage5_events(void) {
AT(0) {
stage_start_bgm("stage5");
// stage5_skip(env_get("STAGE5_TEST", 0));
stage5_skip(env_get("STAGE5_TEST", 0));
}
FROM_TO(60, 150, 15) {

View file

@ -148,6 +148,10 @@ vec3 **single3dpos(vec3 q, float maxrange, vec3 p) {
}
void skip_background_anim(Stage3D *s3d, void (*update_func)(void), int frames, int *timer, int *timer2) {
// FIXME: This function is broken.
// It must not modify the timers if frames <= 0.
// Fix this when we no longer need v1.2 compat.
int targetframes = *timer + frames;
while(++(*timer) < targetframes) {