1
0
Fork 0
mirror of https://github.com/doukutsu-rs/doukutsu-rs synced 2025-04-15 10:14:24 +00:00

Reduce flickering and whimsical star fix

This commit is contained in:
dawnDus 2022-01-28 19:44:03 -05:00
parent 9f530ce6a5
commit ff5cf7359b
No known key found for this signature in database
GPG key ID: 972AABDE81848F21
2 changed files with 8 additions and 7 deletions

View file

@ -53,16 +53,17 @@ impl GameEntity<(&Player, &mut BulletManager)> for WhimsicalStar {
state: &mut SharedGameState, state: &mut SharedGameState,
(player, bullet_manager): (&Player, &mut BulletManager), (player, bullet_manager): (&Player, &mut BulletManager),
) -> GameResult { ) -> GameResult {
if !player.equip.has_whimsical_star() { if !self.equipped && player.equip.has_whimsical_star() {
return Ok(()); for iter in 0..=2 {
} else if !self.equipped && player.equip.has_whimsical_star() {
for iter in 0..2 {
self.star[iter].x = player.x; self.star[iter].x = player.x;
self.star[iter].y = player.y; self.star[iter].y = player.y;
} }
self.equipped = true; self.equipped = true;
} else { }
self.equipped = player.equip.has_whimsical_star();
if !player.equip.has_whimsical_star() {
self.equipped = false;
return Ok(());
} }
self.star_count = player.stars; self.star_count = player.stars;

View file

@ -848,7 +848,7 @@ impl GameScene {
batch, batch,
); );
if npc.anim_num < 2 { if npc.anim_num < 2 && npc.direction == Direction::Right {
self.draw_light( self.draw_light(
interpolate_fix9_scale( interpolate_fix9_scale(
npc.prev_x - self.frame.prev_x, npc.prev_x - self.frame.prev_x,