From fb322f7e7bc41c49cdf4b8afaf066a3f73e8bb89 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sergio=20Valor=20Mart=C3=ADnez?= Date: Sun, 21 Aug 2022 08:58:53 +0200 Subject: [PATCH] Desactivada la inmunidad. Corregido el error tipografico en el marcador. Arreglado el audio --- media/gfx/hud.png | Bin 3270 -> 1352 bytes source/volcano.cpp | 4 ++-- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/media/gfx/hud.png b/media/gfx/hud.png index 74f4be1fe2b235d1d78060d8f31dfa03c3f1e63b..d99a835529eec67ca550df02b4062f5e70914124 100644 GIT binary patch delta 1321 zcma)&YdF&j0LK5w<;bnmMVD!Na(Z+zgs0;!At6MH&2j0et;m{7VwnG^=k&yplFPx) z5^6e(*u{x0Q#~`bu$8Tirju~8XJ~($htW=bJ0H*c;r;M?f1h67F24C)7tq)+G$W6%EIgN20SCfrgU5A z?Y+>)PcdQ7b^sm^r7>ZvUsM8-3LrJ)>ozl2nLHxojSl)C?E{w&f$du2XH%tk#B2jGN z#?sz9J;|VOV6@RY5)0!4KTSPa`FfH2rvN(`%Ce@ZE|6IT^*~;@1v$I2IB;_bvw3hx zr138~W6Z@hqQifX)|=^K1V+2fdg|(fp}A2yq>pbr`+{;5kzO? zStxcs6}PLSWfaWPN!?B=E;8HPM~!SHwtdV*neIl;^yt&*yiokNN#*pYN@>3yaaXa` z6?gZ9L#|8*S?2dQZI!N#CZOG|(2JQ$z)StWQ|p;v%frl@Kk)1OZ~L4 zkE{dQ0~~IMx*cun@Zoe5_Vp-K=Q+t?+wpr3HO*8qFYOGA<94G(W7V|c)u8EM`V_E? z=Dx%X&jrjNy&0G|cLcLg{&OF1Sn7RWwm{X;a(MSG&&eU77W98}r=j&FUl;ht0Pli#fA_{{Q7BX4pfdumwmlckF$STLuj&^{IFDVUChSU64H9&C zwck04Fb7rZ&=(80b62F;9m)46{Pk&ONHXPZf?gQUdLZ=qp7(L|O(4lu8QcE1=6Nkj}kh*ay1P~T_bPHN`VUficg#^FIDffFx zi;AAYYM!i=4fRnrnB1gkT9IF~L5Ox@B8@mKA2E3_U%;Qwdef7Hln Xc*fo#=XjXA>313$92wMcJf-Acg|4Ma literal 3270 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 diff --git a/source/volcano.cpp b/source/volcano.cpp index c1131c2..7bdbd2c 100644 --- a/source/volcano.cpp +++ b/source/volcano.cpp @@ -874,7 +874,7 @@ void IniPlayer() player.jump_pressed_now = false; player.jump_pressed_before = false; player.standing = true; - player.invulnerable = true; + player.invulnerable = false; player.jumpforce = 10; player.active_animation = 0; player.enabled = true; @@ -2008,7 +2008,7 @@ int main(int argc, char *args[]) setExecutablePath(args[0]); // Inicializa el audio - JA_Init(22050, AUDIO_S16SYS, 2); + JA_Init(44100, AUDIO_S16, 2); allocatePointers();