From 366038fe9d59c593b7853940171a52a704fda3a7 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sun, 21 Feb 2016 20:10:27 +0000 Subject: [PATCH] add Almaz game to autobuild git-svn-id: svn://kolibrios.org@6276 a494cfbc-eb01-0410-851d-a64ba20cac60 --- data/Tupfile.lua | 1 + data/common/settings/game_center.ini | 37 ++++++++++++++-------------- data/rus/settings/game_center.ini | 33 +++++++++++++------------ programs/macros.inc | 2 +- 4 files changed, 38 insertions(+), 35 deletions(-) diff --git a/data/Tupfile.lua b/data/Tupfile.lua index cd2804e69b..6186ed479f 100644 --- a/data/Tupfile.lua +++ b/data/Tupfile.lua @@ -155,6 +155,7 @@ 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/Almaz", PROGS .. "/games/almaz/almaz"}, {"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"}, diff --git a/data/common/settings/game_center.ini b/data/common/settings/game_center.ini index 0b3de5c90c..6394e537cb 100644 --- a/data/common/settings/game_center.ini +++ b/data/common/settings/game_center.ini @@ -14,47 +14,48 @@ Heliothryx=/kolibrios/games/heliothryx/heliothryx Dungeons=/kolibrios/games/dungeons/dungeons JumpBump=/kolibrios/games/jumpbump/jumpbump.kex Loderunner=/kolibrios/games/LRL/LRL,41 +Mun=/kolibrios/games/mun/mun +Kosilka=/sys/games/kosilka,23 Bomber=/kolibrios/games/bomber/bomber,14 Invaders=/kolibrios/games/invaders -Tetris=/sys/games/tetris,47 -Pipes=/sys/games/pipes,26 -Snake=/sys/games/snake,32 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=/kolibrios/games/arcanii,12 -Xonix=/sys/games/xonix,21 -Ataka=/sys/games/ataka +; Pig=/kolibrios/games/pig/pig ;doesn't work from CD +; Ataka=/sys/games/ataka ;rus only Sea War=/sys/games/SW,66 Donkey=/kolibrios/games/donkey +Almaz=/kolibrios/games/almaz,81 +Nsider=/kolibrios/games/Nsider/Nsider +; 21days=/kolibrios/games/21days/21days ;rus only +BabyPainter=/kolibrios/games/BabyPainter +Klavisha=/sys/games/klavisha,69 +Millioneer=/sys/games/whowtbam [Logical] Clicks=/sys/games/clicks,18 Checkers=/sys/games/checkers,20 Sudoku=/sys/games/sudoku,25 Mine=/sys/games/mine,14 -Flood-It=/sys/games/flood-it,27 +Flood-It=/sys/games/flood-it,59 Knight=/kolibrios/games/knight,82 15=/sys/games/15,34 Gomoku=/sys/games/gomoku,24 Reversi=/sys/games/reversi C4=/sys/games/c4 Square=/sys/games/msquare,25 -Freecell=/sys/games/freecell,68 Memory=/sys/games/mblocks,11 Lines=/sys/games/lines,59 [Casual] 2048=/kolibrios/games/2048/2048,53 -Nsider=/kolibrios/games/Nsider/Nsider Fara=/kolibrios/games/fara/fara,42 -Kosilka=/sys/games/kosilka,23 MarbleMatch=/kolibrios/games/MarbleMatch3/MarbleMatch3 +Tetris=/sys/games/tetris,47 +Pipes=/sys/games/pipes,26 +Snake=/sys/games/snake,32 +Xonix=/sys/games/xonix,21 RedSquare=/sys/games/rsquare -BabyPainter=/kolibrios/games/BabyPainter -Klavisha=/sys/games/klavisha,69 -Millioneer=/sys/games/whowtbam -Mun=/kolibrios/games/mun/mun -; 21days=/kolibrios/games/21days/21days +Freecell=/sys/games/freecell,68 +Pong=/sys/games/pong,12 +Pong3=/sys/games/pong3,12 +Arcanii=/kolibrios/games/arcanii,12 diff --git a/data/rus/settings/game_center.ini b/data/rus/settings/game_center.ini index a426e60b43..135e5b902c 100644 --- a/data/rus/settings/game_center.ini +++ b/data/rus/settings/game_center.ini @@ -14,47 +14,48 @@ Heliothryx=/kolibrios/games/heliothryx/heliothryx Dungeons=/kolibrios/games/dungeons/dungeons JumpBump=/kolibrios/games/jumpbump/jumpbump.kex Loderunner=/kolibrios/games/LRL/LRL,41 +Mun=/kolibrios/games/mun/mun +Kosilka=/sys/games/kosilka,23 Bomber=/kolibrios/games/bomber/bomber,14 Invaders=/kolibrios/games/invaders -Tetris=/sys/games/tetris,47 -Pipes=/sys/games/pipes,26 -Snake=/sys/games/snake,32 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=/kolibrios/games/arcanii,12 -Xonix=/sys/games/xonix,21 Ataka=/sys/games/ataka Sea War=/sys/games/SW,66 Donkey=/kolibrios/games/donkey +Almaz=/kolibrios/games/almaz,81 +Nsider=/kolibrios/games/Nsider/Nsider +21days=/kolibrios/games/21days/21days +BabyPainter=/kolibrios/games/BabyPainter +Klavisha=/sys/games/klavisha,69 +Millioneer=/sys/games/whowtbam [Логические] Clicks=/sys/games/clicks,18 Checkers=/sys/games/checkers,20 Sudoku=/sys/games/sudoku,25 Mine=/sys/games/mine,14 -Flood-It=/sys/games/flood-it,27 +Flood-It=/sys/games/flood-it,59 Knight=/kolibrios/games/knight,82 15=/sys/games/15,34 Gomoku=/sys/games/gomoku,24 Reversi=/sys/games/reversi C4=/sys/games/c4 Square=/sys/games/msquare,25 -Freecell=/sys/games/freecell,68 Memory=/sys/games/mblocks,11 Lines=/sys/games/lines,59 [Казуальные] 2048=/kolibrios/games/2048/2048,53 -Nsider=/kolibrios/games/Nsider/Nsider Fara=/kolibrios/games/fara/fara,42 -Kosilka=/sys/games/kosilka,23 MarbleMatch=/kolibrios/games/MarbleMatch3/MarbleMatch3 +Tetris=/sys/games/tetris,47 +Pipes=/sys/games/pipes,26 +Snake=/sys/games/snake,32 +Xonix=/sys/games/xonix,21 RedSquare=/sys/games/rsquare -BabyPainter=/kolibrios/games/BabyPainter -Klavisha=/sys/games/klavisha,69 -Millioneer=/sys/games/whowtbam -Mun=/kolibrios/games/mun/mun -21days=/kolibrios/games/21days/21days +Freecell=/sys/games/freecell,68 +Pong=/sys/games/pong,12 +Pong3=/sys/games/pong3,12 +Arcanii=/kolibrios/games/arcanii,12 diff --git a/programs/macros.inc b/programs/macros.inc index a4ea029a58..1d743fa306 100644 --- a/programs/macros.inc +++ b/programs/macros.inc @@ -471,7 +471,7 @@ struct system_colors grab dd ? ;nonset2 work_3d_dark dd ? work_3d_light dd ? - grab_text dd ? ;nonset3 + grab_text dd ? ;window_title work dd ? work_button dd ? work_button_text dd ?