From acbe509c05e42577a74521dea5ac16c918e98dff Mon Sep 17 00:00:00 2001 From: andreja6 Date: Thu, 19 Apr 2018 00:15:16 -0700 Subject: [PATCH] Fixed errors Changed bit depth --- content/images/rico16c.png | Bin 1412 -> 484 bytes content/images/rico256c.png | Bin 1593 -> 792 bytes main.cpp | 4 ++-- 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/content/images/rico16c.png b/content/images/rico16c.png index 03d6118431dd78556921e8e6f4608c8f765641e3..264bcf862e1f87a17af791ba0a00bbf7fbbc1cbf 100644 GIT binary patch delta 376 zcmV-;0f+vC3*-Zk83+ad0047(di0SYJ`(^5a7bBm000XQ000XQ0h0LxrIU&TCw~Do zNklpR-v; z>lGFBW*M(nRM4An`1l;B>HTU8%*Y22ajCF*gq2*oIW&Mic~sD37Z&2O00QyS04Z&* zP`?-HdpH0zsN%{1=~yvkbi#8#NRi7XtCF60dhS+*EWFcG4H&l$3Q&Q0a&Be z8T$$b8=C-X2x`+12g|+RFHju-^%$V^#K_?Q_s8!6=%0{ph|TpL^vtt2L>NH68K^gO zkNBc6*#Hr!_b|P|^vweZ%wycf_1owYKwv(@>$(LHn78>G&<1n)H4l0Z2Th<2mh$VK zqTeqF-hiN18@R%KLk4I4xLAWWfI>|~wE@uvq)?ZmN{pyEDAY4{3mIw-3iZfWH4GnA WS$2#8MAjVu0000Hlo~KFyh>nTu$sZZAf7)d{-_%R12aQ_Plzi}4^Yj50|%C! z`f%XRf&afh{QnOW7zLvtFd{-AWPj{^1_nlkk|4ieV9FoKfFbxhJFwhf;4JWnEM{Qf z764(!waR--fr64Ht`Q}{`DrEPiAAXl1&Nt?C3<k6!GHcFVdQ I&MBb@0Io2PwaHfx9MXtYnVS^{`jmpW%dSe3jpkdpsp4@HlJiZV<5Jkf%CF1-^=>7u9u2+ zwbT^=s203f2!fzi@>LRqbs+(W$bSIPqLG;|3p&IujR>(ZR{+-W2EcO&fH~~ekT|IT z;T_)rz?{P8Xw(vmjecEKlas@&J-^-q+;kp101#U^B6T5lpaw|AM0zOzVptn3kIPyB zXgwkTo}*byeE^Jc{NU@{0Vso8ikqkuO(7bb)QL-;HXxF;{#>hH0hGr3uYX;XHn96; z02({MNwO=p(2aX}Tn3q&pK@`38-Rrzfbp$0jw+1VdN()t8sMZDB>)~)+%L#&#=wx9 znd3UxR6iI?c*a=%6%+v1rU$^;Xbsx{nla6rrkm(z01R>fB#r=h#}HqQ3ji|6mN~`z za0ne2+^YcK9nV#aLud(5AAfPj0NexiV&oKbfSdz^R-8*P$YJdW@+Sc8{!pj~L1hSA zmJL8lz!zxe2moRd0AzPT;BzZJY9>VXa{!wS0a{6W3Bb)cBNZHn;67^u3?x$-fW|zM zcMx-@PTc_(dlSIhuL8K@3D<*2%U1xT&D0}z`3xceFF_0}#~}dQI)9Ix1J*H`sX(~4 zP8bAhqGO&r^K8I7Bx*b*dBG0Ew)+{2JDycwcg0S`ngsC;NC1v+33x~^Qv!`DSwV>g z2LQYhgm+`B=|1xE{G-2DsfFb`iLoc07*qoLHlo~KFyh>nTu$sZZAf7)d{-_%R12aQ_Plzi}&jJUB0}2d4 zl@Amc4k$Q0P;fW^6iIM+;Nb8e!C^r{!-0f`2MG-e8X6WXII!TrfddT<2NpCuXlQt_ z0LVD-03>waz?}of{sYYz1*0J_ltSR}3w1LF21bUGAiv=MBO5RTe`g1l8w{KU9+AZi z4BP@B%(zy0Zz)hvvcxr_Bsf2(>(p*OW(6t3{=b>>UIzT(jj0S5`OYes^({DZ>rVQw z+=v&lHdh7o7@YVbT@nsx*D_1&SJY>eZb<*ke_+S03ib(Wxm+jSK7P&olK(~S-%Jx` zN3~26XPC2~XqCXF<9Sb8f=l!r`c8dYcvv=IV)}yfn(fyDs@8R14e^_CDD~3Ga0UCD z+?@tLPcNA)%)R%sUHJlo192PsuH6Jb9cY1XK;a7Q0Bg4GuEwl;M8!5R!-Fk-ka)l s;j(GHX0*a=F^&n7)`m0O7Th>RzO8y%$c#gQQ$Tsn)78&qol`;+0KgXj2><{9 diff --git a/main.cpp b/main.cpp index ce9fb0c..033b35c 100644 --- a/main.cpp +++ b/main.cpp @@ -313,7 +313,7 @@ void Demo::onUserInput(UserInput* ui) { if(ui->keyPressed('v')) { messageTime = System::time(); - message = convert(getOSVersion()); + message = Convert(getOSVersion()); } } if(ui->keyPressed(SDLK_F8)) @@ -600,7 +600,7 @@ int main(int argc, char** argv) { //settings.useNetwork = false; //settings.window.width = 1024; //settings.window.height = 768; - if(getOSVersion > 5.0) + if(getOSVersion() > 5.0) settings.window.defaultIconFilename = GetFileInPath("/content/images/rico.png"); else settings.window.defaultIconFilename = GetFileInPath("/content/images/rico256c.png");