From f00afcf9a20c7ce48ffbd218a8e6f02eb7125adf Mon Sep 17 00:00:00 2001 From: Raimon Zamora Date: Fri, 19 Feb 2016 23:14:06 +0100 Subject: [PATCH] =?UTF-8?q?Quasi=20totes=20les=20m=C3=BAsiques=20ficades.?= =?UTF-8?q?=20La=20imatge=20de=20mort=20tamb=C3=A9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UserInterfaceState.xcuserstate | Bin 25359 -> 27353 bytes .../xcdebugger/Breakpoints_v2.xcbkptlist | 18 ------- jsound.cpp | 2 +- jsound.h | 2 +- modulegame.cpp | 13 ++++- modulesequence.cpp | 45 +++++++++++++++++- modulesequence.h | 1 + 7 files changed, 58 insertions(+), 23 deletions(-) diff --git a/aee.xcodeproj/project.xcworkspace/xcuserdata/raimonzamora.xcuserdatad/UserInterfaceState.xcuserstate b/aee.xcodeproj/project.xcworkspace/xcuserdata/raimonzamora.xcuserdatad/UserInterfaceState.xcuserstate index e134f92912f3a4857cf04a1bbddbad112e040ff4..fe88e08e659710f3a3b600e643c6cb14615f9a9c 100644 GIT binary patch delta 14847 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 Z*+mPAnp$gk5Vn2_&09a;|1Vnl{{Z1{BS!!L delta 12896 zcmaKS2V9fa_jm4nRv-}qVJC!;0fewZ*pS5@%5>mF1XSvPBDgirb=F;d9JO@;&T3s~ zZQZ+Ct$XinopsgO*7t@u-(UMDAChqIJ?DJSxaT?NUe2BbQ}%+d-AR5hUpv)X1G-O5 zxoVvVCV|Od3iujK1v9{Gummgx%fR zb#NOP!0+G=cnf(DKnMv)LJHE5fqduyg-`^g&=<;}ACyBCjDpcH1}4HJXn+>j3Kqa( z*dBJU!j7;LEP>r%1?&m?!df^K4uiwt7&sPw1;2(<;cWOV{0`26Yhe>y2iLAl(6~|{)B=EAOeX{B7%q_q6rI;Or#L0L>f^*6cR;5YoZNNOmqRoL*`}ydYi@uZY*g8n zNeh`wrjV&*8rh1>CA*L%WLL73>_(Q6bFBYjP?% zgPcvyBj=OL$ra=eQ7xHJTbjji)A1Q>d@0>C_BrHuWtvkD5;{r&druP%Ev}Drz;g zhT1}HrM6MqsU6f#Y8SPeIzk<#j#0;{%hVO>Ds_#zPTinxQje)8)Klsi&7%PgX@Yj9 zMYId;O3P?JT2A}Zp>!A>PDjv5w1GC#COU_1Nw=bN=?-*9x)a@#uB5-9`_lvHf%G7H zG(CnMOIta5Iz5A)NjK1q^g?QZ|JuSk0BX~5imkV#CS2jj6V~=gfO9uj)`UB853h>QkiTfhiSzWG3}Vn zOc_(oR4{{>!ORe5C^L*1Ze^?t%OGY1Gm;s_jAq6#Uo%sgX$;4F$1GwNGfSAI%rfSC zW;wH-`H|Vc{KV{Jb}_q|JJ<$(&{GFn5`I%zfqo^O$+Y{K-6LUh^5gfG^~W z_%3{Rz6aljFX8*~<$M)i&DXS1^{wmO`#8^m=g1Rq)2K+G=Jrs-NF@TQrgXX!a9Gc7 zW4+j&>@IFObDwJeMfb|yP4)abKuux4W&=2*qYrmk?9gO%+yTU!c$?S+{0b<}uc<1p zE3567&$$ZYxy@n+uC*{-V4DqS)1$I`SXt9j;Yf;@#7^eITo(n7;RP%NBfv;73XEo} z*)Q1|w%U!kYRP?W`s_WOfrnGOr z%8I_VMYW~175%zI428(wvr+#>wPJClHK!2+J^qGoJ!F}nH9=&S=Vz(I>ZJ!s&mFvLad zV0H+G=*13W6(u6|dvuoGH5H}hgNk}q4d|O*Rg+sWAiuP(UqyK{$P$t4{ko!x-W6rF z73I05{VRLe&}7wC^!axsmV@aHyx1o21J+|G+rPN9qC&1#%XM}Y*YLX3gSG5%R(%qz z2R~w^H-Mi&0@w&Pfz4nGcgDZa%41n}B5P$Ql!$c2WmV-BVHn0|lEcylR+QD%R#x>* z>)XGwrmAlrY}nMQKBbj??P9irJqy7OuoLV8yII7JV#l&yvEz?}U%);raz8H-9O#f$ zj)^L}S60-t$?98PF_0a>da@%+L|Xp{d3JgUHgRD^zpA>LvWoP|-W5S*JxgokWmSFq z)dp+q?l}Ywa~BkTL<2a&ol_{R@3Y~=ka`t`&5$-7t8$gv5H%_4cjz|{ucFkZFT`qutqM{)z)ED>>y z%3ug?afg-R+-k8WSLW#3?tPHl19Xf*P3v8i^Ll?Hd zp$nbZxorP;BB2ZPz|n0QE7jVW*JS~#wzKW}$@j8POx(Ts`+KaFuoo|&p4Wzz)WhEFkMA*6 z@wzm^YWO9rVK=ZF*)1QHtAhi1t_{3WUN=_8`Zd5oa4`E5`?D<_h`8US{+?Di;w`g@Lp6F-}qgo(GZKXb*tzE0EN3|>G3Dvkfa7TUpxx6I0 zy*+Qkxo`=NKR6H0hYMgmY=Dh$AzTC(v%A?n>|XX4b|1T+{gpky9$dy#LHx^0ee$!XB!J+t|ZgkYA)>7u;hT+sz)S zhkMzhY(VQ)I4!(4+pq8t&$SUAfCu4k>@oH@d!i8@#-fh0Co%g!xo`Z+3gKy+W6!Xs zaK?Ct|2(|T3s?d#z>Dw_ybQ0vtMD3onmxmwWzVta*$eE&CGZBk32(vM_;m-~WiPRp z+1u8veuHU~l5hb&FMS zt1LtG1BM^>Q5O{ti3pL$#zYQlYx@#0?31iX@CgU7i4gD-*+1AjIAi|KMJf`Coxz?4 zLPWT*ci9IYQXafbxZ|{QkG;>1Y<@ykgq2lSze_-bcXI-Ihz&5Z2r{qmXHyC zAc1|vK4y716LT&hew;PLfr~KELQLG8c?cz;;@*0A;6hT(u}Uw_S*6Vi;t2>1NFXqW zcDY4i-Aemabi|)E6}|B`>|eq1*k|k`J9!upj-O_23R^Z1VLZ$drxHSktxrU<&)MV&Hlr_MS!=Er{*ORxjYrNuqOh5GpLbwTd-%r2OksdiH#w zz;>SP=UreCb;M`8k{Cn`MnHgokmUviNEKFsC8N5B;UF{@~gAF65Pm93a1DY1;}8Q43{xpQw6F=HR7y%gqKDHocJ?&wz$ri_(i7g075Rm?BB)^Z} z-M08e!1wvp(=kr6nENetLfPwEgb;vkml zqj3zAF(ig#LLl`+43i0@0Y@X5NMbH#1S}1tk;E&K5lG=4h8A1X$*j-kd7H=_79&Vw z6-x84?VpA=nMbze1uQ1>$pW&FEFxQzZ4k&nAQOQs1hNsxL7?SgvK?7WwkJD~9pOI+ zv_c>kfjk6os1)Gz9Dqy2=CV|uTvyq+A!~!AK6o;Y1EXpokrRf*gvAA)J}XVdQYqO0wlWT2mUxPqJJ=ugn_hz?mu(|yw@@E8kAkgch+c%Tj zY;N5`ZbhIc0+kKqcAMM3u)96O`aS@EA%FdR-6!sUzveJ`%I5VW2;eOJB?2{z$yA0?;!DFvmZRFs+upaS7tN<#%xS}KGJrNSt@ zhesoT<7*rOII1QgFa?3B2;gvFdR3NsY?1XRk3OqRm{rp%{g!zWX9_Ni~Usw_owSvN0%@wC;1p9mOiU-NCVQNrUtCAZqA=3veWE+WK{%Z>Zg zW~1!W^GZa~HhcJn|C`aq*%vL~<{3tQV(-cJ;f4~?2<)fPG}{=39$E69VfNQa@2Y^VHNP1lA+)BWpll17Kt|6j(GJ5e4 z8wy)&9|HSrRKKzTO3UW{!yfItf3?Gqm?&F^6CX9K{SaM*F4ETIyt5xo(hmQ{m3E{B zJT;A*!Grk0^_z|DAv@dQ-Qoqcorgr~;$q^lKO&-|hIJSc8L5wp`INPo#yRhQdokLZ z_Q7nW2pmD+sEz9}ZgN_1n1T-cPb5LK29szJIDx=P8_6lIAT=ONN5}jpNh}?QNpOjR z9d*`5a*j((*M!q%I_*Dc(&-FLlZ60&I9;^ST;ld6tE_o+>wi_G4c*r6^D78kwfVf+ zI=HFye(~xAeX2^Vt)RK48yrf8!J%?fu@>hv*|V8vOKp zTTdTFkjGulQToy+aalm0LJ;6$gFb67GQWe5Zzf+XgZLef|1Yutq_ zKdOcY^1m&M2 zeb$T=GF)YL?8j#m{mMS;7w(b&`qLeQh02}aP;eS+-yNnft!@0hU4=_Y=Z~{bqGcxeA+x9?`Z%t zmYIO7Z00Lw95WulXauokV;h-?%p_(qf^i69O;Wh61$|pF(|KJMF*BH%%q->`W;TNH z2$~U0MKBY=Rv)??W)8E!#&Iq)kC~5P0)p87NsUZB)4(($h#?peG;xCp7X&aXnAQKb zbPcoCCftG`c2f#xD)I?nerC4(+tRJfHfB45X$Ynxn88_#ye-UL2G<(@3*Z2AkogTk z?B8sJPrd_`rbo?vG_Q;&S3{os7;}s#V2(2xuA~T=4%v@IoxrgSm+h`LGRe z(jyTpM6h-9Ss!WZ#}wG&{(hi|;2NVpM-Hk8J0TwUvD;aGfz=IBaZ* zon2&y_=I_CM^n+jJmFP$XIXY$M&UYGB2 z=cA%;GjI7kKHx(>!6*5Yt-0ZvlU*@_9gqrkLa+;hT@mbtU^#a4$MnQ^w5O-`wvto& zq2&BzfwO%<$It6wK2AEewAT6mu7~;F_GKmiM?ue*+1Hf*Z_UhC+Na9?zkcJB{K^lq zFR6IfO)%CHk#lZQPQ{>#a!XBFPkgjnbCe{g(Yd&mMFpXbd}@U*;WUINcVIaBVq zkqpM&UJ`EXQt<73Hq{c}%@I+zFuF0%jNad2I^;OAN4Es8@^gUhHKkX z)EVj=Eun+)_4qJ)KD~)PMPIklFY(3pU-UotVjJSCZJhEMM|`>M&nOwSEmJaDe7PNt zuebF~G``}_#~0dFINsJWSDA;{ha$cV-!l92wfs1KBHzF_^OO0h{9=A7zdOGt{|kO^ z{viHvKFc4$AIl%dpTM8Q|Bk9~M1rEC$ZaGqp z-j4B(>5fH?Z5-P12wVj!fld%5 zh!MnF1&IQKAWzUqP$DQ5lnc5GdJ1|A1__1>SiuOvSiv~K1i>W1Ou;O{LctQjGQkSL zO2KNu7Qt4*Ho*?TPQh8hEx{eZJ;6i4Bf%5FTOkyZLPqEy6bQY95}~h9E>s9r!eC*n zFjtr_EEKjDwiOl&I|w@oy9m1qy9ur3!Xd(8LaPu7M+!#^#|p;@CkQ7ArwFGCIpJ>M z-4-4#f?K4t=+k0Oi>4OGTikaNJNY^VJL#RwPRUNGPU%j0PVJpKI(2jEkXgowhn1bvonp!0DAU?d;|(b(T5HofXb1=K$wWtFzg; zm2(^CV&@Ldot!J2`#9G)k93~w{H^l}=atT@o!2_AbKc^7+WC_6V-XZNh+IY9B85mT z3KVHXMp1?+S5zeGBpN8PioO%A7VQun6rB}a6WtKq68#~1Eqd$X=puG;cky(QyC__g zE+H;qF0n2-E`=`LUA}Y~?lQr}I>}{<%TyQ6WroWvmxV5iU6#6h@3O*WrORrUwJyh8 z?z_^i{;msHq%VmGl;93l=E>%@9- zk~mA8FK#O?6ZaKYi)+NS;{M`+;*sLf;<4g!;tAqO;wj<{;xppg;z!~?t>PErSK>Er zq+1I&k(;ZVo14Zh$t}mNi`!tgp>D(7Sho>wquhRS+u`=B+d;QOZb#gXxt(yk>UQ7l ziQ6-`=WZ|ErS59?RQD|Rp6+$-1KbC>4{;ymKE|DMpW!~seYX2z_oeRNyRUHH>weh% zg!@JJTOKYR9v&8tVvhkHqdaDLSZ8~D=P}n~zDK=BqsJnTB_7K>HhXOK*zU2@W4Fg% zk9{7$dK~mP0RwT-g|-fHt$2;r@ha4U+})HGF~!K zGFkGqq*1a$^0Q>CWV>XiDJNTFQ*ZI%$U+&*z_21^d!+)3m9{)rBC;ZR) zU-Q4|f7}0#f~RPq@KAUud=yfJOcAKiC_)tBibzG2!l1}d6e_+@3{bF&5sFcYF^X}D zX^QEJnTpwp?-X+tn-pghZ$wR!&n+SI$<>QO;M^E5BDZDYq;4D1TAzR~}LxRi03uQeIKsQ9f6` zP`*^YRxv6^RST6!C04nsG^$8dtSUieP?=OMRRyXdRU1_YRcBRKRX0^{Rh?>tYOHFU zYJ%!(6{ni1`bPD=s!6q5byoFM?WA^5i>+!8wYNG_ov2P$=c>O{4^vy!Bh;hSU#aJ+ z7pNQ6i_}Zh%hYSt8`K-sTh!as2i1qvN7TpEm(|zQH`KS(chxV{uhehUe+S?OBR~=$ z3y=qB0zv}919Sli0p$Ue0bIbGfSm!q1Uv|&0-XX~0>y#ufr>y~U{qjiU_zkP5NHle z2}}=c6WA`WLty8?u7PEN-2*EFdj*aNoFBL%a97~-AbyZCC?Y66C@IJklpK^6lp9nK z)Hk@G`BU6G*30pHLt9izcl{@Yl7Paj|pBMyfb)D@V?*!!H0s61m6gL5d0+g z&)}EAueFR;sCCx5YCW|+T3@Z7HdJfYmTUWH2Wzd`5!%t(@!E;nDcY&pZ?#Lb>$DrR z8?{@s+qJv2d$q^4r?h9a7qpkP*R(gZw?f=P!b7q{Dni(hWg%-rnnJAWLw1Jj3fUd9 zH{^K8iI9^ar$cUp+zh!D@_WdiAOy;k)`p_c zuRsnQgf@gO3tb(0JoG{6^UznJe}(=NCI}OTwFq+#^9qX#Gli9e z)rCz7n-jJuY-!l?u$5tJ!ZupNwuEgD+ZDDqY+u;ZaR2c9aBKL)@G0Tb!e@kk6aH=Z z%J2>0o5Qz-?+o7^el+}4_}TCa;a9_Ngx?Oo6aFH?F(ND?F~S^?5|JK}6VWOnKcXMxXVrInbh&d7SA`V8})1uR! zx&gXzx_aG8-74K`-CEr?-FDp$-7eh`-BH~!-3i@Q-8J2H-A&y?-DBM|-SbE$(lN3{ zq$pAx*)pk-m+-Sl?0KMPI5f*Z0tWq3857^|SSJ^z-!% z`bGMs`sMnS`ZfA>`VIPx`YrnH`d#|H`u+NY`a}Bj`iuI@`fE}3Q7fZXN3D%oA9XwG zS=95Wmr-w`!=sa;jnU@llxQ}3QuLJQsnOG8JYtkF>X^Wo;Fz+Q>KJQHOl{17m~}Bb zVs^#siP;zPGM0*EVjW_Iv8LFTvAMDNu|=_8#mXv%5SkF4 zpi78K_%UHu!oh^Y3C9vnS`*GBTur!ykDkZBN>jv^QyA(yvJelWrTF3{pd?!P?5u)=*~X zZKyKT80riI4ahLcFxD{6FwrpCFw3yeu*$I6u*a~^aKLcLaMW%;;}a83TehmFUKCykekSB*D}w~Tj;_l(bs|Ckt)o5|NCHz`d4CXFf5 z6m5z#C728*lPS~G##CbJZK^X3Gz~EgHzCt_(!s(n+dbf>}+;5yPLhtR(~`8hZD2LtTl(4W6WlAD|1_O zdvhmqiMgA(m$|R`OLISSfAc^yGEXp1H`klLH~(N>ZEiCEXx?VtY2IW0#k}8qz2Uq+WfbLXK}CyEzTAfi<`y6;%5o5#8^@+EiHMLLQ5M!%Ego` zDc4hOrTm`qXUdC|S1Es`>QarV=G0{TAF+c|$EJ=;osc>?byw<<)MKe9QctG|)4bE9 zX?|&nG<8~FT1r~Ww7j&!wAN{rX+zV-q>W3PkTx-GO4_uv`DsmQd(-x%9Y{Nob|vj* z+GA_l>vVCtPr5!mE4^)c`}9ufCF$ML%hTEPap@D&r=(9!U!1-yeR=wd^i}C=)3>GX zOh24{Ed6Bqne_AN7t>#5zziybpW&F{m!Zf|WvDZPGPD_8Gx}syXAH|=Ge%~N$rzV0 zA!B;Rtc-6n=47nNSeNl*#)gcI8Cx=b&G;?j2)=^OIF)fG<5tGqj2D^wOhKkorc0(< zre~&4rf;S^Q)n(dtJn(dzLmF<(AlKo}&-0a2KKV+}T-kQB9dtdf}>_gcnv(IFo&%Ts>CHqeH zz3j)?|Kw0P{2W1!Q;vI%SB@k{mLt#6ozWK%PUMYo2?aEKi*moEM*$n3tNDk(ZU1lh-=0GOt%&-@GsLYV!u<4bB^u z$L5X98cxsf4+Y& - - - - - - diff --git a/jsound.cpp b/jsound.cpp index c2ce9d0..37daeb4 100755 --- a/jsound.cpp +++ b/jsound.cpp @@ -9,7 +9,7 @@ bool JS_Init() { return true; } -void JS_LoadMusic(char *musicFilename) +void JS_LoadMusic(const char *musicFilename) { if (music != NULL) { Mix_HaltMusic(); diff --git a/jsound.h b/jsound.h index 9050c59..929996f 100755 --- a/jsound.h +++ b/jsound.h @@ -5,7 +5,7 @@ typedef Mix_Chunk JS_Sound; bool JS_Init(); -void JS_LoadMusic(char *musicFilename); +void JS_LoadMusic(const char *musicFilename); void JS_SetMusicVolume(int volume); diff --git a/modulegame.cpp b/modulegame.cpp index 210e309..1a49c01 100755 --- a/modulegame.cpp +++ b/modulegame.cpp @@ -2,6 +2,7 @@ #include "jgame.h" #include "jdraw8.h" +#include "jsound.h" #include "jinput.h" #include "jfile.h" @@ -47,6 +48,10 @@ ModuleGame::~ModuleGame(void) { int ModuleGame::Go() { this->Draw(); + + JS_LoadMusic(this->info->num_piramide==3 ? "00000008.xm" : (this->info->num_piramide==2 ? "00000007.xm" : "00000006.xm")); + JS_PlayMusic(-1); + JD8_FadeToPal( JD8_LoadPalette( "frames.gif" ) ); while (this->final == 0 && !JG_Quitting()) { @@ -55,18 +60,22 @@ int ModuleGame::Go() { this->Update(); } + JS_FadeOutMusic(); + if( this->final == 1 ) { this->info->num_habitacio++; if( this->info->num_habitacio == 6 ) { this->info->num_habitacio = 1; this->info->num_piramide++; } - } + } else if (this->final == 2) { + this->info->num_piramide = 100; + } if( JG_Quitting() ) { return -1; } else { - if( this->info->num_habitacio == 1 ) { + if( this->info->num_habitacio == 1 || this->info->num_piramide == 100 ) { return 1; } else { return 0; diff --git a/modulesequence.cpp b/modulesequence.cpp index 23fe904..4a1ba2e 100755 --- a/modulesequence.cpp +++ b/modulesequence.cpp @@ -22,7 +22,7 @@ int ModuleSequence::Go() { case 255: // Intro doIntro(); break; - case 0: // Menú + case 0: // Menœ doMenu(); break; case 1: // Slides @@ -41,6 +41,9 @@ int ModuleSequence::Go() { case 8: // Credits doCredits(); break; + case 100: // Mort + doMort(); + break; } JD8_FadeOut(); @@ -59,6 +62,10 @@ int ModuleSequence::Go() { return 1; } else if( this->info->num_piramide == 8 ) { this->info->num_piramide = 255; + return 1; + } else if( this->info->num_piramide == 100 ) { + this->info->num_piramide = 0; + return 1; } else { return 0; } @@ -686,6 +693,7 @@ void ModuleSequence::doSlides() { step++; break; case 8: + JS_FadeOutMusic(); exit = true; break; } @@ -697,6 +705,9 @@ void ModuleSequence::doSlides() { } void ModuleSequence::doBanner() { + JS_LoadMusic("00000004.xm"); + JS_PlayMusic(-1); + this->contador = 5000; JD8_Surface gfx = JD8_LoadSurface( "ffase.gif" ); @@ -736,6 +747,7 @@ void ModuleSequence::doBanner() { if( contador == 0 ) exit = true; } } + JS_FadeOutMusic(); } void ModuleSequence::doSecreta() { @@ -744,3 +756,34 @@ void ModuleSequence::doSecreta() { void ModuleSequence::doCredits() { } +void ModuleSequence::doMort() { + JS_LoadMusic("00000001.xm"); + JS_PlayMusic(-1); + + this->contador = 5000; + + JD8_Surface gfx = JD8_LoadSurface( "gameover.gif" ); + JD8_Palette pal = JD8_LoadPalette( "gameover.gif" ); + + JD8_ClearScreen( 0 ); + + JD8_Blit( gfx ); + + JD8_FadeToPal( pal ); + + bool exit = false; + while( !exit && !JG_Quitting() ) { + if (JG_ShouldUpdate()) { + JI_Update(); + + if( JI_AnyKey() ) { + exit = true; + } + + contador--; + if( contador == 0 ) exit = true; + } + } + JS_FadeOutMusic(); +} + diff --git a/modulesequence.h b/modulesequence.h index 37e393b..a209cf5 100755 --- a/modulesequence.h +++ b/modulesequence.h @@ -19,6 +19,7 @@ private: void doBanner(); void doSecreta(); void doCredits(); + void doMort(); Info* info; int contador;