X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=src%2Fobject%2Fexplosion.cpp;h=5a22fa78bb140a518b0bbd9fb580a2292ddfb21a;hb=b727f3551303f71d627c95d9f14b9b0c3f1c4a2c;hp=543ef2b3fdfad92193dcb9cc7aade13b40665004;hpb=f8a53829ebdb72bd7deffa1d249b71625e84a10a;p=supertux.git diff --git a/src/object/explosion.cpp b/src/object/explosion.cpp index 543ef2b3f..5a22fa78b 100644 --- a/src/object/explosion.cpp +++ b/src/object/explosion.cpp @@ -65,12 +65,10 @@ Explosion::explode() return; state = STATE_EXPLODING; - set_action("default", 1); //TODO: the less-threatening short_fuse explosion should look less-threatening + set_action(hurt ? "default" : "pop", 1); sprite->set_animation_loops(1); //TODO: this is necessary because set_action will not set "loops" when "action" is the default action - if (hurt) - sound_manager->play("sounds/explosion.wav", get_pos()); - else - sound_manager->play("sounds/firecracker.ogg", get_pos()); + sprite->set_angle(graphicsRandom.randf(0, 360)); // a random rotation on the sprite to make explosions appear more random + sound_manager->play(hurt ? "sounds/explosion.wav" : "sounds/firecracker.ogg", get_pos()); #if 0