From 7c25661fa8fdd9041d56dd41e4805a81e0285ab6 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sat, 21 Nov 2020 13:06:10 +0000 Subject: [PATCH] Upload smaller House.3ds by macgub git-svn-id: svn://kolibrios.org@8229 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/common/3d/house.3ds | Bin 1963 -> 1738 bytes programs/cmm/browser/download_manager.h | 17 +++++++++++++++-- programs/demos/3DS/3ds_objects/House.3ds | Bin 11977 -> 5297 bytes 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/data/common/3d/house.3ds b/data/common/3d/house.3ds index db033a75aa9a3ec8204deb75dae0266807448a2e..1d4b33366d48d02f7436ce8fdfbcafc3b1f7f460 100644 GIT binary patch literal 1738 zcmV;*1~vIhP(w?x6aWAL0000ez~UwVyVIztq2$Tbm3^8-Cz%C=ilhaNa6}VR1dL{se-zbBze|5Ih>tq4F##N`+%(R zYMKY4MuLlwhZlNZZ-YOiQ!|06twlDN{O12@8CF6%`_KZ6EIQrrHf5Mv zqLdTtioS)oX%qpe)KxHpIhbCeZnus=?~7YjTSG0NO7>r}{X3#?H8z>%#8Q<(Bs6>H z5|3LJv$vW{a-kyeMAH4yzB=zD6|G-AWWE(U#u>n!MsaUVq<)+o*XA4{b*E)2}?eth6QooJANe$rsL+09|)k|M@nE=dh7b&T%Hyt|-Bo-OwFBx%})PZ4S~@RTP9 zinGKlp*CMU5K$Bq?|=n{N~Xc6 zdmyIK^fzEApswl7Ck6MAGTsIE->ney&FFP|43O@=L^~f=e}Qs&g7bRyXW~eu*FN-8 zfH0@_91xOn7;rJIv_WVq!GyCqXYLEI))uBgb0R3rU#hhwm#r< zfUN zKFD%ft9@*^4c;Nm1zsVet6)u~6*#9fQ?~(MuwJPym2dDC3)#IHVU3jE(iT9o+dTmm zT4%Y%V?2Lcn)+sDX7tJ7hEm?8D+o_FXkpLg2uqEk0z3Tw4ksQ6eWR@Xl^Ps`z5$^P zsekHRuEY_Wo+Rp1)7#VIh~$mn?O=MCeGU+|et&icZSD(AMz+hd53&^8OrXy-<3ZB6 zrNLr+YUvd@r(G(CZCZqkKQj(YEOmP3nj{%m19m?j-Qg%jF{O_dk9(}FW$_Z~8-RlI zWLn;r)#6JnoRdM-u~~abA;l0#>{jBtXyf$m^i9_zi}N0tB?wQqKt2B~%#fM{(qrb4 zxJJA!A>y66MDnBSPC6}HC2u01{z9Y!YijdFVqqUw-TWDsOhVkJv(CUq=$Egd8nl5U zqngzwW=JI&jftfwtxO5Aa&R_Zy_w7hr+`cQUcQY`#2;5K2FJ?R?oQM~oXbVYunp*` zV|X7;eRAwi;9epo25nw1#7}!P+lReQDb%i3ct=pcls_u;J_Er#0uDF)yd2uCXX+nk zP7QHSSjdw<$H$u47*|>zcCqy6r3FwqA#~hrY^x5|XhQCM{ia%4=3C^x5O1TD-STnMB={+d~7&xyBmWV?mNFm6V{i$#Dq;3Q0 gb>!Ax^>43LDUGJlMUanF0p7Xf>q-x4+q0eUsb67WxBvhE literal 1963 zcmV;c2UPe=P(w@Y7XSbO0000ku;V5GyVIztq2$TbVVfDKqzVdUhCVI31kKm0vElm#Xu5H z2%*e7B0kN)8AEHvPtDSbKbL!|2O4Vt$~EW5C~Qky$jZTWN%t5SJbnzfei*H&p8*Jc z;V(X3x~U-iL)~_W~|-RIR|FZgVae$ykLu6i#Vs-~ndAk9fS1 z>zbgjj^vInnO8QNp#1wUl331(IeGQ7`2}FWdAkm;BYfB&EzB)+=5|K~e5vj(ukGZ^ z6Ww1e`rvEtOSa`+ngBuwO>9$$nO*x>Q43zF3s)K}qB?E>noo|?9G-KB#+J~K!Gsni z7z&%J9^7Qqrw~vuT@_zwOE~LR+pqDr!nOQDO2PW}HPOClE1Q)4rq=&FadC;GSjF^< zmjds7v^u930rZ7m4;{X=$F_4tGe`#YO@3YO(G8WL}7Q~GO8;j<5#lE*<|EbCF^Jp%7 zXX~HRaqt|Si_F0s`uY!=x{NU@#3r&D^a2y5?2wevla5PcYKF<>MzgPa00*kn2 zfHY)^=DAMRcak25M-9Z6Ed1-~82pEivzke26I~h;Kb;djV~`0-h^wCJ9oZ_%01Blm zj);WOGQkikARL|r+Y^8L!(Wvx%<_~5cZ1UFcIHe{sEYibh0Fj7PRtEDq3Y=R+RF~f zX^QFj8ae8TG*Wu6)J;pM`0sGb=Z8i1Q=1#s9+WLVq~9Cu+|VD(nGt64}YBet8B$Y?RwG7jS)Bzjlt!~XxW?V#gqg!<=;s- zK)I`=5x;SYeYb`lSK;{ZbF~Vp)hPFY*|}DpahtBtZo$Ub?Ja=w>E#};FW&nimmp*4 zv&j-XV5s!WcgoZDMDDICk8#o}j5}rWV~c%;;Sd^?L~*Odjg8?xTkl2c_#6{sEVMHL zasd|u1SCsyO>w+x$&@2f6-V-?$XdBLh(Opb9Rz-@87|oy<*gNm&Wvg#-75;%9I8Au^e4qL-289@06jE0e7U|OLS#4}S zqg&91BOh51P@Y5KY3cg9r6Soy9E$Tj5OHT7+CQX+_jelxb$d0rHn{&Gyq)MBeZ5jj zoo@3#MK{)n%dL%!8dH;L?<2zvB%Ag%Pp&^DDIcVa4X$e^9j1-7RMprq_)O8P4h}Pm zvl2r@I%QewxYn8zy%9|VcDm^BFOqqpPz;wTgji*|ta5bo>mT~i%VjtsN`GgTa@iKW z|7l!}d^6!E!#O-G4-b03b1y;AWTDhZVLr4-h=3+*Tf^dsm>B#^1=1Sl#q^~bouo{; z!V0hy9PH>{FqHc%eU3eS`JJcm6lseHGQAjPnx25gPx&RkT_&h39lZe$u3t|!%{P<} zcp^C{$Bowy5MZWL%8JN_=m9QYGmmR=c9&)aq9yYDKH5|G|=Dglb@#&N=P%hYNz xtrRVL2PjVsZwPk>@{mStPKz4yg)1y5!CC+S diff --git a/programs/cmm/browser/download_manager.h b/programs/cmm/browser/download_manager.h index 9490a21747..24bc0755b8 100644 --- a/programs/cmm/browser/download_manager.h +++ b/programs/cmm/browser/download_manager.h @@ -138,9 +138,22 @@ void DL_Draw_Window() void StartDownloading() { + char http_url[URL_SIZE]; + char proxy_url[URL_SIZE]; StopDownloading(); - if (strncmp(#downloader_edit,"http://",7)!=0) { - notify("'File address should start from http://' -E"); + if (!strncmp(#downloader_edit,"https://",7)) { + notify("'HTTPS for download is not supported, trying to download the file via HTTP' -W"); + sprintf(#http_url, "http://%s", #downloader_edit+8); + if (!downloader.Start(#http_url)) { + notify("'Download failed.' -E"); + StopDownloading(); + } + //sprintf(#proxy_url, "http://gate.aspero.pro/?site=%s", #downloader_edit); + //if (!downloader.Start(#proxy_url)) { + // notify("'Download failed.' -E"); + // StopDownloading(); + //} + DL_Draw_Window(); return; } if (!downloader.Start(#downloader_edit)) { diff --git a/programs/demos/3DS/3ds_objects/House.3ds b/programs/demos/3DS/3ds_objects/House.3ds index 5cd6911c4085d93f66518889f3304743e51b721f..03e26c6ac175de0aac9990498b4f96445ac42149 100644 GIT binary patch literal 5297 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