diff --git a/data/Tupfile.lua b/data/Tupfile.lua index d7d332528c..356f89ef83 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -147,10 +147,16 @@ extra_files = { {"kolibrios/demos/life2", "common/demos/life2"}, {"kolibrios/demos/relay.lif", "common/demos/relay.lif"}, {"kolibrios/demos/rpento.lif", "common/demos/rpento.lif"}, - {"kolibrios/games/doom/", "common/games/doom/*"}, + {"kolibrios/games/BabyPainter", "common/games/BabyPainter"}, + {"kolibrios/games/bomber/ackack.bmp", PROGS .. "/games/bomber/ackack.bmp"}, + {"kolibrios/games/bomber/bomb.bmp", PROGS .. "/games/bomber/bomb.bmp"}, + {"kolibrios/games/bomber/plane.bmp", PROGS .. "/games/bomber/plane.bmp"}, + {"kolibrios/games/bomber/tile.bmp", PROGS .. "/games/bomber/tile.bmp"}, + {"kolibrios/games/doom1/", "common/games/doom/*"}, {"kolibrios/games/pig/", "common/games/pig/*"}, {"kolibrios/games/fara/fara.gfx", "common/games/fara.gfx"}, {"kolibrios/games/jumpbump/", "common/games/jumpbump/*"}, + {"kolibrios/games/knight", "common/games/knight"}, {"kolibrios/games/LaserTank/", "common/games/LaserTank/*"}, {"kolibrios/games/lrl/", "common/games/lrl/*"}, {"kolibrios/games/megamaze", build_type .. "/games/megamaze"}, @@ -434,6 +440,8 @@ tup.append_table(extra_files, { {"HD_Load/USB_boot_old/", PROGS .. "/hd_load/usb_boot_old/MeOSload.com"}, {"HD_Load/USB_boot_old/", PROGS .. "/hd_load/usb_boot_old/enable.exe"}, {"kolibrios/games/arcanii", PROGS .. "/games/arcanii/trunk/arcanii"}, + {"kolibrios/games/bomber/bomber", PROGS .. "/games/bomber/bomber"}, + {"kolibrios/games/bomber/bomberdata.bin", PROGS .. "/games/bomber/bomberdata.bin"}, {"kolibrios/games/codemaster/binary_master", PROGS .. "/games/codemaster/binary_master"}, {"kolibrios/games/codemaster/hang_programmer", PROGS .. "/games/codemaster/hang_programmer"}, {"kolibrios/games/codemaster/kolibri_puzzle", PROGS .. "/games/codemaster/kolibri_puzzle"}, diff --git a/data/common/games/BabyPainter b/data/common/games/BabyPainter new file mode 100644 index 0000000000..48652a3740 Binary files /dev/null and b/data/common/games/BabyPainter differ diff --git a/data/common/games/knight b/data/common/games/knight new file mode 100644 index 0000000000..b14a9a8bc5 Binary files /dev/null and b/data/common/games/knight differ diff --git a/data/common/settings/game_center.ini b/data/common/settings/game_center.ini index 1cd53da107..c1454a65e3 100644 --- a/data/common/settings/game_center.ini +++ b/data/common/settings/game_center.ini @@ -6,7 +6,7 @@ default_icon=35 [3D Shooter] Quake=/kolibrios/games/quake/sdlquake,56 DOOM1=/kolibrios/games/doom1/doom,43 -DOOM2=/kolibrios/games/doom2/doom,43 +; DOOM2=/kolibrios/games/doom2/doom,43 [Arcade] LaserTank=/kolibrios/games/lasertank/lasertank,72 @@ -23,7 +23,7 @@ Tanks=/sys/games/tanks,67 Pong=/sys/games/pong,12 Pong3=/sys/games/pong3,12 RocketForces=/sys/games/rforces -Pig=/kolibrios/games/pig/pig +; Pig=/kolibrios/games/pig/pig Arcanii=/kolibrios/games/arcanii,12 Xonix=/sys/games/xonix,21 Ataka=/sys/games/ataka @@ -52,6 +52,7 @@ Fara=/kolibrios/games/fara/fara,42 Kosilka=/sys/games/kosilka,23 MarbleMatch=/kolibrios/games/MarbleMatch3/MarbleMatch3 RedSquare=/sys/games/rsquare -BabyPainter=/kolibrios/games/baby painter +BabyPainter=/kolibrios/games/BabyPainter Klavisha=/sys/games/klavisha,69 Millioneer=/sys/games/whowtbam +; 21days=/kolibrios/games/21days/21days diff --git a/data/rus/settings/game_center.ini b/data/rus/settings/game_center.ini index 365a1a97f0..5a18c6c2da 100644 --- a/data/rus/settings/game_center.ini +++ b/data/rus/settings/game_center.ini @@ -6,10 +6,10 @@ default_icon=35 [Шутеры] Quake=/kolibrios/games/quake/sdlquake,56 DOOM1=/kolibrios/games/doom1/doom,43 -DOOM2=/kolibrios/games/doom2/doom,43 +; DOOM2=/kolibrios/games/doom2/doom,43 [Аркады] -LaserTank=/kolibrios/games/lasertank/lasertank +LaserTank=/kolibrios/games/lasertank/lasertank,72 Heliothryx=/kolibrios/games/heliothryx/heliothryx Dungeons=/kolibrios/games/dungeons/dungeons JumpBump=/kolibrios/games/jumpbump/jumpbump.kex @@ -23,9 +23,8 @@ Tanks=/sys/games/tanks,67 Pong=/sys/games/pong,12 Pong3=/sys/games/pong3,12 RocketForces=/sys/games/rforces -Pig=/kolibrios/games/pig/pig -Arcanii=/sys/games/arcanii,12 -Padenie=/sys/games/padenie +; Pig=/kolibrios/games/pig/pig +Arcanii=/kolibrios/games/arcanii,12 Xonix=/sys/games/xonix,21 Ataka=/sys/games/ataka Sea War=/sys/games/SW,66 @@ -53,6 +52,7 @@ Fara=/kolibrios/games/fara/fara,42 Kosilka=/sys/games/kosilka,23 MarbleMatch=/kolibrios/games/MarbleMatch3/MarbleMatch3 RedSquare=/sys/games/rsquare -BabyPainter=/kolibrios/games/baby painter +BabyPainter=/kolibrios/games/BabyPainter Klavisha=/sys/games/klavisha,69 Millioneer=/sys/games/whowtbam +21days=/kolibrios/games/21days/21days diff --git a/programs/games/mblocks/trunk/build_ru.bat b/programs/games/mblocks/trunk/build_ru.bat index 9d76f7ae8d..0b1ac61518 100644 --- a/programs/games/mblocks/trunk/build_ru.bat +++ b/programs/games/mblocks/trunk/build_ru.bat @@ -1,5 +1,6 @@ @erase lang.inc @echo lang fix ru >lang.inc @fasm mblocks.asm mblocks +@kpack mblocks @erase lang.inc @pause \ No newline at end of file diff --git a/programs/system/taskbar/trunk/build_en.bat b/programs/system/taskbar/trunk/build_en.bat index ed8bdf9d02..c10019d717 100644 --- a/programs/system/taskbar/trunk/build_en.bat +++ b/programs/system/taskbar/trunk/build_en.bat @@ -1,6 +1,6 @@ @erase lang.inc @echo lang fix en >lang.inc -@fasm -m 16384 taskbar.asm panel +@fasm -m 16384 taskbar.asm @taskbar @erase lang.inc -@kpack panel +@kpack @taskbar @pause \ No newline at end of file diff --git a/programs/system/taskbar/trunk/build_et.bat b/programs/system/taskbar/trunk/build_et.bat index a31ef246c0..6ef92a71f4 100644 --- a/programs/system/taskbar/trunk/build_et.bat +++ b/programs/system/taskbar/trunk/build_et.bat @@ -1,6 +1,6 @@ @erase lang.inc @echo lang fix et >lang.inc -@fasm -m 16384 taskbar.asm panel +@fasm -m 16384 taskbar.asm @taskbar @erase lang.inc -@kpack panel +@kpack @taskbar @pause \ No newline at end of file diff --git a/programs/system/taskbar/trunk/build_ru.bat b/programs/system/taskbar/trunk/build_ru.bat index e67adda469..ffedd69ce6 100644 --- a/programs/system/taskbar/trunk/build_ru.bat +++ b/programs/system/taskbar/trunk/build_ru.bat @@ -1,6 +1,6 @@ @erase lang.inc @echo lang fix ru >lang.inc -@fasm -m 16384 taskbar.asm panel +@fasm -m 16384 taskbar.asm @taskbar @erase lang.inc -@kpack panel +@kpack @taskbar @pause \ No newline at end of file diff --git a/programs/system/taskbar/trunk/ctx_menu.asm b/programs/system/taskbar/trunk/ctx_menu.asm index e24208bebd..aca7dde552 100644 --- a/programs/system/taskbar/trunk/ctx_menu.asm +++ b/programs/system/taskbar/trunk/ctx_menu.asm @@ -104,7 +104,7 @@ draw_ctx_menu: add ecx, 60 ; 41 mov esi, [system_colours + 4] ; sc.grab or esi, 0x81000000 - mcall ,,,[system_colours + 20],,[system_colours] + mcall ,,,[system_colours + 20],,[system_colours+8] mcall 8,<0,133>,<22,17>,0x40000001 @@ -113,7 +113,7 @@ draw_ctx_menu: mov ecx, [system_colours + 16] ; sc.grab_text or ecx, 0x10000000 - mcall 4,<36,7>,,ctx_menu_title,ctx_menu_title_end - ctx_menu_title + mcall 4,<32,4>,,ctx_menu_title,ctx_menu_title_end - ctx_menu_title add ebx, 1 * 65536 mcall