From e3b66dd532565a58b284740d12cda114f6fbaa04 Mon Sep 17 00:00:00 2001 From: util1 Date: Thu, 25 Jul 2019 09:42:01 +0200 Subject: [PATCH] fix las bugs of last optimization --- 1v13D.g1a | Bin 22876 -> 22868 bytes build-fx/map | 88 ++++++++++++++++---------------- build-fx/src/FxEngine/1v13D.bin | Bin 22364 -> 22356 bytes build-fx/src/FxEngine/1v13D.elf | Bin 34200 -> 34156 bytes build-fx/src/FxEngine/texture.o | Bin 908 -> 788 bytes src/FxEngine/texture.c | 7 +-- src/FxEngine/texture.h | 2 +- 7 files changed, 47 insertions(+), 50 deletions(-) diff --git a/1v13D.g1a b/1v13D.g1a index 71e3b784fefac4131e1aa52364e63b2372f89497..fc585d41c1c991823d21f2d668b2976f74725e62 100644 GIT binary patch delta 293 zcmcb!iSf!NM$uJk_O74MF{_v7|9c?J`uG3;velm_iW)PS7;f}h$;cS8`3qw^qoPU& z!xshy21Wq}gK!ZJ0oDx+46GYC1b{*eLDdWlel?rtFrQ{*T(UWXwT4aP5_@X23r8vY zLq-#ygk;B96CEa>%|E!?*;y|z82CMy+#(#!cwzDb;cCVglVe1VGk%$@BD$TCWAYtQ zdBzEo|AAaKFt2tQ@U8Ix;(AaKRx2tQ@U1(R!lt2^8a9zj?5WW%9Hs0J8BKf=k{x4BbeMcL|KMzAXT88+;P+s1i(oY4g~<;Ds~KNR zjuAS}_+_$+@ODOy$#;b187EBsBP`9BF0gb2R~>mCM!zzdsmG>n;8pMaT5 zwAKqTifj(CUCzYFu=$VuVi2{!$(#{L-EcN%2FeMzE3@FM$&Wv)Y(Fw^+GNtSf869Ic|KMzAXT8B-;P+y3i(oY4jmZxLs~JB` zjuAS}_-C?;@ODOl$#;b18D~uXBP`8WFj+#xp0Q+egb2R~>k$Tnz#E%$G>n;8-+-A* zwAKqT%4`m?UCzYFvH6evVi2{!$(#{L-EcN%2FeMzE3J4Jpyd-o3BLJgpRc-(P diff --git a/build-fx/src/FxEngine/1v13D.elf b/build-fx/src/FxEngine/1v13D.elf index b9891e1ed19935d09f55fba13393939bc79f4c38..ecba3e4aab14a3a03c5043e35de5ec2f0c746c21 100755 GIT binary patch delta 5995 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 FcmQA*Cg}hG delta 403 zcmbQj*26wQ+4l+q0|PUI36Nx9&|u(Z;JV1}!ja(2D3=~QRBgX z2JQqd22QX_1_l8j&G8=!pkfRYGs;uAfgG?TBLf2~kSzpK2*OZ4kO=|I3=Hf*mIRcm z0#pc8!k`A_a|nX;m!wvdloqAxB{Re)63Ni`|3|t@$P{0afvjFu? zwq~?oPR&W2T*zoUc|D^AX9iFe4-j)q{=gWYXa;0~lrsS_2t)ue%pD*;&g!Q>7mb>0>rYXcC2f{b(W9wup4P%s-$zQd#} O+5=>{12GJM9S;DDY%zZT diff --git a/src/FxEngine/texture.c b/src/FxEngine/texture.c index bdfde29..42618c3 100644 --- a/src/FxEngine/texture.c +++ b/src/FxEngine/texture.c @@ -1,10 +1,7 @@ #include "texture.h" -static unsigned char const blanc[8]={0,0,0,0,0,0,0,0}; -static unsigned char const noir[8]={255,255,255,255,255,255,255,255}; - // textures address -unsigned char const * const FE_textures[2][8]= +unsigned char const FE_textures[2][8]= { {0,0,0,0,0,0,0,0}, // full white {255,255,255,255,255,255,255,255}, // full black @@ -12,4 +9,4 @@ unsigned char const * const FE_textures[2][8]= bool FE_get_pixel(int num,int x, int y) -{return (1<<(7-x)FE_textures[num][y]);} \ No newline at end of file +{return ((1<<(7-x)) & (FE_textures[num][y]));} \ No newline at end of file diff --git a/src/FxEngine/texture.h b/src/FxEngine/texture.h index 1a65fab..791b59d 100644 --- a/src/FxEngine/texture.h +++ b/src/FxEngine/texture.h @@ -9,7 +9,7 @@ // textures : 8x8 // du bon vieux bitmap monochrome, la routine quoi ^^ -extern unsigned char const * const FE_textures[2]; +extern unsigned char const FE_textures[2][8]; bool FE_get_pixel(int texture_num, int x, int y); #endif \ No newline at end of file