From 734b394c931ca0d6d612ed558e005850acdb25f6 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sat, 16 May 2020 13:32:10 +0000 Subject: [PATCH] fix various bugs found by Yuriy Olegov git-svn-id: svn://kolibrios.org@7928 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 4 ++-- data/rus/settings/games.ini | 2 +- programs/cmm/barscfg/barscfg.c | 2 +- programs/cmm/barscfg/panels_cfg.png | Bin 469 -> 1236 bytes programs/cmm/barscfg/panels_image.raw | Bin 14985 -> 17982 bytes programs/cmm/eolite/include/settings.h | 1 + programs/cmm/lib/patterns/libimg_load_skin.h | 2 +- programs/cmm/misc/build.bat | 1 + programs/cmm/misc/software_widget.c | 13 ++++++++----- 9 files changed, 15 insertions(+), 10 deletions(-) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index a8f6a8adde..d4f72c5c44 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -286,7 +286,7 @@ if build_type == "rus" then tup.append_table(extra_files, { {"kolibrios/games/Dungeons/Resources/Textures/HUD/", PROGS .. "/games/Dungeons/Resources/Textures/HUD/*"}, {"kolibrios/games/Dungeons/Resources/Textures/", PROGS .. "/games/Dungeons/Resources/Textures/Licenses.txt"}, {"kolibrios/games/Dungeons/", PROGS .. "/games/Dungeons/readme_ru.txt"}, - {"kolibrios/games/sstartrek/", "common/games/sstartrek/SStarTrek_ru"}, + {"kolibrios/games/sstartrek/SStarTrek", "common/games/sstartrek/SStarTrek_ru"}, {"kolibrios/games/WHOWTBAM/", build_type .. "/games/whowtbam"}, {"kolibrios/games/WHOWTBAM/", build_type .. "/games/appdata.dat"}, {"kolibrios/media/zsea/zsea_keys.txt", PROGS .. "/media/zsea/Docs/zSea_keys_rus.txt"}, @@ -302,7 +302,7 @@ if build_type == "rus" then tup.append_table(extra_files, { {"HD_Load/mtldr/install.txt", PROGS .. "/hd_load/mtldr/install_eng.txt"}, {"HD_Load/USB_Boot/readme.txt", PROGS .. "/hd_load/usb_boot/readme_eng.txt"}, {"kolibrios/games/ataka", "common/games/ataka/ataka_en"}, - {"kolibrios/games/sstartrek/", "common/games/sstartrek/SStarTrek_en"}, + {"kolibrios/games/sstartrek/SStarTrek", "common/games/sstartrek/SStarTrek_en"}, {"kolibrios/media/zsea/zsea_keys.txt", PROGS .. "/media/zsea/Docs/zSea_keys_eng.txt"}, }) end --[[ diff --git a/data/rus/settings/games.ini b/data/rus/settings/games.ini index bb76143948..fc19158c11 100644 --- a/data/rus/settings/games.ini +++ b/data/rus/settings/games.ini @@ -32,7 +32,7 @@ Sea War=games/SW,66 Almaz=/k/games/almaz,81 Tanks=games/tanks,67 RocketForces=games/rforces,110 -Pig=/k/games/pig/pigex +Pig=/k/games/pig/pigex,120 Ataka=/k/games/ataka,35 Donkey=/k/games/donkey Loderunner=/k/games/LRL/LRL,41 diff --git a/programs/cmm/barscfg/barscfg.c b/programs/cmm/barscfg/barscfg.c index da0a616bbd..da10a2505c 100644 --- a/programs/cmm/barscfg/barscfg.c +++ b/programs/cmm/barscfg/barscfg.c @@ -287,7 +287,7 @@ void EventDockyProcessButton(dword id) { if (BTN_DOCKY_ATTACHEMENT == id) { dkLocation++; - if (dkLocation>3) dkLocation=1; + if (dkLocation>4) dkLocation=1; DrawWindowContent(); SaveSettingsAndRestartProcess(DOCKY); } diff --git a/programs/cmm/barscfg/panels_cfg.png b/programs/cmm/barscfg/panels_cfg.png index 45bf07d3a76d5646ee8d4cc2fc1034260b57b6ee..76f7e903cec91dd5255fcc69bd04dd31d81fe9a5 100644 GIT binary patch literal 1236 zcmeAS@N?(olHy`uVBq!ia0vp^szAJmgBeJE{Q4!3fq|JJz$e5N$PMxJjfjc$h)i>c zEnyP+%dmyPbZPP>7M63i^X{!y?U_BNb^C+e`wz7IX_<21>AYjlZ``~8|NO6n= zQ2nzci`CpWnC@(Y7z81Kva7kj0Fkh{|7z|J3=Aw_aqZPS2K>Rg5bkOo4Wajjt9g2W zQgcjsgx*0s4pNx0+5@Z}Xd?)$=4n{XKVvn2h0wcu5D_2=Qv(;!0IC6Up6&PnBtcOQ z)Tnp^OpiF?SggRYU=9WbHDE#ldY(m7aW&roa3}y%AOi!N3yWs;1eU)|KsIAZkY6x^ z!?PP{Kz5U-i(^Q|oVU|o_cbdBv_5?l7Q6lHrSJ9ESXsK+W+XdB%zFFtqRC6~Dw!u| zE^xT??vP%qnfc25<-Qv2O8MD&+n46vp1EM&`ME~3f`g{$S57NFZ#y|TV)B<2kv;tj z^aAYtB(JUdBLBTMB52BX$3m}P)q=|p?f>JRwP>k^i$-X+YSz*P=2F(O?SGh7Z1z7qQ4xkDBqss_;!lsofA#`$9?9i_Xn9>Pn5W}?|t~Oo3~139ShGfYV8W! zz+!z=S9DFo(j|+NtO7i1SDX&n>KUg!wUCXWnCXM6)NHAV4@#%Zh~GGI(U*(*?w%*6 zFDsFmy3`$V!iuMZ3Aa;mv`%{!oIQ@pl!L)6MB>-+6RA^-He z&K6DUI=}%Z~eJQV{2xs=9%eL6S;zC=zlF@o?@kO^V*@BmCWHYnrdzuPuatoqhrPVhiOT# VzSe@6kD&64!PC{xWt~$(69CaJR^tEw delta 456 zcmV;(0XP2C3DpCT7k`Hc0{{R3rj%gR00004XF*Lt006O%3;baP00001b5ch_0Itp) z=>Px#JWxzjMU=qhR837-TwUbkh%5Jb-)nO zP^gJfH@zRm#4mUjxt2(bh;DAXT~I~}w9 z`qwl$How5GfPd>SKhYoI?(RgR@{}zcr_qn2w$5chX`8C+I@PwVqKvAhX)+XJ3_*cw zMN8l*=BQ`|93@5y(u~R_z)h{A?%r|S41mlDgfB^4YVb5At0^{8lsWqQQ3B=5P$rJ{ zrEtD%MD9xAe3{tJQ>F!MwHD6T)JpcEFuq*t<+%iKw?QXMfU{C}uf5(3kelTk10000`H4*^*cXnE6=rqR7ImLlNW@Rb71#f*{sWO%{iB^K8#S5LWBRm&IY7 zuWv|fOazd`Y8_Atg0RZs(~HA87M4p8gw;UuWihQ|ez3iD@