From b1ce2a50e70133cc149404d76d85aa0a13406690 Mon Sep 17 00:00:00 2001
From: David Lara <dvlara@gmail.com>
Date: Sun, 24 Aug 2014 22:20:45 +0000
Subject: [PATCH] Optimization: replace TTF Fonts in parchments with graphics

 create mode 100644 graphics/pergamino1.png
 create mode 100644 graphics/pergamino2.png
 create mode 100644 graphics/pergamino3.png
 create mode 100644 graphics/pergamino4.png
 create mode 100644 graphics/pergamino5.png
 create mode 100644 graphics/pergamino6.png
---
 graphics/pergamino1.png | Bin 0 -> 624 bytes
 graphics/pergamino2.png | Bin 0 -> 626 bytes
 graphics/pergamino3.png | Bin 0 -> 657 bytes
 graphics/pergamino4.png | Bin 0 -> 684 bytes
 graphics/pergamino5.png | Bin 0 -> 672 bytes
 graphics/pergamino6.png | Bin 0 -> 619 bytes
 src/comun.h             |  12 ++++++++++
 src/pantallas.c         |  52 +++++++++-------------------------------
 8 files changed, 23 insertions(+), 41 deletions(-)
 create mode 100644 graphics/pergamino1.png
 create mode 100644 graphics/pergamino2.png
 create mode 100644 graphics/pergamino3.png
 create mode 100644 graphics/pergamino4.png
 create mode 100644 graphics/pergamino5.png
 create mode 100644 graphics/pergamino6.png

