From e058b12f0716a399817d889475d4ebd83079350b Mon Sep 17 00:00:00 2001 From: Sergio Valor Date: Sun, 29 Jun 2025 17:44:22 +0200 Subject: [PATCH] =?UTF-8?q?new:=20outline=20per=20als=20jugadors=20changed?= =?UTF-8?q?:=20nou=20color=20per=20al=20outline=20dels=20items=20i=20canvi?= =?UTF-8?q?=20en=20el=20timing=20del=20outline=20new:=20nova=20animaci?= =?UTF-8?q?=C3=B3=20per=20a=20la=20maquina=20de=20cafe?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- data/config/param_320x240.txt | 4 ++-- data/config/param_320x256.txt | 4 ++-- data/gfx/item/item_clock.ani | 4 ++-- data/gfx/item/item_clock.png | Bin 400 -> 363 bytes data/gfx/item/item_coffee.ani | 4 ++-- data/gfx/item/item_coffee.png | Bin 623 -> 606 bytes data/gfx/item/item_coffee_machine.ani | 8 ++++---- data/gfx/item/item_coffee_machine.png | Bin 835 -> 1981 bytes data/gfx/item/item_debian.ani | 4 ++-- data/gfx/item/item_debian.png | Bin 565 -> 537 bytes data/gfx/item/item_points1_disk.ani | 4 ++-- data/gfx/item/item_points1_disk.png | Bin 336 -> 352 bytes data/gfx/item/item_points2_gavina.ani | 4 ++-- data/gfx/item/item_points2_gavina.png | Bin 506 -> 498 bytes data/gfx/item/item_points3_pacmar.ani | 4 ++-- data/gfx/item/item_points3_pacmar.png | Bin 492 -> 478 bytes data/gfx/player/player.ani | 4 ++-- data/gfx/player/player1.gif | Bin 9523 -> 10709 bytes data/gfx/player/player1_1_coffee_palette.gif | Bin 173 -> 173 bytes data/gfx/player/player1_2_coffee_palette.gif | Bin 173 -> 173 bytes .../gfx/player/player1_invencible_palette.gif | Bin 174 -> 174 bytes data/gfx/player/player2.gif | Bin 9406 -> 10529 bytes data/gfx/player/player2_1_coffee_palette.gif | Bin 172 -> 172 bytes data/gfx/player/player2_2_coffee_palette.gif | Bin 172 -> 172 bytes .../gfx/player/player2_invencible_palette.gif | Bin 174 -> 174 bytes source/sections/game.cpp | 8 +++++--- 26 files changed, 27 insertions(+), 25 deletions(-) diff --git a/data/config/param_320x240.txt b/data/config/param_320x240.txt index 59c8d01..1fc4cba 100644 --- a/data/config/param_320x240.txt +++ b/data/config/param_320x240.txt @@ -1,7 +1,7 @@ ## --- GAME --- game.item_size 20 # Tamaño de los items del juego (en píxeles) -game.coffee_machine_w 28 # Ancho de la máquina de café (en píxeles) -game.coffee_machine_h 37 # Alto de la máquina de café (en píxeles) +game.coffee_machine_w 32 # Ancho de la máquina de café (en píxeles) +game.coffee_machine_h 39 # Alto de la máquina de café (en píxeles) game.width 320 # Ancho de la resolución nativa del juego (en píxeles) game.height 240 # Alto de la resolución nativa del juego (en píxeles) game.play_area.rect.x 0 # Posición X de la zona jugable diff --git a/data/config/param_320x256.txt b/data/config/param_320x256.txt index e0d8b12..c39a178 100644 --- a/data/config/param_320x256.txt +++ b/data/config/param_320x256.txt @@ -1,7 +1,7 @@ ## --- GAME --- game.item_size 20 # Tamaño de los items del juego (en píxeles) -game.coffee_machine_w 28 # Ancho de la máquina de café (en píxeles) -game.coffee_machine_h 37 # Alto de la máquina de café (en píxeles) +game.coffee_machine_w 32 # Ancho de la máquina de café (en píxeles) +game.coffee_machine_h 39 # Alto de la máquina de café (en píxeles) game.width 320 # Ancho de la resolución nativa del juego (en píxeles) game.height 256 # Alto de la resolución nativa del juego (en píxeles) game.play_area.rect.x 0 # Posición X de la zona jugable diff --git a/data/gfx/item/item_clock.ani b/data/gfx/item/item_clock.ani index 3922815..9d1ebae 100644 --- a/data/gfx/item/item_clock.ani +++ b/data/gfx/item/item_clock.ani @@ -3,7 +3,7 @@ frame_height=20 [animation] name=default -speed=10 +speed=8 loop=0 -frames=0,1 +frames=0,0,1 [/animation] \ No newline at end of file diff --git a/data/gfx/item/item_clock.png b/data/gfx/item/item_clock.png index ac24a2a8b20651d89cd4de56b5a243bfd140ed73..7c87437bd25df619b889ed00f59de148fd55b6b0 100644 GIT binary patch delta 323 zcmV-J0lfZ@1M32iF@GgVL_t(YiRG0c7K1PhKm%_EgP7dr=5gGGd-MQ(JplLEU2yoh zZ4yy4$y9l5ASAH%O)RdVd_E;4889&p&FHVQ<1Jg;f8ao`s$0xc;8~Ia;W+j6qH(Yo zhi1f}q7T>as-A&;XimY3zMEi5DX`Yg^6pLibDn@}R$KPu*nds}!%*LH(eRtd_u5gG z@eO|h)LMfvMg+`2_?4}-V2pvbZG*fkbXVZwS1!vEwAP@M;ti#iIIta1XNdpTEqkIj zhqUcW0;WJL5QC>1m=O>?*rz=&*TC@nxUb$rUc?|A6nK`zAg*jMI4Eo%CY>o*Ak9qi zpR{MD_?BrJ>^vSj7ufP&X9@_;k((*5z|+kXi6stfM;b<(DG;GKq;Fpwm}{`n;{($f V?879_(k1`^002ovPDHLkV1fX9nyml; delta 360 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 literal 835 zcmV-J1HAl+P)Px%{YgYYRCt{2+rMiQVHgMSZ`!IcEjJtviVA}G2PD`rBAr~Ew2O-r2Sw_XOr;bo z!Kvb4X`7*xI;2A_bW@iuIwwP&Ds|BkA==?cOWL4ukUQ?ZyqCN8?z!uwK3^!|F30=H zd-uM5-}{wFH(Ris%Jww_; zIPqo(04@xi!=*DLsJENKCv~=uet|t&Z@^qwKgdOftsms1>(~qLr8f0U$Jt_{idze1 zFSut-VoWTbnIJ_z9^Zfnm;dMahaT|bp=0Y?usGqqIk^&^3Q z74y5TJtyg@lo5CRRJH|NdSH@UXg_*U?oVkCOmYkDM=#3#nTQ^!QikdnA@iaflVskh z?|~|1sE!dbFUm1V<|VoZ#@#~M6BD`z#@#~M6Z2n=fl2mw4D54{WDJaZmUf!X%Vb`n zuf)VXD@^)%naqoFe_FSbOf<@?=l0tz?9q5a53IMFuD3_1!yZknJMvNAd~}9Anpg+W zY%y_#J(_S2>~pVc478&`2Vg({_t~TIx}J%#V`F#5006sR8%kh)XTr0R?9q5iW8m82 zC~gie2!CsfqbL=1r5~i~m5RFH1&NneD(bHFi^2ok_oqr+d!SpMzu6F$4a30fd<&(b zj_J95->`~TtJP4LUxB7+Fbu=D;nyn_bY0SqJdb@hyxGS0j6yW_-9RT&-u1#uIKQMICz!Wsk<=H+1_ve*uc@e`WK}RD=Kk N002ovPDHLkV1hjJl&}B* diff --git a/data/gfx/item/item_debian.ani b/data/gfx/item/item_debian.ani index 3922815..9d1ebae 100644 --- a/data/gfx/item/item_debian.ani +++ b/data/gfx/item/item_debian.ani @@ -3,7 +3,7 @@ frame_height=20 [animation] name=default -speed=10 +speed=8 loop=0 -frames=0,1 +frames=0,0,1 [/animation] \ No newline at end of file diff --git a/data/gfx/item/item_debian.png b/data/gfx/item/item_debian.png index 850892ae5a6a1111fc42b0030e3d65f0868bff3c..3e52ae7386ba52185ce5470bbcc2fa919c910e20 100644 GIT binary patch delta 498 zcmVy^7QR{eHc6vX;;uOtM*ym z`YSK!@y3{k$OC64Z6LAUWH<6Rt7B~-(ys7&3?Sn@=JvABUH zPqgD#_&^&MO2wT+>CSqSCs&^GZpNy2H4)XtFA`@Da?eg zrn4Q8Rr^eKy?+#o8w#@Ii5g2-I2>#1f4_fJFEVV~ChgP^HY075tQ)-yv$0pxSr+Jm z?o%`KPjS}J>@}Nc?W8h~L)xjKP%5Gv)wSb>@1GEZk#b0l);?K=3_ZE-;k~ z`Vd7ItW+Q0Qec z#dLRQrp#MCRi^W2igb5srbw6nF;iga`eQOh_M!sKTRm|~reuIN=)Rdk|CGySigbBM orsO^jd0-#N3#4E=c7ZOYKOW$lU5{bxHvj+t07*qoM6N<$g0yq+?f?J) delta 527 zcmV+q0`UEr1hoW^F@Nt#L_t(YiRG0cZ^A$rhToPY1Vd={3kaqOn;;caESW$eF#Q2j zlVmfKl`|vD=Jx|I2;>~734$3*%`!Pf+Dt$oA)R1%e0RO$V1U}Ixb}GZ-gn>KYr&v$ zr<~C7s4=qE&DXwUptsi>;rYqg{aSG9p$e2t=BYoPUOXwm!hfLLDJLcnRWuB7e*Gdq z`40+Xpg8bT5T`ppGWgI!k5pf_yb_|iheFU!y9#_bfB>bkRqk{!04M})M0IcFxZiq_&t!Qe4v7Pwj~UGA4utuO>5TUx@55*q!l}5+ zwjjO6#`tX&xv{A`KsqVCRt-+YRW3^>`J`xTDEFF5vOB>cb(zU!k#~#SDF8U{Ur5@0 z4q8lS0HD7dC=>u>unGhit}h*!N(V9mWiXQ|0`@NB*ME}RXThO$clo!Fq9E1fVLx7N zRznkrDjJ43?my^vnZdTr6bd~|rpWHL&6IJq$;-6=OkwVJ%@pSHKV}M$?)txE3hPA< z8dsYMz5Zzf)6Gz2iV~=TZkj3dq#QO=n9FT4W$op#4r~G$ffP)~I?%!N17{bPydmdK R(f|Me00>D%PDHLkV1k1w_n-g( diff --git a/data/gfx/item/item_points1_disk.ani b/data/gfx/item/item_points1_disk.ani index 3922815..9d1ebae 100644 --- a/data/gfx/item/item_points1_disk.ani +++ b/data/gfx/item/item_points1_disk.ani @@ -3,7 +3,7 @@ frame_height=20 [animation] name=default -speed=10 +speed=8 loop=0 -frames=0,1 +frames=0,0,1 [/animation] \ No newline at end of file diff --git a/data/gfx/item/item_points1_disk.png b/data/gfx/item/item_points1_disk.png index f82b12ecfac7249780d17220aa1dc46ae620dacc..06fc5e5cb2463b5c211e19bcacc46e9af08f2ba5 100644 GIT binary patch delta 312 zcmV-80muH(0^kCWF@G9KL_t(YiS3m=Zi6rwhF=36x_}hinV|>B9gup0EF7iWAZOqN zS$cv>+@S|>C6uv{!ApipbqB;3Bg~H#XY(T=f%WPi4E_Ox)ds` z%2C00kpKYVI9?R->Wn@R)F6#$m6U6xzl#!d zGaSH#J2)7^P!r+`OBV+d>p-X_RA{ws{Sp#d+K)$H!tVe;5C;rDa9LlR`rZlRfTdZ~ zSa98p0RXP+c8a{i4FIs1Z@F~9%@dDbeUj<%-q@375&z0T=YMWRM5z&>$gt}nrBpi4 z$^w**0gUv7GU|qXLMoh{+HY3H_!<7UDP;BdN+KRn>kNJ0*OKLV-WW@pk|c?eEDXce zoKz@VsEV!d^Fmd)kd*}pDL@F(may{u4|RawBcMi%0%KG;us=5{)XkLVZpkY%k||@Ps2bM#-A<|kW4i}48&%U=Lk4P5GZi9tl_U( zHf$Xz1fe*RVmO6CtpX-Urj{^Q#Ma}k_x3)TCBS3a++BY6e%<>58&*Iq7W1ee4~GeP zURIleUEiLf*Xt1%p|C*}U=_v~Qw~4!D=SoN*kGkN=Qw7gT7UO7mu+H<2}^}l61;7) z?%?Fi>5^g|i7>Q$Eqp%AjQd`|5@v!LW0*bMiT`CBivLa@c!4nq z-y_d+V4X=9?HmEKI8h#gcMJhwF|CIxwIpYos>5X*VtY?r>-1OO(tYPT^Wn(<- z(6Rr%NEarPNkPSOFc?@})(*(9YPLD&R;aRRg1JJyyA5LuX`0qngSd&Z&UL1|y<}>G z_0j*EDZ4jnVugjn;V@`2Q$8-BBxoZuMTROs*~+T6#zb?aGcTq;U>W+mGo_jUU}YIO zQ?M>>)XWr@#(=t)BFh)*HB-_wEgE+lO0I5iRNu4j_@aEgRLlSX002ovPDHLkV1f&> B)5-t< delta 467 zcmV;^0WALV1NsAyF@Lm4L_t(YiPe=qOT$1I#-A1ig(6sR(VFh`7(%laI0@++@M}J6s&SLT z7ZEqFx{BRz1qxq8qxTV7tyX69@MBmAC5vg8l#*-?!>|yl7k`RiuF$&8d`?nIOb#Xx zzKD`9V_}|kXO~w_hwNT|YKu!-_;4Or*GmBtm<_sP0|a-sdb}Al^|;{y$_wy%4|IBh zIH(T90Xse%W3^fVh&}0|qYGd@QzQ{ezaapum-*1#z~$ zFvKZKgfm!*{YGv|^V zwgGdi4W~-=(6-s7V*h=ySC~$x5%-qucDsC&GGSa#DT0zk8_X42si!O!i`;0?Cvn!f z_LQf`fEL&?`hPv;*r$%w7WVu7T9uyi(gktQR(gsFB}_om%Cz=w-biI$FMq%$^mlto z+5tdp8QW8UIJg16r??ab0?ey0Wufeqxx$d-aOG;l$@SV>)i;x<`0Hat&1V1r002ov JPDHLkV1oIz;qm|g diff --git a/data/gfx/item/item_points3_pacmar.ani b/data/gfx/item/item_points3_pacmar.ani index 3922815..9d1ebae 100644 --- a/data/gfx/item/item_points3_pacmar.ani +++ b/data/gfx/item/item_points3_pacmar.ani @@ -3,7 +3,7 @@ frame_height=20 [animation] name=default -speed=10 +speed=8 loop=0 -frames=0,1 +frames=0,0,1 [/animation] \ No newline at end of file diff --git a/data/gfx/item/item_points3_pacmar.png b/data/gfx/item/item_points3_pacmar.png index 810c945dd078272f89c633e8edcbb4bb652758bb..19d546600d107340842839cf109c0855578fd136 100644 GIT binary patch delta 439 zcmV;o0Z9Jr1KtCWF@KmzL_t(YiM5qIZo)7e#h=ZGSWqRRN?BSCfZzgMSUYviNjOAL z!pg+T!UaINK)WDSjRai~1l*-De>?sNZt^C7{`BmB;>X~T$Pz*OY%pi8_0~xVYCWqH zmk%enG-w2!*5#e8CnH$th%6BjWP)hQ(*xR*kph(s39A5dL4UdJD4}979QEz>M_II3 z_5r{;PF<=F|Bky@_A!hj4C6>{a*gx2cWZ~<9Tktd$TulOmIzLr)gdObMBwuIZ%}cM z)90u=6dyJl%vpOfDnYC0x;rX=O53(jKb8@u zxr6C($Tul?+6V3N3NZasn#~jdIIqUyo=kB*4nD98 hL_t(YiM5qKZo)7a#h=}RSWt_iN?8yGFi7m}fVx#3DlWqz zdYOocm7&>@Aa_8jDhgc?ptuV$w&On`ByVyY`^U3C@;w5NSj4#eoQxCVT7T~YtzO@i z`F;fM0_P@;phKM7*#G)9I#wQ7#JB(%Ai7S;4#Q2VK*d173V(oHP?}qD*S!j;izw~@ z;1J{E?N3=WowWhLIxo9a9iERnowd;m1N6c`Y;w)huyq-iy*pVnXkyW!U=ia~c2>lgM6u|8Anm$a)Rk_kk0f5G6Ny=u5{H4^J vDFASs5BN2i;%p8+unXh`%3%4~2C7Z}0$(TaR9Dj&00000NkvXXu0mjfEoIa> diff --git a/data/gfx/player/player.ani b/data/gfx/player/player.ani index 6316805..cea7556 100644 --- a/data/gfx/player/player.ani +++ b/data/gfx/player/player.ani @@ -1,5 +1,5 @@ -frame_width=30 -frame_height=30 +frame_width=32 +frame_height=32 [animation] name=walk diff --git a/data/gfx/player/player1.gif b/data/gfx/player/player1.gif index 2fe3cb1fcb8ea442ee3236825e81b36f6028d610..fe6044b95c46aeff4c0e8c8a70cc486aff509445 100644 GIT binary patch delta 10676 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 aX`bfi-DYi`#=$O=Z3+i$F6_RA0029jrM6)J diff --git a/data/gfx/player/player1_1_coffee_palette.gif b/data/gfx/player/player1_1_coffee_palette.gif index b403c17cbb8a1292424a1b7a2ff67b4df903a2e7..108c27f0f00d9225e105326d49cd0b440240b9a2 100644 GIT binary patch delta 13 UcmZ3>xR!B3G;^Af{lqwb03UD!U;qFB delta 13 UcmZ3>xR!B3G&2JO!^Aj$02>wqi2wiq diff --git a/data/gfx/player/player1_2_coffee_palette.gif b/data/gfx/player/player1_2_coffee_palette.gif index 58a13f65b0e885606aebdd929ac413e5249af9ef..772936e96df9bf4bab290438ace60d91b0a80cac 100644 GIT binary patch delta 13 UcmZ3>xR!B3G;^Af{lqwb03UD!U;qFB delta 13 UcmZ3>xR!B3G&2JO!^Aj$02>wqi2wiq diff --git a/data/gfx/player/player1_invencible_palette.gif b/data/gfx/player/player1_invencible_palette.gif index 1c85424118ca46f4038bfa69e05ee6075d4e106e..041e846170c551f7e8ea4b95ed2839570492e9cf 100644 GIT binary patch delta 13 UcmZ3-xQ=l`G;^Af{lvHc03V42V*mgE delta 13 UcmZ3-xQ=l`G&2JO!^F4%02?m@i~s-t diff --git a/data/gfx/player/player2.gif b/data/gfx/player/player2.gif index f68dfc5fb92fdcb380708bdac5674cc82ca68e60..f89b9948b075e2542a36f870cbba8211e3255bd2 100644 GIT binary patch delta 10494 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 z zKu0-AfCHF+@B9Q|LHW&}{_{mC1?fM(`qcCR_NhO8>o*~nYhnKK<%#?ih`;>m*QFHF z|NZv^{|4?SKm5kcR0nXR|HlrWP{O|u?0`%YY{a^Fxp8*Qs_HkbU3Sa;ZU=uus zJAqcG+28#+h6Fy%K0)9G8Xu?ONd=}r1a{yAeqbMe7{I6vl&5vU2?~@%s9^M=pbLWF z{l(xtT^|R^ib9c5^x@z{CDaby;0c<`LjmCi3SkcZVCaRPV@$x1a1^G=9}_xZ8$qEB z+)@*Y$P;$K6;2_ite__`MNgHL{~16SCe;`cU>P#W8TJGjnqf|%p%LcF$lwYOs-XqY z;e*(J;T#Iq&;%hL9+t69$pKWrK`_9E7-AbT6(JfTA{K)p0u3V;gCp(&B$|vQ?gAw; zfF;_MA!Z^4c;X=j+nR*p2$bR|79u#9|Dr0QVkv?mD=O9l=)x=>A}I30Eq+%l(xNVy z;w|bzE}GXa)}k;1BX!B5FAgIz7US)(#0K$y!YcY=S?pFb?jkhKqBK$$HTt48@&Yz~ zRs%TW0&wF3cq219KrZxxE`R|#9)wYS);Xr5I!XXL>Vi9(BRw*}I>sXd*rQfF1wQIy zI`Si$-NaKkSvuCiLH0sF7M4NMV?xp+L%NPb#v??=qeLzbMIvMbDC7cQTE^MQ5#0<`9$V@I&ozO6<;5io#Tni~UDw$FTyh;3H37x-rC_Sr%LS$Y z#N8BW-Ng}R51E}6b!E&YraxTel=)pZX3ZFB75#J*% z=kqjY1U;vIL?@heU-m&?5GDq8lAi+Fz;${b_{G`$ji32p0eP-p{8?e5lxKR*;FRGX z0wUl87D0SA;Cy=LcQW7sHXwak|0f5669ujyfT~jo+93wQlcKSp)sWf?USADr;DffH z4dR&yBH^$oVSV->5oRd&ZKw`^cBqUV!Z diff --git a/data/gfx/player/player2_1_coffee_palette.gif b/data/gfx/player/player2_1_coffee_palette.gif index af339dfc11a7199b7d887b3a4e4caf730a5b87e7..4368e889f3792b674d3d6a11fe2195f5161f86ff 100644 GIT binary patch delta 13 UcmZ3(xQ1~;1an$i+QjHU03h51wEzGB delta 13 UcmZ3(xQ1~;1TzBz!^G%702<;0g8%>k diff --git a/data/gfx/player/player2_2_coffee_palette.gif b/data/gfx/player/player2_2_coffee_palette.gif index abd3f888d7e623403a18a54ecdb5324208b8bfbc..6bab1c1922ce790c4c0a13023458c3e53e17b6ec 100644 GIT binary patch delta 13 UcmZ3(xQ1~;1an$i+QjHU03h51wEzGB delta 13 UcmZ3(xQ1~;1TzBz!^G%702<;0g8%>k diff --git a/data/gfx/player/player2_invencible_palette.gif b/data/gfx/player/player2_invencible_palette.gif index 2c569cb2062270a4ba5aeeb34e0f36fc62c32532..29a4939f8c310a26121127c07f2f091c76b0567a 100644 GIT binary patch delta 13 UcmZ3-xQ=l`1an$i+QjH!03i+py8r+H delta 13 UcmZ3-xQ=l`1TzBz!^G%d02>qoi2wiq diff --git a/source/sections/game.cpp b/source/sections/game.cpp index 58c857b..2e5d770 100644 --- a/source/sections/game.cpp +++ b/source/sections/game.cpp @@ -1733,13 +1733,15 @@ void Game::initDifficultyVars() void Game::initPlayers(int player_id) { // Crea los dos jugadores - const int Y = param.game.play_area.rect.h - 30; - players_.emplace_back(std::make_unique(1, param.game.play_area.first_quarter_x - 15, Y, demo_.enabled, param.game.play_area.rect, player_textures_[0], player_animations_)); + constexpr int PLAYER_HEIGHT = 32; + constexpr int PLAYER_WIDTH = 32; + const int Y = param.game.play_area.rect.h - PLAYER_HEIGHT + 1; + players_.emplace_back(std::make_unique(1, param.game.play_area.first_quarter_x - (PLAYER_WIDTH / 2), Y, demo_.enabled, param.game.play_area.rect, player_textures_[0], player_animations_)); players_.back()->setScoreBoardPanel(SCOREBOARD_LEFT_PANEL); players_.back()->setName(Lang::getText("[SCOREBOARD] 1")); players_.back()->setController(getController(players_.back()->getId())); - players_.emplace_back(std::make_unique(2, param.game.play_area.third_quarter_x - 15, Y, demo_.enabled, param.game.play_area.rect, player_textures_[1], player_animations_)); + players_.emplace_back(std::make_unique(2, param.game.play_area.third_quarter_x - (PLAYER_WIDTH / 2), Y, demo_.enabled, param.game.play_area.rect, player_textures_[1], player_animations_)); players_.back()->setScoreBoardPanel(SCOREBOARD_RIGHT_PANEL); players_.back()->setName(Lang::getText("[SCOREBOARD] 2")); players_.back()->setController(getController(players_.back()->getId()));