[Supertux-Commit] r5465 - in trunk/supertux: data/images/creatures/mr_bomb src/badguy

sommer at millhouse.dreamhost.com sommer at millhouse.dreamhost.com
Tue May 13 14:15:30 PDT 2008


Author: sommer
Date: 2008-05-13 14:15:29 -0700 (Tue, 13 May 2008)
New Revision: 5465

Added:
   trunk/supertux/data/images/creatures/mr_bomb/ticking-0.png
   trunk/supertux/data/images/creatures/mr_bomb/ticking-1.png
   trunk/supertux/data/images/creatures/mr_bomb/ticking-2.png
   trunk/supertux/data/images/creatures/mr_bomb/ticking-3.png
Modified:
   trunk/supertux/data/images/creatures/mr_bomb/mr_bomb.sprite
   trunk/supertux/src/badguy/mrbomb.cpp
   trunk/supertux/src/badguy/mrbomb.hpp
Log:
MrBomb keeps walking while ticking


Modified: trunk/supertux/data/images/creatures/mr_bomb/mr_bomb.sprite
===================================================================
--- trunk/supertux/data/images/creatures/mr_bomb/mr_bomb.sprite	2008-05-13 19:14:53 UTC (rev 5464)
+++ trunk/supertux/data/images/creatures/mr_bomb/mr_bomb.sprite	2008-05-13 21:15:29 UTC (rev 5465)
@@ -26,15 +26,17 @@
 
  (action
   (name "ticking-left")
-  (fps 2.0)
-  (hitbox 3 8 31.8 31.8)
-  (images "exploding-left-0.png"
-          "exploding-left-1.png"))
+  (fps 10.0)
+  (hitbox 3 12 31.8 31.8)
+  (images "ticking-0.png"
+          "ticking-1.png"
+          "ticking-2.png"
+          "ticking-3.png"))
  
  (action
   (name "ticking-right")
-  (fps 2.0)
-  (hitbox 10 8 31.8 31.8)
+  (fps 10.0)
+  (hitbox 7 12 31.8 31.8)
   (mirror-action "ticking-left"))
  
 )