diff --git a/graphics/pergamino1.png b/graphics/pergamino1.png
new file mode 100644
index 0000000000000000000000000000000000000000..e4368ffe7ce4eb83ec506e2da3f4a107380b0138
GIT binary patch
literal 624
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K54lpqT$!X1@Ux5^7fKP}kkp2$>3~^On??8eD
z9+AZi4BWyX%*Zfnjs#GUy~NYkmHjS<7#FwB@3Yr*fu{ZPba4#Hxc7F3W8Px}9tPIA
zEc={3cs|f(oyW7c=|krOZSS22&A7!oL)gFOowk&i_|V7YrlM}!1B<@LAk?psu76GP
zpt`twsP5ka>wBLIm(|~L|Ej=nk#honQ)@cQ2050gX)GfAOihxEmmMb*x+%O=nDJ|$
z@52i5XDmfK8{+j3oMv4v{&BbSgww2ltXX>EV_i<)s=oE>)&4*heX$h@w_TVz7rBag
zJv$L#cqe?0dQ*fYccEuTlVnF`v*>0Xy+sNepY*Z>Z*-KO)Fg7P&`~r`P2;q0g5ng{
zW6lfq7#`coVX}F~fiM%t#}6e#@^n)6XJ#jeEpnStASoK6>ed<R@OENX6VLD13YkOo
z(*t52Fp1afe-QTY!TX}`As^-)G{5S$-DG>da7GbZne83!5|;pFc0Sv!#w=TyLRD{k
z4Vxj7=#pSLW352KnJsUPPw1QqGMH|n_+sVUZvtAMud%ucEMwU#^VT>aFZM$Bk@g1%
zrMZqotX#Krx^kA;ldcmn3A$z(=hG)>rJhPvoXxOMZIjd5J<sAagn4b)#TpeigokMR
zi1~$R3akk@YV~cB>4w%Cog3%4Zh1C7P_0idIA}j1Wc_{fs{aq%zwoO`2Y&b!cH?E*
zotI?~Uba2?UAJP|?zO>|egEgIT%UhxUOu-qB+kHO%{gha-$&1^iCnxNm@pVTUHx3v
IIVCg!0B6AlH2?qr

literal 0
HcmV?d00001

diff --git a/graphics/pergamino2.png b/graphics/pergamino2.png
new file mode 100644
index 0000000000000000000000000000000000000000..46bdb5c391a016af670468040eafa018b0055731
GIT binary patch
literal 626
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K54lpqT$!X1@Ux5^7fKP}kkp2$>3~^On??8eD
z9+AZi4BWyX%*Zfnjs#GUy~NYkmHjS<7#A-;{|APfK-2zsx;Tbp+<QC2w{M97PitV<
ziRBJ!l;&Uh#8t?pt$ljA4Eu~%moBXGnl(%B?3VjY78*aFw9IFhYYWg2;c9hS81Q1^
zr>h6AG5<&@Fxni$fBa*de0tWFuP;~_w(>2U!?5`aLxLq^M>WG7KZZ8Bh7X(uiTn=7
zg%@P+TVAk_tCpeG+98hrz;<T6{72>bj`#T{$TKde-Q4$Ed29Y6zTXdOpM6{wl2b2r
z+VHvDf^f!5%pWXwh<OHtunS-E6zY}aIA(pik|V(52&;#h=}F-Y9p@Olg>rWZAFbh9
zuV5v*Jar8NgM&ae>ykruF{yhQ1>Bf(W14#ROga?8@{xg~Z)JmLGF#`w(;BPS?@T+d
z!>tw(oXM=hY}BaoLeo1)WI~U_j|$HJceqs<7&#8avvbt_xOnZ5oQ4V0jV*F@<#(<W
za37h)_>KL572^_*lk5v_pT6hC`{$@liuuat4W0r!ejPkf&HXM&PDk?Yl2gG9p~5SL
z4c{`nUu$~8Qv1^{n`UW-yawf^HyM9?;XdlC;vD<wO+)TWgACr1CRR^rqZ6M`XmB&+
zuKn)CTXN*iCia-UJ!f<;>aN|E7x=Yhed-FeuZ#By@Bdra#_)$fT=5lqp#2XgMXtDb
zuH7*`yJPtF#7wx;JO9(&_tkda^V45^b-npI^&u?IAW?VzE4R(_9Wu;9>-GYZ27{-o
KpUXO@geCws8U8H*

literal 0
HcmV?d00001

diff --git a/graphics/pergamino3.png b/graphics/pergamino3.png
new file mode 100644
index 0000000000000000000000000000000000000000..df4c3ca332042cd3e9c9167f448a05289a65d704
GIT binary patch
literal 657
zcmV;C0&e|@P)<h;3K|Lk000e1NJLTq00961006)O0{{R3mV;IG00009P)t-s00030
z|NsC00A6}Z?f?J)32;bRa{vGf6951U69E94oEQKA00(qQO+^RY2o?$t0z-Em<^TW!
z8%ab#RA}Dqn8A*tFbsyHoRFU);uQHQEuRoiVR5qZl;hB83(E{NL%ZD_`9Gil$wv}`
zf8r2aE|<&Ya=BctJ>|2NOAFwO%CVG^>*4db)cr~=&1bX$fR+ZKYyiEq0ASbvh+6<0
zHvonffba&8umzyq2GG>ry0Co<Z2)~cK%Ni4w*yX3;@=*Ez8xUH9WdUiU9Kv$O`?Wt
z6#fiz()cw_Fs%SnJD{up+zKdA0s;$L@D(NqNigIj@Gu}`?0^Xi2^ooH$e4hqhgTvf
z0@RMPNU4CFvm%$D12p%F4MUg#G2H;92?i|O&;y$UvQ=acuYF0{VTSQxfVB*@t(iDT
zAtX@@heP=90*V71;DDC{mNr)XfUYOBy8S(1X(ATG5UyTn1-+ZpqX0#?yUo(1z6H!K
zWTqlPBE=#RqD0nIG>XN=dV3e3n9PMNq?@r#P<zlZPqD^RGYUa7sUv{75CVw-#u*Tq
zM^>Bx=1!6i0p<zSScP#0n6Kaxpt$>oVnfiBJ8Mp)5Q}Eupgha~8nT&Gzu$u_+Vzpe
zW?||WwFlyf^E?MB_hwSC{}!TLjMZe1v~^=;pm_))3UoAt^(tI%6&ru^rn7)?v)gS0
z=)sU)@HvA6{(+$S{(Yn84}L}dpfM2z&rgM&PR5;12cAwyUiRCR@0Du#&-2?AdVW&&
rd|KG$a=BbCm&@gHxm+%n>uY@gQogkcGQh^C00000NkvXXu0mjft>zdo

literal 0
HcmV?d00001

diff --git a/graphics/pergamino4.png b/graphics/pergamino4.png
new file mode 100644
index 0000000000000000000000000000000000000000..f5b261b78de0565065289d62d1574dd9ec4da521
GIT binary patch
literal 684
zcmV;d0#p5oP)<h;3K|Lk000e1NJLTq00961006)O0{{R3mV;IG00009P)t-s00030
z|NsC00A6}Z?f?J)32;bRa{vGf6951U69E94oEQKA00(qQO+^RY2o?$u0AM3=Q~&@1
zHc3Q5RA}Dqn8AwUFbsx+PeD&%ax!{Kp;O6I2%m(Wa^-Z|4$W-cth?LUL4P1Psr|)r
zu>Mrj6bgkxp-?Ck3O!O8?QBN?Uvy4pR@&*~{8_g<t+idz4ghKggt7xHas&XU9f0@<
zfYT1Za0DQ{17th`(0K<qG~TDMe+$O|`gVZ49)NEL3@_rp4nf}zkRJ`WPpN`({Y|02
zh`Qy*j|}TKSGHTSlV^70)~VVBgP#EPDFEH)&l`ZB0!&)Krva&|A|Y^MolG-MFy-rV
z{2riL7BJG8NixC-NLbVaW@pI>yNf8I&}NW)SV1r!#Zpai1C%bn->>2pf&<PWIAFa1
zv>U<--f1?ez`1HMfFw+aezSN~y7XqC=zwIhdhDw%2s1NhH7#XH-hdu}+;mz9ZN8{L
zm<ULd5Aey*qYyfKL2)o2ydNOnE++;c0RJJtcVfEVQHKDsZDzGk9``2zdkUbF8crp9
z18uEUk{_Ed%>~Juk{$y@bD1%FR&9Y3HB)d$RG3rCvwl%~fa1^c!41G77XSk28L;*N
zWw`*T?g9At3&jCN!7Wr|G0y7-pfjLAVj}I#K-8b#{Qcw>EyhiG^?4;-W=^@c2AbTw
z++N+v+8UsMA8t|ZOA2oIA~5!qCZnHubri4;0&WKP7q&A5;2R{>_y2E<`oWK=9~>-1
z!Rt$5!^ODaa^P@5^6dLmZk<~D{`z`{USE_QFAIl4p-?Ck3WY+UP$(1%eXU;yNUsX0
Sdcd~;0000<MNUMnLSTX>`5sRI

literal 0
HcmV?d00001

diff --git a/graphics/pergamino5.png b/graphics/pergamino5.png
new file mode 100644
index 0000000000000000000000000000000000000000..893fe63c8c13b18809ae52a15a9ee7b39c438795
GIT binary patch
literal 672
zcmV;R0$=@!P)<h;3K|Lk000e1NJLTq00961006)O0{{R3mV;IG00009P)t-s00030
z|NsC00A6}Z?f?J)32;bRa{vGf6951U69E94oEQKA00(qQO+^RY2o?$vAM`Ly-~a#u
zDoI2^RA}Dqn8A*tFbsx~PsmS!dW!OtmQRSMusB72%5|W$OjBl(p}U>k^?#rVA|ECV
z{)4;D<#M@PE|<&Y`b^>M#o7XRaxtiC$cO83ult$YT6$CfFlmFL6o8Ag0B|e-#4P}Z
z0>Ib;5H0{iYyqUc05pxa5Xyg{4Uparkk<p^+X1I1@lQWOdOJY=H^4PnLFFW-A}g<p
zEXB&Vao%Oe`3^|m0`MIm)c|F?7J-tbN%Jt(4h0CP4_FJJ6nY*6abX#aXSCJ@D_3G3
z1(d_M0j3PV769@Gz}Byw1G(6MF$2f|0lS1SNbIX47|{SBM75dFbm@8S$$(G`NMQ-t
z{s79W3PF$!7^~+%%azxZ52mw#coHBFzdtl5I=}&c0pMV_BXMVNpITcycF4H-({}+k
ze>wmVhy-gg2op}TfQ<;9CG_50Ds>Sze>wml(>T~YIw4D|Ks;Mo9n9l;SnML;=1+$J
z2^nC{pg9rqWDyKGN#oUTHh($>q#a=9SOV7Mey~F^|4HUR8(^ZOA_fR6zzl2ir-KO0
ze^NJI)S|bWa<n;+aj@qGSPiS+{OJI|d7^BZ2}LQA3aa%%af!el1vY>BVw1K11iUQ^
zZrG)L0O(1;{NQ+1fV~al(-r<3UT1W`4@j!-|8Dg9!9P(yXe>nG>q}v$i*cvRfu{?S
z>&}J3{i57{?BCAN>x;7I%fc>~%jI&pTrQW(<#M@P&-DujGpP(>?)obL0000<MNUMn
GLSTaSKOn6D

literal 0
HcmV?d00001

diff --git a/graphics/pergamino6.png b/graphics/pergamino6.png
new file mode 100644
index 0000000000000000000000000000000000000000..e011697c75811b8df9d3329349df820742161094
GIT binary patch
literal 619
zcmeAS@N?(olHy`uVBq!ia0y~yU<5K54lpqT$!X1@Ux5^7fKP}kkp2$>3~^On??8eD
z9+AZi4BWyX%*Zfnjs#GUy~NYkmHjS<7?+Sv!r6LLplM${T^vI)?!BFHFzc`Zk3+A&
zTYO@X(J!yX!6(8y=CtfD3NpLa*K>B=?yb^Q7fd+cIu}W626FU0wg92eqN(2w=em42
z*`A!e_Qtc^>a$OK-paavRbj|vR+!Ji-OrI=%c<4Np)rqzMVV>YWQE5a4wpO)zSQzQ
z{G;8&`Q#zfzWogHdNbmV-1l>o(|b^_zap%pZ?AV_>YKPD3}K1=_0wYfg1=wY*m3Zm
z)`ZzCcP{X~Icm-&wc**pjaNe&6chy5SKVb|Td^qqmT41fQv#FHvOBvw?l9b7na#!E
zQSKX18PV{zqFPv>e7ORrk$7+H=7S|1No$To=d)D%?9n@UE#YXy(u7r0ULLl8sonTY
zR`M%rZ}+kbPM3N1`99p8-I)IRpq=&&HP)u{VZyNwn)WMLWc437+tj;GyQ7EuL32Yp
z>mpwdr{uc@6CxIdas=cqw{AKUb;(<7?b4*Vd0VeBL~mbU6diqfH&<U+<rlF7|2Sr>
zUHh~*;?Zt}()$ZDyjOH+U0Am%(qO~1C1*3=_bLdcXJ_k75$9$*C3N|KluP%X!Ydzi
zS+7K^Wv>@~{_ax7H?#cNq7Rld)c+}B6Sr{;to>8G_&oo=qkj?#1X#bzxBBuwUUt0k
zGV{sn$G=3alY4mj=a0WWd;bTN)#<ze#}_o#EcNY}Pw4Hc%9sO86AYfNelF{r5}E*I
ChYjEW

literal 0
HcmV?d00001

diff --git a/src/comun.h b/src/comun.h
index 30a9aa1..77517b7 100644
--- a/src/comun.h
+++ b/src/comun.h
@@ -18,6 +18,12 @@
 #define RUTA_GRA_FUENTES           "graphics/fonts.png"
 #define RUTA_GRA_TEMP              "graphics/temp.png"
 #define RUTA_GRA_PERGAMINO         "graphics/pergamino.png"
+#define RUTA_GRA_PERGAMINO1        "graphics/pergamino1.png"
+#define RUTA_GRA_PERGAMINO2        "graphics/pergamino2.png"
+#define RUTA_GRA_PERGAMINO3        "graphics/pergamino3.png"
+#define RUTA_GRA_PERGAMINO4        "graphics/pergamino4.png"
+#define RUTA_GRA_PERGAMINO5        "graphics/pergamino5.png"
+#define RUTA_GRA_PERGAMINO6        "graphics/pergamino6.png"
 #define RUTA_GRA_PERGAMINO_ROJO    "graphics/pergaminorojo.png"
 #define RUTA_GRA_PERGAMINO_AZUL    "graphics/pergaminoazul.png"
 #define RUTA_GRA_TITLE_MD          "graphics/titlemd.png"
@@ -81,6 +87,12 @@
 #define RUTA_GRA_FUENTES           "/usr/share/abbaye/graphics/fonts.png"
 #define RUTA_GRA_TEMP              "/usr/share/abbaye/graphics/temp.png"
 #define RUTA_GRA_PERGAMINO         "/usr/share/abbaye/graphics/pergamino.png"
+#define RUTA_GRA_PERGAMINO1        "/usr/share/abbaye/graphics/pergamino1.png"
+#define RUTA_GRA_PERGAMINO2        "/usr/share/abbaye/graphics/pergamino2.png"
+#define RUTA_GRA_PERGAMINO3        "/usr/share/abbaye/graphics/pergamino3.png"
+#define RUTA_GRA_PERGAMINO4        "/usr/share/abbaye/graphics/pergamino4.png"
+#define RUTA_GRA_PERGAMINO5        "/usr/share/abbaye/graphics/pergamino5.png"
+#define RUTA_GRA_PERGAMINO6        "/usr/share/abbaye/graphics/pergamino6.png"
 #define RUTA_GRA_PERGAMINO_ROJO    "/usr/share/abbaye/graphics/pergaminorojo.png"
 #define RUTA_GRA_PERGAMINO_AZUL    "/usr/share/abbaye/graphics/pergaminoazul.png"
 #define RUTA_GRA_TITLE_MD          "/usr/share/abbaye/graphics/titlemd.png"
diff --git a/src/pantallas.c b/src/pantallas.c
index 0b27369..e6377da 100644
--- a/src/pantallas.c
+++ b/src/pantallas.c
@@ -271,57 +271,27 @@ void mostrarpergamino (SDL_Surface *ventana, int *pergamino) {
 
 	SDL_Surface *pergamin = NULL;
 	SDL_Surface *temp = NULL;
-  TTF_Font *fuente = NULL;
-	SDL_Surface *marcador = NULL;
-  SDL_Color fgcolor = {0,0,0};
-	SDL_Rect desmarcador = {0,0,0,0};
-	int alto = 0;
-	int ancho = 0;
-  char renglon1[18];
-	char renglon2[20];
-
-  fuente = TTF_OpenFont(RUTA_FON_VENICE_CLASSIC, 18);
-	temp = IMG_Load(RUTA_GRA_PERGAMINO);
-	pergamin = SDL_DisplayFormat(temp);
-	SDL_FreeSurface(temp);
-
-	SDL_BlitSurface (pergamin, NULL, ventana, NULL);
-	SDL_FreeSurface(pergamin);
 
 	switch (*pergamino) {
-		case 3: sprintf (renglon1, "Twelve crosses");
-						sprintf (renglon2, "against the devil");
+		case 3: temp = IMG_Load(RUTA_GRA_PERGAMINO1);
 						break;
-		case 8:	sprintf (renglon1, "Twelve brothers");
-						sprintf (renglon2, "hid and died here");
+		case 8:	temp = IMG_Load(RUTA_GRA_PERGAMINO2);
 						break;
-		case 12: sprintf (renglon1, "Four brothers");
-						 sprintf (renglon2, "changed their faith");
+		case 12: temp = IMG_Load(RUTA_GRA_PERGAMINO3);
 						 break;
-		case 14: sprintf (renglon1, "An invisible path");
-						 sprintf (renglon2, "over a wood bridge");
+		case 14: temp = IMG_Load(RUTA_GRA_PERGAMINO4);
 						 break;
-		case 16: sprintf (renglon1, "Jump to death");
-						 sprintf (renglon2, "and prove your faith");
+		case 16: temp = IMG_Load(RUTA_GRA_PERGAMINO5);
 						 break;
-		case 21: sprintf (renglon1, "Glide through");
-						 sprintf (renglon2, "the beast cage");
+		case 21: temp = IMG_Load(RUTA_GRA_PERGAMINO6);
 						 break;
 	}
 
-	marcador = TTF_RenderText_Blended(fuente, renglon1, fgcolor);
-	TTF_SizeText(fuente, renglon1, &ancho, &alto);
-	desmarcador.x = 127 - (ancho / 2);
-	desmarcador.y = 81 - alto;
-	SDL_BlitSurface(marcador, NULL, ventana, &desmarcador);
-	SDL_FreeSurface (marcador);
-	marcador = TTF_RenderText_Blended(fuente, renglon2, fgcolor);
-	TTF_SizeText(fuente, renglon2, &ancho, &alto);
-	desmarcador.x = 127 - (ancho / 2);
-	desmarcador.y = 85;
-	SDL_BlitSurface(marcador, NULL, ventana, &desmarcador);
-	SDL_FreeSurface (marcador);
-  TTF_CloseFont(fuente);
+	pergamin = SDL_DisplayFormat(temp);
+	SDL_FreeSurface(temp);
+
+	SDL_BlitSurface (pergamin, NULL, ventana, NULL);
+	SDL_FreeSurface(pergamin);
 
 }