From 453519b4abe37ecfa6863266352b6983b8c9ec9a Mon Sep 17 00:00:00 2001 From: Rob Pearce Date: Sun, 9 Nov 2008 21:18:14 +0000 Subject: [PATCH] Fixed bug where wings displayed in wrong positino if you died while swimming Started redrawing slug --- data/sprites/slug.png | Bin 1136 -> 1516 bytes data/sprites/slugjump.png | Bin 1463 -> 1652 bytes data/sprites/slugwalk.png | Bin 1237 -> 1524 bytes data/world1/level99.dat | 3 +++ rc.c | 5 +++++ 5 files changed, 8 insertions(+) diff --git a/data/sprites/slug.png b/data/sprites/slug.png index 0c3914c11be233620413b203641866c19ca0c1e8..f0b38dde0efb50edb56efbacf93a1d17d77a207a 100644 GIT binary patch delta 1471 zcmV;w1wi`n2Ii!6}O>MTC# zcaF|?e?B3l~_mwT;q8PMDlp(07lOM zTYhq^h zsJH)qgN3^9SVGJJpUaf~l2Yn~_ggIcdlPPRGX|mn`kX!;WlpEYxgc) zyT4;}{l;5=+wBN>%9iq6x$Iw@ot=Egdi}!7l_Pr> zoM-kg^7geA^-17&F8*@vWM#BuuU{_>h3XlNNcfa+G^d~?6 zh53XT=75vHDT!Hda!w&tsj$)vp)x8&CC78FT%4@ihxYZm zFPa0}ng^fX)|_9c7Ps!4_U&zU>wLXnf3oiVd!tgkw)v;?pIJ#W)6_u+r&84Ag*iLx zgk$3epPL#q-+duZy00`_oXq8no1a=>u)KzJ99++%IG&L-gQC)dxqJ}DU))t)+t8x0 zrKFC$^rPSG`0>Rm;`-|N_3NwSpZ)#!6_&nZ+d`kW1x6a30UrQw0?U8_G~oW*f89@s zYbnZPYDkX}eFye`QI~S+3*5zV80^mYZ;UDy&(yUCq{Jy<?fvKrRb7^eC-&y$d0b>TC@%)lCYUTuF%?yu-hq5jLi`>e*%K`fDdD64;6ltQ7M&=Zr)kujl+}N7}xZ7);aN& zC&TgO>zAhweHDB8cB?a8l(l-$Byq6<);?=&Oh$@^;qI6e~JI(!7q$b z?*V|FIPM?&m@iucE36$^C>x{@!4N}nE zXyf`W)kINKDXx}`!an`YkkY<+x5qkO&M?Zv1AoiHUsG#70Xb=*Ta6s4|f0AI6WgxXc`z3nagf!LQ*aRCLY9)^2Hg(Vz3W4O5yU`Y#m zra&&IaZ*L8TB6Zt(+P)Y+re9Z7*)62zEGQ*{Ww_cGcTRx)?Y5MyOKu-F+&YmYDkj| zBL#7)5g6jcpoIV=e|bMoFV09bpbXdo9GefLjHnTjHyPm|quA<^CK*adX6vQqj>Ai5 zPkryTtN)p7*2I`kvlGe7@7*?cyQ6YPvl)#tT7yI?OSp}GW(SEDy$pn9BOE8LO;4-_ zmVN1?Sp9Y*O0O0Rt}{q=_2D43-fs`%#z+O5BV~rl*n>LCCC delta 1115 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 diff --git a/data/sprites/slugwalk.png b/data/sprites/slugwalk.png index 9310c1aa000ee65ec94aa2dae79a413724fa6dc3..5bf2ae2112defdc4e4bbc52a64273ac6180c734d 100644 GIT binary patch delta 1479 zcmV;&1vvWE3G@q)Bo78+OGiWi_y7_B5^Wr&wUHqoe+vm091=9f)0qGO1%XLKK~zY` zt(0wOop%|=fB*mUa-Q>+gI8y1qbYcb7COiZ(!lk@tV=Q-zj|NCh}Q4yr~*BkEZ z$8~XEe?m&h-I!-iFRdzg-cLjzH2rF+Q20f!@9nv6&wlB5>jA*&`6EUtotic@xvDgI z9>k0$gt#jJ(}irq=?Ck3O{Zt+`cg)dPxwJ7;zZf!9ywG0{nZ<4x|o{}V|6x&)t5~x z{qopE<@6ZtxdzGX}S4p`B4CIeXDf+hrd03Y;iF_8?5O^wPt51 zolxG};aBJHdDa{)J`_gk+exQ|F_=vTW+wEgWe=53-1}OueiPu~(%Q?jb03~BWo9cA zNv-is!Wb>^&I;fAjX<597|!wFbm9K?e_!vczHfP)*mVK8P?w|{4g6w}FgyPi{AK;0 zBlxa>$KqPO!Eo^;pnwE0fob4^i2A31OTfn^YR0gPOc;kk3nR>dEShQmG^lrok{;ec zYrb@Rl+4&9Td%&(FCQp#qm^PoZ?-8ALuH6N}#%lFWK2r(g}x@0KouQ3pe*8ZxshR_ z!w}sth*Uzbw~c*mm(+>lE2VM_G0UxE;LQbddnl~2DJA($XmBbTo;*Y;vLlK zHElu!M!kundf0c`=!M%f4qfzS$k@OHZmo^o>Mxb2A#cd2>PANCNa?8We+rU{#njSd z|GqPiJq_}2_TgS1Ku^i|$@W28Xu81ec<92QbH~PrH&F=)34z_iZuSY#N!438j)CKP z3@waMuRBODCR5B{=1dAfjEZ8~9p8DYy3hySc~hH`c&$i$>NQD@-oDv~b@i0FWD-jh3gIIejn(Ao>Y7 zXjJWpckGA*JE9ptGm=yTg%^RB2;y9xZaW|h6G9=mw(qdh@abZZf3gg84a&oL`iC8= zP4{La5Zu|Vy7t?f7tDdF_g+s1hWUyShxnBWaV*SZMZW2 z9)R}AFFp6_t%LoGf5k!$uhV1S@!oL#Xr<8$WUL9Z=0tiYNJKXRq3M_?w%R_8u1}a~ z1PT%awSGh_BzCOm`XRMmL{Dh+{6G(t{AiTPoSc{%zkcrGkN>4E^|e30Ny|>;m5rN; znP>wQQ`o>G|E-Qaq)O+~biIfm0b&KZ04vqsa>CSl%l8K@EzOlmrH8T8rlgV2=YOps h4?p#d7ys?vKLB{kxjLE?pXdMp002ovPDHLkV1nPe@EiaD delta 1217 zcmV;y1U~!p3)KmbB!3BTNLh0L03N~s03N~tZqRi;00007bV*G`2iOV;1q~_m)<**X z00eYNL_t(Y$F-AdY*Pgk$N%@yc3ofVW9u#5t9x}!_C)qzMA;xRL{M}%;v~c@MvcUv zX2uv$iHa|bCgX#NB2lNyTnK6)@(2uxC^9y1gABI8x|OZ3m4CK(?d|Qo?Y(|58Vtk_ z#GT}PIscQK-#PgokR*wP%BMFrE06qefVh*E;N#f-$nw=B7AV5uFx1iDv4eYe_w4G} zn0c$__j|FesiHM7>+e}G08M&2rUQ{LMkZ&*SdVA0V`bG7JDzDL`8bEoE2`FeSbo35 zS=dT16hJ~qAb&U0@Rc>wjFZD-l2NDo#$ue__U(=>uT!G9*KAZB+xcbzxnLL2YIT?n zL@+WrgVL&s-3clAy@EyqlSv+Xs5US6{ZBTpg{n|ZkPF8E0BC8ffp5x%XE!WaZ%+k& zEZejR>6Q}ctjr%|w6E%an|`u$)g9|c&J3Znssi;btAFnEyMnl|Z$EzP+KtJxeTShc z#9e#fyB%UDa@40PS8Z_k6}1$jl9+xNuPGe%1_F*L_pEkFgA)p4HgXLeZ{qm&=2UNsBk^B@&-8wbo{p7!Dr+pV(I9C|OPdKU#$n|2sC?js zmV3K8pHh0gUi7vvJ1`&N%ST-|wc&XlGv_aY55+*MvQtda{ci}tAsGPZ?#?y<$OS-M zzc@)+^px^YTiKYxW;rY-<*O8gPxblPNQPNhDu3$`mQZg1|FZY=H0EPGoUI(LjQYWo z6l|A<2dXPr|Ah~?j=6`ft{4moSYDowG$Ms_zfQnW2BaD7{bK6pOGNXBC*?k0cuboCS~%pjzcW-y~kSh6tsCWMwexng`E` z@PAQiG?dyA8oQCjOJvsNkN^jh0h$2RCLMyVFqG52n8`Z+ievdpU`iSQ0K{8$4gi45 zYIiuz>Q`B}@3Eq=$E;IRurM0fA6*9|65uArAp~z?W^f7-C~(5dBMAal#sn%Uz^tKB zK_%evMKQvrz*r2(EXqc}A3}%|V6~d&ihmpHpUle1JnC$D9wx^A7eI4O2>>8XZy{DE zXXP(_DOJ0PBmpHMArci35mSgO(}x40XyxDAs|XpF!otu}16^IXC<7A5 zlhclimbing = B_FALSE; + player->swimming = B_FALSE; + player->slamming = B_FALSE; + player->netting = B_FALSE; // kill mask sprite if (mask) { @@ -1327,6 +1331,7 @@ void die(sprite_t *s) { /* lose a life */ player->lives--; + /* play sound */ playfx(FX_DIE);