Added: trunk/supertux/data/images/creatures/mr_bomb/ticking-0.png
===================================================================
--- trunk/supertux/data/images/creatures/mr_bomb/ticking-0.png	                        (rev 0)
+++ trunk/supertux/data/images/creatures/mr_bomb/ticking-0.png	2008-05-13 21:15:29 UTC (rev 5465)
@@ -0,0 +1,25 @@
+‰PNG
+
+   
+IHDR   -   -   :âš   sRGB ®Îé   bKGD ÿ ÿ ÿ ½§“   	pHYs     šœ   tIMEØ
+2t	õ~   tEXtComment Created with The GIMPïd%n  «IDATXÃÍYkp\åy~¾ïœïœ³—#íê~[ÉŒÌE6ئ3\ÁtHa††»S»tRhÉLfz›Ì$£iè%ÄþÁƒC0ÁžNK’bÚ ˜.¾É–eYÖÕ’V^i¥½ï¹_¾þØÕÚÆbþ?:gçÓ™ç{Ïó>ïó¾øò,º¨>?uã—±´ŠÀ½aàZþ)¸¾ _þîwå˜ Ü*KhWÃfòIûÅ/ £@ ð9çÔœž^mÝœ•Þ½ä߃1Ìc±ôàpÏ}€ð€®%ÀýPäDZ«…®‘ñ±¼ê©†\µ«¿u'š,àà^¨™‚ßÈ íÝ	`e-°¦Z@äTü=qâͽJ»Êš”ë
+inQ?Ðÿ!œ­ÜÖãááÕ€îÛHÇ€¡À%ÿß ? (®âÏš6B©Ù¤,óŠ+ÇcõÉ*ý½Õ¶êhÛ°ñt÷m¡{â[v˜ßÊëGÂ/WÀ. ù/$ñ^‚{¾¾Åq6ã:/</o»ÖÐb¶¯f2¾iõi+Ï8ö™lî_ÖýwÁß· ÷¨ú̉¸õ;ßQÆÞ{ïzjÛ×Çiòm[ñÓrÝ9Ýu‡Y4:ðâА¹´ß4ò‹ÿ¸ÛN¥îMišÛe“óq["$$¬±&ôäÚ` ¿lQ`ãÖôžgøSÛ÷·ì8 jÀ`^=~ñì³âïž}öÚÂáÍmŠrGP–C‚$ \Ó„c°¸¶
+Ãq´ÓÜsÆqvüÁÃ0MÛtuCÃcm½½ÕZ"Ásñ¸6oÖ~¥ýtÝWn[Éëö.ç€Hùj)sáðß~ðÃL!Fü:Þ¨‰À ðœ
+þ½A?¾rå†.EékŒD:55TR8*ð=v¡ 3›…¾¸3Ÿ‡kšp-¾ç0æÞô­o	]7*IÈ;‰þ~ÝÌçmrút>Ö\o8ÑÀj§<Ñ“4"Ý9‹çúôûyºpåÂA\ùÌ Ž<Ãñ†
+ü秪ǣ«V5£¥å—+ëêžlhk‹F::éìDU,†`Cuu`¡¨(Âw]xŽ϶á».¸ï¾îºtöÃIq|TUSé3gæ]ËrLÃÐ-]o)„ª¬GÒ»3§†HwuK`Æj_ϦçðÛÖ11dœúDNÿeOO÷JIz£¹¡!¦¶´ T_Ps3¤ª*ŠB)<Ë÷<Œ
+¥pÎÎ/xÞÄ;ï`ôƒ¤k¾ùM")Šàe2µž¦)3Fba¡îŸÆÇ‹¥½€{ 6Ûþ×+ZÖÞú‡…nyªÿéT®hà p…O¼¶ºzoKKKsu,†ª¶6››¡D£`¡!ð,v¡ ;—ƒ6?-™„‘JÁÊç+Ôð}¿tˆ%ßàyrzp0ìƒó̲]Mˆe˜ã„áº$’É$®»eÍ5ƍëÛYÇM³l{YÕ-kÀë(EúâÞãÑU«š×ÔÔ¼ÑÔÚZ¯¶¶"ÜÚŠ`C$Ux¶
+3“A1Gþôi¤GG‘›šB>‡‘NÃÖ4¸Žßó.u×eÉwß]¦ÍÏÃÑ4x–Ïqü(¥¡AÆn?ònM at 5LŸ‹3º®'¼®>_”„ìh¨©‰…jl„BPp߇S(ÀÌd`¦ÓÐæçQœŸ‡™ÍÂÖ48e°àü|°„€R¹ ƹ¼0:jFZZ¨oÛ‚é8šÀyÕp½œ©¾Bqû÷ÿŽªÂØ ëº3 Æ ðýÄM7mXÞ¬«C°¶Ru5I÷}¸¦	3•‚–H H 8?+—ƒm¥ÄûhT—ÀJ)¨(–®¾ãÀw]ÅL§9 .ØvDõ¼+#mòU×-“¯RüǾç"œóÝesuq—÷[·Šé]»úäª*Èá0Ä`K:ì‹Ð '“ÈMOCK&aærpm»¤ç.B@(% T@E‚$AEQ8‡£i°M“B\Wœ³í"oÊ%÷'3ƒÚ©ÔhZ3Lð?Öå5LOß¿"}D‰D D"ËvMV6[I6«X€cšð·$içD—PZ,¢,CÀ‚AHÁ dU…
+AeJá;ñlIÓ6Í¿òÒ™‘ÕcSRÛl:6쟎œK"ÝHÈf€{\Ë G«Œ5£éÖu ¢Îßqaç|þ§X8>Xy2¥´¶Z$PQ<{͸ç |σiYÆ ®?núþÉײYþðs½èï*ùé‹7›{z”&à϶áZìb¡–&Ô\Û)R
+»Caf¦,gvù…q&À?/T HR‰bŠ*Š ‚P¡	 PÆÀ¸¦	&Ë”Õ×ï}íÔ) Õ@
+ÀÞ®Ðâ<Р/.ö
+‘Hȵ,˜Ù,Âm­u´A_H"=:G×a,,ÀLgPœOÂLgàÙ6\ÀkZg•a)ñ„R²±
+ï¹ïƒBé/¥ƒ,Ë
+-®p  H‰üc[^êǸây=Üuak(¥p-Zb¾ë# éúkjh çgÂÁmÛ`f³(%TÏF—Ò
+ç½²A€ÀX)©$	‚,C!äš%Пگ•O…¿ ¤žsßq`
+˜;|V:kü´Þ}7¨,—äŒR¨ÝÝ€,c__ßyÊA)•¤
+Ÿ©(–*¢ëÂw¸–p^¢H(Bð}ˆ’‰¦Ki2Q[[KBÎ9|×8‡íûh»yX}=Ž=ý4²SShŽÅ°|ÃííˆÝq‚Ï?-‘(ºaVV
+*Š ex–Uª’eÐKɨD" ¢Ç0 J’rI S©”ï×ÕKfÇ÷<PYFUw7&ßyÅDñýû1±w/ÎqÃOÀÈå*¾eP
+¡¬K®Ï÷¼Rµ,áÚöR5÷<JÁ‚A8šA’Ìß{ª³tas>Wù•sPÆ`,.¢þ†JþÀ¶Á9‡ÜÑŸsäNŸ†™JU´„@d”±R2–ïèz©ˆ\Û†ï8à®BiI¯ËüB¡¹KŠ4 ¾?\ÁÀÕuâq¤GGQ˜™¡ÑåËÑqçXÆñíÛa‹¥BB)(c%¥$Bà»nE:mM;kž ‚,—X>œTS3|É‘69°|_[º÷³ûöœ#P[‹ÆU«ÐñÕ¯bîȼÿ½ïaáøñ³òƤP¨9Æ°”¶¦ÁÖõàsV”e(‘Æà».ÛÖºn¿}à’#ýZ6kv+Êž«åë  0׶QˆÇá•hòõ×ÁTF*uÖ_DI*ñ›Jçâ¬B¡"s•d-' RU"°‹EÄ‹Å=óÄæ%ƒ€YÇyq	´gÛÈMNVÔd‰»,:«ÉeçFÊUγí
+`×4á{Þyö”
+55P[ZÀÂa¸†#“A¼X|ñ’Æ«çÞä=owÚu'—îýs¢´¤,Ž¦ÁÕõRIf¢$•Ú.Û†](ÀÊçaë:¼¥±X¢QD::nn™Í"™ÍN®Ù¸q÷¥€>Ï単¦ßÌØB‡,?pÁÎsè 0¦(¤ìr÷í}ÔW1kjíìDôÊ+!È2¬l¹™N§¿ýø/»ìHÀÏS©]“–õր˯WTHá0X8A–+NÍwœóûÁò!™¢ ÜЀڮ.ÔvuARU8ºŽb"ñLæ­>¼ërÆ®¬“†±)*FD1V,Š°P¢,eYó	ùÈùÎ&YUª«+ÚÚ ƒ0Ói	œ™››5ÍM—;+¾`ýW6›	¹{ªîUE±¾8®T;BÄrßèŸã—Þ†¬ªP›šniA¨±D`e2(ÌÎbnjjá`&s÷¶ÁÁÄå€þÄ	ÓƒuuÝkUõºp8VB"‘BwÞ‰B"…£GáhxÙ±`°"iúz°PžmÃÊdÇqæÌ™™éôÝ?9vìäg™Ê_°^}õÕ  vß}÷T"‘µ]œï¸‚Ò»  "ËX¶~=2‚ ;• •Í> ©j‰B@©h¥Ópr9й9L'“û‡dy³ÞÛ{zSo/Ù±c¿¬/JûQI¥î¢¶ý£7·m¾46–ø‡ÁÁ¯ö¼ºãL7ßrr ²CC¥.Üó Ê2X  1(ÍE,«¤×šѶ¡†uH–ý‰Hde5c¯Ô
+[ÖNNÖ^n¤/˜0e®¸¢:[_¿-Þ#3ÖûèêÕÿóž=Ö¶õëO¨½½ë¦:;{Îp?Ÿ÷µéiê”-§gÛptVy™œšÒNÍ̼žžƒù+nŸœÄ¢ Ђ¢4Et½÷kCCl[¡ðæçBŸ±Â¸ã¼?62²fÙUW}½©³sϯwî|0™N?«­}`àða>=;›!ŒõÓéý(¯–E±‰¢PI2!Is‡¯¸ùæo÷õ™¿Þ¼Yrl{±yÅŠÇ2ýýÔPešüX,–ÁììçÃéÚS§ü]÷ÜówÕÁ`>>>þx>½±½©é·¢$ÕM#53ã;¢8Å}çOJøß‹>ùí·KU”ÒåŠë®i>zT?áûj,Ÿ×:ÒéÇUÓÜþ¹&â†-[œ­[¶ôñÅÅ##ããÿ65=}õŠdÒ¥!.'ä ™‹ýï›?ûë~é¥ÖÈÉ“­‡zhy&—û¡Ýßßø¶ï“ˆaÌÞ>2²aÝÄÄ»ŸåóǧÕÿtãÆhc±øˆbۏ$Tµ5bšÛ“ªúäË;wjÛÿÚîÝH&ÿVš˜X±RYÏç‘^\ô|Î5Õ4ú×_ýê7ŸÇ‡ÈOþšºsgÀSþÐC¾Ï’ªº÷å;ݏ‚ïïñEQ±ÚÛ[Zçæäðôôñ£®;_m¹ãmmÃøÖÿ5;}b%¯zÁ    IEND®B`‚
\ No newline at end of file

Added: trunk/supertux/data/images/creatures/mr_bomb/ticking-1.png
===================================================================
--- trunk/supertux/data/images/creatures/mr_bomb/ticking-1.png	                        (rev 0)
+++ trunk/supertux/data/images/creatures/mr_bomb/ticking-1.png	2008-05-13 21:15:29 UTC (rev 5465)
@@ -0,0 +1,28 @@
+‰PNG
+
+   
+IHDR   -   -   :âš   tIMEÔ
+(ÖŒL)   bKGD ÿ ÿ ÿ ½§“   	pHYs     šœ   tEXtComment Created with The GIMPïd%n  •IDATXÃÍYkpœU~÷’½ds¿7÷^À6v"P
+­Ê€P ´€¡Œ¢¶´ÊdDG¦Ì8ŒÂ0£ÅN%:2C«2Ь•B±¤!-™´Ù\Ì&Ù\6÷Mö¾›Ýõy¾î‰Ûí%MÊ™9û]Ï9ÏyÎó¾ç}¿ùâý‘ì7EÒç}ñ‹‚Ø(R¦¹#Sdu|\_л¶n5çëõF©Ì³ˆ¡UD7Ï/©bAõ£Æâñ¸ÞÝÔ´v¬Ó¾~ÚÐf{É·9)Ýâ–q<7¡FQg/5è\и	ÇÈ uÛ¶mžÛ*+Ó'ô†/G­FS(#v…¥¸lWˆ|}Ld̏XEÆÍ"£ìÀðy#.˜2‘+m"פë%§ÏÕjìú¨ÅRl5–˜–…MÓ¾HSO—D5É
+Å1y lcw¾Žc»È©i°®û¼Aï…ÅDj›M²­¸N,Ùw§UëƒUÿÉrdÚfÚ×¾·?,Ë6Ôõ®®ÕßÖ¾ïý`³=èïñ4‹üÙ-ò*º˜¹$†÷,ÜÚoÖÉ®í58]ƒ;=žéÃSŽß\Ÿîh\WÙÛ÷ñþ)—ó€ÛþÝå¶éäé\‘»Ð,Kµ_´<êëë-ç*³Ù|SZZÚFƒÁp“ÉdºÖh4.ǹ¹  `ÂçóÍÐôô´nrr²¦¼¼|Ç`UÕšªOéêj±åÖޝkË»ÁªË¥ÖýÛRrMyÀ–Ÿ-ï¾òëÈO_k×ôKOXä0€š`‘AY¨<žzê)ãž={¶ Ôý¸¼`m )ð ‰D$
+I ÙÙY‰Åb>ÔÃx¯áÞ{ïmššÚŽ	þpÕªUÙ###ñI—ËW·~Þ/Õ­¿Ò»ìíË¢y£5xy,íTtlïÎ×í?vø=³TE$:ë ÈoÁÂÇ
+zÉ’%÷Ä.‹Å²4++K¬V«¤§§‹^¯'@«âõzeffF;‡Ãøh4*˜ÜìæÍ›
+>ø Îf³É±cÇ"Ÿ|ò‰ßïõ†«ûúf®/ÊÉÈÛ:\”Y9͏}–¼¯š~Ù;>è>™
+.oë’å{†¤å`\ô¾yåQQQ±ýKÿD~~~nqq±”––JII‰àZrrr´	€}
+ *°\V\ëOž<©kkkã{£££#X™H(öw¥Ý¶ÌÐÀtù	«ÃölÞ[­®Ð@Qh…¥´¤¶2ýxÐÓá‘6„¤ž¶(ôÓEEE«°äÁlæææJaa¡ddd×X&£dš2á5¯	6µœ8qBìv»iãƍ:`€dò½€eð”+päÙ‚½>Ÿ÷[þ˜5Ôžá.¼½¬´þºµžŸýýãox^0lGÍÔ´þB€q8’]AvÉ,$¢ÏÌÌÔ˜%`J)n·[“¯©mjœl§N f666VôöözÑ&×:¼—‡GÕ~î!‘‰•y…ÙaËÊ{Åõ‘ƨ¬ž=m€M¨SçÝ)	z€É0& yyyš†“Á(¼ÂG"A+°ª&ôÖÒÒR]UU5gÄ Çã6ÐyìxogýíYW
+F«cùÐäýdÿ|NдlVP¯Mî5 ÊØ.L°ÄÚ=–zN«Óé´ªÎYðÌ<44ÄÊéÚ€v>Ü˲g¦
+
+ÓfO¶´ê'{ÜmӉ׻Ùä¼ áGïÃáf°¬õýi€	Š '&&d||\;Oö©¬*°¬Ô;WI]'ŒÖ‚	³Aç9 ¿ÜZ‘o^RY`^–®ýÃkoå ¿7ÁÕ¹CÓÇÜ »(VÜ•öŒà`õ+`H;'Û~¿Î“™%@V(ûàÄY•«TÆŒ¶qÊ è£É,YÓ3]ž©ž÷ý._ˆZî§m'ã<ÃåuttÜ…Ab‡46úT2D†•f)…ÙÙ@FÏÉ.ßW¬¬Ly±0ó'Àº„›ìÄõÃ%þ@çUãnS‘ÛWïħ-ÉÒ8Khx?;fgJ<¯¨,“ë¾v­TUUJ:ä=öGdÚ=-/ýêE9ÖÜ¢¾
+8Vìò\M‚ç¬ìŸ…2÷	`⏡¶cˉù#îˆ_o¹nÏ
+·ÆXâFΚËÍe_º´Jêê¾*%pu^ïŒôõõa€Ó.-ãôã b”˜&]
+h.?I àäЖG5)LF•=;Ñ-‡Û£»Ý"‹3 at 3'+˜œ¼bV§³0õ»tYµ\yU­Œ@»]ݘHHÜã251)ýCÃ2:6.êÝ@ ¨1ŸlxJÓŠ]Å,¥¤­ŽjrxÏ"V'|1'O•Ä ã§	¢³¬‰%ô«v¶¡!–/&å™Y²æêuR†í›ƒ½sô¨<ýüó2—w>O¡ª¨¤À•T`5 	CÅ&³Rž7_ÓýoF…úÓq‚æs›>j?ïÉï?$·Þs°Ô:Ž«kk%†ë‡{lŽA%‹dã#Ó‰ØC«ôjËWÒQG)¹èo
+üÁ£%Fm&:÷ûrç-·JNY™üâ™gä;õõò»'ž`g§è1ÈmwÜ!ex–Ì´’©XDíx$‚v£
+_øÄû–…dÆÜ,HW at N§Ç¢Ç2šà%.»â
+ùKc£ô9rððaÙ
+€©'Ÿ{N“™Juuj¹UÔGf	˯Uºæ}5I>Ã1¸ ¦Å•0J­SvæÂF²fíÚ¹ (ŠòV¬Ð¼EGw·¶Á(ÀÉƧtL`Ķ4ÚÄ&¢Ýç;jóbì	®1(vuK쀈ĤíÔ)éééÑ:®©©‘Í[¶HKk«¼ðÂZ’Ê0j›&H‚fUñµš”Ò¾šb;Ç[(ӭĪ.ÈÌ¡C‡´å­_¿^}ÈÑ><òˆ477ÏyU;ž¢Z[¡„LTá;Üm9DÂà«««k½X¦SÓ-'›yB + -êSÂ{Y¤‡&
+µYÐSp©yLì¬s“måòø>ß!	•••Z_öc5·,F,¯(Ðd¨««ë¬A“¤Fnʯ+Í&'©Aㆻ‰`IK Ðæ•}^=ÓŽd‰$C<ç ¬*‚S®MɁnMÅÕJÉ€™4ﱬ†Ùú›}®lœñôŸÎz1i§S€•Q/¡Uí¨añºvͨqpp+òm_ý´ YþÁD u‹VBy	¥_åÎÈl²Á±
+5Ì̇9&³xÊ‚€‡‡‡é}!6¿e1Ÿ]ÏU¶£~Ät1°Š‹	šŒ“UÖÔQr @f?L–` ;ÑÇöÅ|ݺÐÇšUüj¡¬<„’…Š'˜¥3£QîÏì3Æç1MüGÀ|om7à¼}1 /ô±f@Ýf³É®bY1M๹ù²sçCX	 æk@™™]V2ÍÉ1Ÿ$`˜ØM.—kQ€çý¨ŽÎÛ¡Çk¡Ó€¼Y¹½¹ÆXìÌ•0²l|_
+ÖƒÚÄT%ÃêóB"	>„ç۝Nçð§ý+ႃq€[˜¥ƒ±]ÀÒäL„¬Z­i¨æ9C×Ç0€•[=Ú80Ÿ,ÔK|ê?Š^ÅWÓ˪à÷ûN°É͇é“y.ГLÍ|0¸ý˜@ýŽ;.Çõÿð|†xÁ²iÓ&¾ÍÕ^ݏn¾«æ›öS“á“íïÂFb¾þþþzWG‚ò”EýQôòË/Ó€ã Ú½3éÃœ»ÉdÇÓâC$­ººÚÿY¾hлwï^á÷E
+Å×@¿øÿÉ”{Ë4Œi¹ùQsy¤?€¯°q=3¶IHûž­[·vìÛ·o⒁†!Õ†#íùyVînüÞÑßïŒÂèB°1$i‘PšÞ0cÔþ&Fö/o£þ풁Ææq‡ŸÃL÷ô»ú§Œ£cýè
+Á,.Î4
+ƒ¤€ßI\ÎÏò_¨ÿVÓ¢eRù    IEND®B`‚
\ No newline at end of file

Added: trunk/supertux/data/images/creatures/mr_bomb/ticking-2.png
===================================================================
--- trunk/supertux/data/images/creatures/mr_bomb/ticking-2.png	                        (rev 0)
+++ trunk/supertux/data/images/creatures/mr_bomb/ticking-2.png	2008-05-13 21:15:29 UTC (rev 5465)
@@ -0,0 +1,37 @@
+‰PNG
+
+   
+IHDR   -   -   :âš   sRGB ®Îé   bKGD ÿ ÿ ÿ ½§“   	pHYs     šœ   tIMEØ
+2í ¤Ä   tEXtComment Created with The GIMPïd%n  ¡IDATXÃÍY{Œ\Õ}þÎ9÷Ü{çÎÌîÌìîxw¼¯c¯c6‡‡Ê[b·H¢ØRAT UÓ SUQ)‘Ó„¨%q%\(‚B)¢MT±A”Æ®müÀ¬íÅëÇ>fwvwv^;sߏÓ?æa›‡qU8ÿ̽£«£ïüî÷û~ßïw¯Ï¢·Íû ísüº –ù°.,Ÿƒëkú¥þPébìzEFw46Ïz^ú
+0J T €@A­±±ÕæБ«‹òïÃ/i"ôÊ6Ç4f«/ > ïÌ
+ØW º… w 
+ äº®Ó\./9vâø]~óh²ÔìoíÇáv¸X§ ‰Q@û	@~
+è_	è^€,V¶ W53Ä>N¿'üývµ;ÊÛÕ¦<5kì9°î–nXæãþÕ€ÜüÉ@þ8’<òÿ
+z'@	°bHßµo„š¸W]àWVžo›i2Þ[½g‹Î
+GúnßžþõÖ޷挃@ù·Àf€—Ì}%‰÷¯€¶ínlž=ÁÇ=÷ù²ïÏ9ž}d¶¸9q*}ïê{.]pÉbé—×ün3ÁRÀ š.:·üàêñ÷Þ[Ag)qÝöÀqÔ °lÏ›2<oˆÇ㇞?rĪ?o™&ùͯ~Õçärërºîwß秦Ӥkq˜M#|^"üØ-4·`–ñöض'Å/žÝ•ú7@
+€£! a ë‚èñ›þ~éþþ?îŒDîëTÕ›4E	3Y x–×4á”Ëð¦ëêã–µmÒu_¸îþûq]¿÷Éä÷;/¿¼YÏdD)Ö§Íò¡5ßêiýÖ
++EëöÅ‚’¨X ge÷Ýõ“¡{vÊáÒ—šð‡-„§`ßýèÊ•–¨êæy±Xo(‘€BŽD@CàûpÊeXÅ"ŒÙYXssð,žm#ð}ν+x€-Ù¸‘PYFahÈÍ8`Xss™ëêHD"'y˨/ù²Nä[&ðôY3ÿþ^‘//ÊîÅ¢'aÿ“o:À|®z<´jUÇÝ©ÔoW¶¶>–ììŒÇzzëíESW´d¡ÖVðpT’x|×…ï8<"€ €ð<:±{7©œ8æò““Óžm»–i¶a¤Êá&ûp¶÷ {Xþiäµÿž2BG’¤¯9·»¥7Jå±)üáq'§"€?“Ó.[Ö·R–ßìH&»¢©Âmmwt at njSUJáÛ6„ïƒqʪ1B Bœ³ßÉ·ßÆðΝòÒï~—ȪÊüB¡Å×uuüäI3“Ͷþý‰•ïçý·§¥ØýÈ7Sk®¿£üó_ÿâÀ¹Rņ | ÀcŸxMsóöT*ÕÑÜÕ…¦ÎNhPãqðp„ø¶
+§\†S*AŸž†>33—ƒ=7× FÕCÔ}ƒï+ùÁÁˆ¯iÓܶçyºÎˆm‡¸ëFày$V(d.½öª¥æ·uóž+'¾·õ¥¨aÛÇ ¼j¤Ïï=ZµªãªDâÍöùóÛ¢óç#2>´dr4
+Â|ǁU( ’Ncndùáa”FG1—NÃÌçáè:<×Eàû珺çñ™wß] OOÃÕuø¶
+ßuƒ8¥áAÎ÷>»ÿÝD(jZÆ
+Øðþ™ú|^zôòB2‘è
+'“Ï›5SUˆ €[.Ã*`åóЧ§Q™ž†U,ÂÑu¸5°âl°„€Ò¸ .„’¶b©
+‡Y®«3!š†Ú”BóBÕ;°ëeÇ=Ïp€øTЛ®¼rÃâxüV­µZKäæf0Y†x–+—ƒžÉ œÉ 2=
+»T‚cšÕÄûdTë`	¥T’ª×Œ!p]ž§Zù¼  ˜ãÄ¢¾¿(ÖÛ©\réå3»ùé˜ⵚ¹:¿Ë{uË)ÿòË›•¦&(‘$MC]‡ÝJF6cf¥±1è33°J%xŽSU‰3! ”‚P
+ʨ$É2˜$H \]‡cY‚BàyÒ”ãì‘D{if×LaPÿ87œ×- c ‚Ouyɱ±;¿OÅ ÆbPjö,v±ØH6»R†kYð]¯*igD—PZÌ$U…¤(B!pMƒ¬iP¢QÈá0˜¢€PŠÀu‰ï8˜±¬cC–õ°Ÿ/[}|TîœÈwM »Æ€ýgRãœHÏ#ä>@ø><Û†  Ä›¡uu ýúk@%	B ëÁ™+cð™Aö£ÁÆΔÒ*Øh&Ë ’túšsß ¾˶ÍAÃxÔ
+‚£Å¢xx‘¯ ,©úéó7÷-[¦¶7ùŽ϶áT*§Ú‘X¾r¬N¹„òøxMÎœÚ œ!€8+”10Y®RLUA%	„±M €r
+Á³,pE¡¼­mûÀÇ hr ¶/ù-Î- zÿììå,{¶
+«XD¤s>Â=0²3ȃk0³YXù*Ó3°òøŽÏ4áYöie¨'c ”‚)
+ç
+Þ‹  a¬úK)çPE¥åòr { €Té >µõÕ~L¨¾¿Lx]¥žmCÏL!ð„B!´¯XŠp2	!&?ø {·n…U,ž£”PI:]Jœ÷krH㼚T²¦(P	YZý¹ýZíTøsBÚ„\V¹Œ©}ûaçóX~Ïw0íZPE©Ê¥ˆöõŠ‚›7Ÿ¥”RPYnð™JRµ"z×…gÛ€UŠ„Ãàšd2!íÒd¢¥¥…2BT!Ï„€è¼úð¶6|øÄ(ŽŽ¢£«‹7l ëîF×M7A{æè™L-ÐÕóšRPI­ÑÀ·íj•¬®'£‹J\Ó„$ËêÎårAÐÚjÖÍNàû Š‚¦¾>œzûmT2¤wíÂÉíÛa
+Ë6m‚Y*54¼eP
+VS‰ºë|¿Z-+xŽS¯†¾B)¸¦ÁÕu0Y¶¾ðT§~á1ÕøWPÎaÎ΢í²ËªþÀq „€ÒÓƒ@”FF`år
+m!8弚ŒµÃ»†Q-"¦	Ïq¸.„çPZÕëÿY8<uA‘ 3†˜x†r:üð0Êãã ”"¾x1zn¹³CCøèÙgáT*ÕBB)(çU¥eBx^C:]?mžS”êk‡“‰¡Ž´%Ä!;ôú½ïº˜Ø±¡–Ì[µ
+=7ߌ©ýûñþŒìG–7Î!‡ÃÕÈqŽzn8ºÇ0ª€ÏHXIQ Æb`œ#ð<˜Ž£/¹ñÆCébÑêSÕm—¨êz `œÃs”Óiøµ:õÆàÑ(Ì\î´¿`’,WùMH£sqMv¹Ü¹F²ÖPmjaN¥‚t¥²í¯6m².4 L¸îóuоã têTCMêÜåáðiM®97R«r¾ã4 {–…À÷ϲ§”1„	DS)ðHžiÂ,®Tž¿ ñê™7s¾ÿZÞóNÕïƒ3¢TWW×áFµ$sI–«m—ãÀ)—aÏÍÁ1øõ±˜1†P<ŽXO" !°ŠEÌ‹§®Ú¸ñµ}–Ë;fYAçÙE¹ëœ'Ï ã\U!©*HÍ»µîÛÿ¤¯&Œsh‰â½½ˆ/Z¦(°‹E”ÆDZ/Ÿÿ‹GŸ{îÃ/i x1—{ù”m¿uàÚë•Tr$‰€)Jé®{v?X;$WUD’I´,Y‚–%K G£p
+•L'
+…·þqß¾—¿ÌØõœuÔ4ï3¶;&I]
+À’9‡!)
+P“µ€Oœ¯ª(’,CŽD %Õ‘Cg'$Mƒ•Ï£’É`rjj|زîý²³âsÖ‹‰µ×D£Û£’ÔÖ ‰4ª]½ç£œƒáëÉ–\¸4¢iPZZ@$	v¡€òĦFG³{…µ[3_ôgN˜îimí[¾Ù‰tqE©Î;8o”ïz™µÂA%	\Óбf
+Zúú`ONÂ.×…[© ?9‰‰ÉÉñ=ùüÚ§>üðèÅLå멧ž’ p ÖÃ?,^=ªÆbk.Ç_½D’®sv:w)çU§Vsu<‚‚áûÐz{Á§¦‚ã8˜vœÂÿÈòÝ[/ð9êqç­·>0öO ÊëÖ­;òú믋‡~ö3‡/_~{‡ª&b™Œk{^È‚†œ±Z5äš)åë˜š…Àb1HBà­ƒñËRU×½meoo÷µÝÝC{FGKZ ݲþ.¿páuB’ցžuëÖ…·!3ææšvNLX#±Øa§T”L³¸®ì×|²ï8p
+vm™Ó‡ÇÆvÚÚšqjÂ/¥ÓóýAÈUwŒŒDþ½XüÝÅÒÃøÀ¶wvì¸qÁòå!§½ý~Pº„hð<åäÌŒ8GÏÛ>ÿÍ¥RÒèž=+ÈììRE’Ú)!*•e²<MZxõÕ‡ܼÙzñŽ;®ð
+cûa!4'–mÓ„âûè.—÷_4§	ü%ç[ÅâÉâ¾}¿\zé¥ó•ÖÖ!„:–%†J%ÕIÏãÞ@õ‹ÓžO¶Hýýý |ä‘à•W^YdÛöǶÃå‰	Qr])$ÿ…Â_¿ÓÙù,jÖöÿD=îùö·—É”¾âŠ‰„s¤Tâ#žçù”Þ200ðÞ§mÖßßß$sþ£p$²VÓ4–Íf˜†=±s'ò¹œ0%Én1ÍG'¢Ñ­Á—ô§JÞúõ듪çý¼×4o—M³’°íxôàÁþ¬Íúûû¯ð6 …ԁò¡CbhxØö(ÕJ7é²üÂÀÀ€¸Ø‘ç]3ëׯ°HiÛw&&*7§Ó•/°ßž¦¦¦?e”Þ]Oe³c»ÇÇE«eíOXÖÜû©ÔðÅ€ÿ5~våê>    IEND®B`‚
\ No newline at end of file

Added: trunk/supertux/data/images/creatures/mr_bomb/ticking-3.png
===================================================================
--- trunk/supertux/data/images/creatures/mr_bomb/ticking-3.png	                        (rev 0)
+++ trunk/supertux/data/images/creatures/mr_bomb/ticking-3.png	2008-05-13 21:15:29 UTC (rev 5465)
@@ -0,0 +1,28 @@
+‰PNG
+
+   
+IHDR   -   -   :âš   tIMEÔ
+0ÅàÔ   bKGD ÿ ÿ ÿ ½§“   	pHYs     šœ   tEXtComment Created with The GIMPïd%n  •IDATXÃÍYkpœU~÷’½ds¿7÷^À6v"P
+­Ê€P ´€¡Œ¢¶´ÊdDG¦Ì8ŒÂ0£ÅN%:2C«2Ь•B±¤!-™´Ù\Ì&Ù\6÷Mö¾›Ýõy¾î‰Ûí%MÊ™9û]Ï9ÏyÎó¾ç}¿ùâý‘ì7EÒç}ñ‹‚Ø(R¦¹#Sdu|\_л¶n5çëõF©Ì³ˆ¡UD7Ï/©bAõ£Æâñ¸ÞÝÔ´v¬Ó¾~ÚÐf{É·9)Ýâ–q<7¡FQg/5è\и	ÇÈ uÛ¶mžÛ*+Ó'ô†/G­FS(#v…¥¸lWˆ|}Ld̏XEÆÍ"£ìÀðy#.˜2‘+m"פë%§ÏÕjìú¨ÅRl5–˜–…MÓ¾HSO—D5É
+Å1y lcw¾Žc»È©i°®û¼Aï…ÅDj›M²­¸N,Ùw§UëƒUÿÉrdÚfÚ×¾·?,Ë6Ôõ®®ÕßÖ¾ïý`³=èïñ4‹üÙ-ò*º˜¹$†÷,ÜÚoÖÉ®í58]ƒ;=žéÃSŽß\Ÿîh\WÙÛ÷ñþ)—ó€ÛþÝå¶éäé\‘»Ð,Kµ_´<êëë-ç*³Ù|SZZÚFƒÁp“ÉdºÖh4.ǹ¹  `ÂçóÍÐôô´nrr²¦¼¼|Ç`UÕšªOéêj±åÖޝkË»ÁªË¥ÖýÛRrMyÀ–Ÿ-ï¾òëÈO_k×ôKOXä0€š`‘AY¨<žzê)ãž={¶ Ôý¸¼`m )ð ‰D$
+I ÙÙY‰Åb>ÔÃx¯áÞ{ïmššÚŽ	þpÕªUÙ###ñI—ËW·~Þ/Õ­¿Ò»ìíË¢y£5xy,íTtlïÎ×í?vø=³TE$:ë ÈoÁÂÇ
+zÉ’%÷Ä.‹Å²4++K¬V«¤§§‹^¯'@«âõzeffF;‡Ãøh4*˜ÜìæÍ›
+>ø Îf³É±cÇ"Ÿ|ò‰ßïõ†«ûúf®/ÊÉÈÛ:\”Y9͏}–¼¯š~Ù;>è>™
+.oë’å{†¤å`\ô¾yåQQQ±ýKÿD~~~nqq±”––JII‰àZrrr´	€}
+ *°\V\ëOž<©kkkã{£££#X™H(öw¥Ý¶ÌÐÀtù	«ÃölÞ[­®Ð@Qh…¥´¤¶2ýxÐÓá‘6„¤ž¶(ôÓEEE«°äÁlæææJaa¡ddd×X&£dš2á5¯	6µœ8qBìv»iãƍ:`€dò½€eð”+päÙ‚½>Ÿ÷[þ˜5Ôžá.¼½¬´þºµžŸýýãox^0lGÍÔ´þB€q8’]AvÉ,$¢ÏÌÌÔ˜%`J)n·[“¯©mjœl§N f666VôöözÑ&×:¼—‡GÕ~î!‘‰•y…ÙaËÊ{Åõ‘ƨ¬ž=m€M¨SçÝ)	z€É0& yyyš†“Á(¼ÂG"A+°ª&ôÖÒÒR]UU5gÄ Çã6ÐyìxogýíYW
+F«cùÐäýdÿ|NдlVP¯Mî5 ÊØ.L°ÄÚ=–zN«Óé´ªÎYðÌ<44ÄÊéÚ€v>Ü˲g¦
+
+ÓfO¶´ê'{ÜmӉ׻Ùä¼ áGïÃáf°¬õýi€	Š '&&d||\;Oö©¬*°¬Ô;WI]'ŒÖ‚	³Aç9 ¿ÜZ‘o^RY`^–®ýÃkoå ¿7ÁÕ¹CÓÇÜ »(VÜ•öŒà`õ+`H;'Û~¿Î“™%@V(ûàÄY•«TÆŒ¶qÊ è£É,YÓ3]ž©ž÷ý._ˆZî§m'ã<ÃåuttÜ…Ab‡46úT2D†•f)…ÙÙ@FÏÉ.ßW¬¬Ly±0ó'Àº„›ìÄõÃ%þ@çUãnS‘ÛWïħ-ÉÒ8Khx?;fgJ<¯¨,“ë¾v­TUUJ:ä=öGdÚ=-/ýêE9ÖÜ¢¾
+8Vìò\M‚ç¬ìŸ…2÷	`⏡¶cˉù#îˆ_o¹nÏ
+·ÆXâFΚËÍe_º´Jêê¾*%pu^ïŒôõõa€Ó.-ãôã b”˜&]
+h.?I àäЖG5)LF•=;Ñ-‡Û£»Ý"‹3 at 3'+˜œ¼bV§³0õ»tYµ\yU­Œ@»]ݘHHÜã251)ýCÃ2:6.êÝ@ ¨1ŸlxJÓŠ]Å,¥¤­ŽjrxÏ"V'|1'O•Ä ã§	¢³¬‰%ô«v¶¡!–/&å™Y²æêuR†í›ƒ½sô¨<ýüó2—w>O¡ª¨¤À•T`5 	CÅ&³Rž7_ÓýoF…úÓq‚æs›>j?ïÉï?$·Þs°Ô:Ž«kk%†ë‡{lŽA%‹dã#Ó‰ØC«ôjËWÒQG)¹èo
+üÁ£%Fm&:÷ûrç-·JNY™üâ™gä;õõò»'ž`g§è1ÈmwÜ!ex–Ì´’©XDíx$‚v£
+_øÄû–…dÆÜ,HW at N§Ç¢Ç2šà%.»â
+ùKc£ô9rððaÙ
+€©'Ÿ{N“™Juuj¹UÔGf	˯Uºæ}5I>Ã1¸ ¦Å•0J­SvæÂF²fíÚ¹ (ŠòV¬Ð¼EGw·¶Á(ÀÉƧtL`Ķ4ÚÄ&¢Ýç;jóbì	®1(vuK쀈ĤíÔ)éééÑ:®©©‘Í[¶HKk«¼ðÂZ’Ê0j›&H‚fUñµš”Ò¾šb;Ç[(ӭĪ.ÈÌ¡C‡´å­_¿^}ÈÑ><òˆ477ÏyU;ž¢Z[¡„LTá;Üm9DÂà«««k½X¦SÓ-'›yB + -êSÂ{Y¤‡&
+µYÐSp©yLì¬s“måòø>ß!	•••Z_öc5·,F,¯(Ðd¨««ë¬A“¤Fnʯ+Í&'©Aㆻ‰`IK Ðæ•}^=ÓŽd‰$C<ç ¬*‚S®MɁnMÅÕJÉ€™4ﱬ†Ùú›}®lœñôŸÎz1i§S€•Q/¡Uí¨añºvͨqpp+òm_ý´ YþÁD u‹VBy	¥_åÎÈl²Á±
+5Ì̇9&³xÊ‚€‡‡‡é}!6¿e1Ÿ]ÏU¶£~Ät1°Š‹	šŒ“UÖÔQr @f?L–` ;ÑÇöÅ|ݺÐÇšUüj¡¬<„’…Š'˜¥3£QîÏì3Æç1MüGÀ|om7à¼}1 /ô±f@Ýf³É®bY1M๹ù²sçCX	 æk@™™]V2ÍÉ1Ÿ$`˜ØM.—kQ€çý¨ŽÎÛ¡Çk¡Ó€¼Y¹½¹ÆXìÌ•0²l|_
+ÖƒÚÄT%ÃêóB"	>„ç۝Nçð§ý+ႃq€[˜¥ƒ±]ÀÒäL„¬Z­i¨æ9C×Ç0€•[=Ú80Ÿ,ÔK|ê?Š^ÅWÓ˪à÷ûN°É͇é“y.ГLÍ|0¸ý˜@ýŽ;.Çõÿð|†xÁ²iÓ&¾ÍÕ^ݏn¾«æ›öS“á“íïÂFb¾þþþzWG‚ò”EýQôòË/Ó€ã Ú½3éÃœ»ÉdÇÓâC$­ººÚÿY¾hлwï^á÷E
+Å×@¿øÿÉ”{Ë4Œi¹ùQsy¤?€¯°q=3¶IHûž­[·vìÛ·o⒁†!Õ†#íùyVînüÞÑßïŒÂèB°1$i‘PšÞ0cÔþ&Fö/o£þ풁Ææq‡ŸÃL÷ô»ú§Œ£cýè
+Á,.Î4
+ƒ¤€ßI\ÎÏò_¨ÿVÓ¢eRù    IEND®B`‚
\ No newline at end of file

Modified: trunk/supertux/src/badguy/mrbomb.cpp
===================================================================
--- trunk/supertux/src/badguy/mrbomb.cpp	2008-05-13 19:14:53 UTC (rev 5464)
+++ trunk/supertux/src/badguy/mrbomb.cpp	2008-05-13 21:15:29 UTC (rev 5465)
@@ -20,11 +20,15 @@
 #include <config.h>
 
 #include "mrbomb.hpp"
-#include "bomb.hpp"
 #include "object/explosion.hpp"
 #include "sprite/sprite_manager.hpp"
 #include "audio/sound_manager.hpp"
+#include "level.hpp"
 
+namespace {
+  const float TICKING_TIME = 1.0f; /**< delay until ticking MrBomb explodes */
+}
+
 MrBomb::MrBomb(const lisp::Lisp& reader)
 	: WalkingBadguy(reader, "images/creatures/mr_bomb/mr_bomb.sprite", "left", "right")
 {
@@ -32,9 +36,16 @@
   max_drop_height = 16;
   grabbed = false;
 
-  //Prevent stutter when Tux jumps on Mr Bomb
   sound_manager->preload("sounds/explosion.wav");
 
+  ticking.reset(sound_manager->create_sound_source("sounds/fizz.wav"));
+  ticking->set_position(get_pos());
+  ticking->set_looping(true);
+  ticking->set_gain(2.0);
+  ticking->set_reference_distance(32);
+
+  state = STATE_IDLE;
+
   //Check if we need another sprite
   if( !reader.get( "sprite", sprite_name ) ){
     return;
@@ -55,6 +66,14 @@
   max_drop_height = 16;
   grabbed = false;
   sound_manager->preload("sounds/explosion.wav");
+
+  state = STATE_IDLE;
+
+  ticking.reset(sound_manager->create_sound_source("sounds/fizz.wav"));
+  ticking->set_position(get_pos());
+  ticking->set_looping(true);
+  ticking->set_gain(2.0);
+  ticking->set_reference_distance(32);
 }
 
 void
@@ -84,21 +103,58 @@
 bool
 MrBomb::collision_squished(GameObject& object)
 {
-  remove_me();
-  Sector::current()->add_object(new Bomb(get_pos(), dir, sprite_name ));
-  kill_squished(object);
+  if(frozen) unfreeze();
+  Player* player = dynamic_cast<Player*>(&object);
+  if (player) {
+    player->bounce(*this);
+  }
+  if (state == STATE_IDLE) {
+    if (player && countMe) Sector::current()->get_level()->stats.badguys++;
+    state = STATE_TICKING;
+
+    // TODO: currently we need to re-create ticking sound object every time, in case we had to stop it
+    ticking.reset(sound_manager->create_sound_source("sounds/fizz.wav"));
+    ticking->set_position(get_pos());
+    ticking->set_looping(true);
+    ticking->set_gain(2.0);
+    ticking->set_reference_distance(32);
+
+    ticking->play();
+    ticking_timer.start(TICKING_TIME);
+    walk_left_action = "ticking-left";
+    walk_right_action = "ticking-right";
+    sprite->set_action(dir == LEFT ? walk_left_action : walk_right_action);
+  }
   return true;
 }
 
 void
 MrBomb::active_update(float elapsed_time)
 {
+  if (state == STATE_TICKING) {
+    ticking->set_position(get_pos());
+    if(ticking_timer.check()) {
+      explode();
+    }
+  }
   if(grabbed)
     return;
   WalkingBadguy::active_update(elapsed_time);
 }
 
 void
+MrBomb::explode()
+{
+  ticking->stop();
+
+  remove_me();
+  Explosion* explosion = new Explosion(get_bbox().get_middle());
+  Sector::current()->add_object(explosion);
+
+  run_dead_script();
+}
+
+void
 MrBomb::kill_fall()
 {
   remove_me();
@@ -132,8 +188,21 @@
 {
   WalkingBadguy::freeze();
   sprite->set_action(dir == LEFT ? "iced-left" : "iced-right");
+  if (state == STATE_TICKING) {
+    ticking_timer.stop();
+    ticking->stop();
+    walk_left_action = "left";
+    walk_right_action = "right";
+    state = STATE_IDLE;
+  }
 }
 
+void
+MrBomb::unfreeze()
+{
+  WalkingBadguy::unfreeze();
+}
+
 bool
 MrBomb::is_freezable() const
 {

Modified: trunk/supertux/src/badguy/mrbomb.hpp
===================================================================
--- trunk/supertux/src/badguy/mrbomb.hpp	2008-05-13 19:14:53 UTC (rev 5464)
+++ trunk/supertux/src/badguy/mrbomb.hpp	2008-05-13 21:15:29 UTC (rev 5465)
@@ -41,11 +41,21 @@
   bool is_portable() const;
 
   void freeze();
+  void unfreeze();
   bool is_freezable() const;
 
-  virtual MrBomb* clone() const { return new MrBomb(*this); }
+  void explode();
 
 protected:
+  enum State {
+    STATE_IDLE,
+    STATE_TICKING
+  };
+
+  State state;
+  std::auto_ptr<SoundSource> ticking;
+  Timer ticking_timer;
+
   bool collision_squished(GameObject& object);
 
 private:




More information about the Supertux-Commit mailing list