ataka: fix window height, translate to English, move to ISO

piano: translate to English


git-svn-id: svn://kolibrios.org@7650 a494cfbc-eb01-0410-851d-a64ba20cac60

data/Tupfile.lua

@@ -200,7 +200,6 @@ extra_files = {
  {"kolibrios/games/mun/mun", "common/games/mun/mun"}, 
  {"kolibrios/games/pig/", "common/games/pig/*"},
  {"kolibrios/games/soko/", "common/games/soko/*"},
- {"kolibrios/games/sstartrek/", "common/games/sstartrek/*"},
  {"kolibrios/games/the_bus/menu.png", PROGS .. "/cmm/the_bus/menu.png"},
  {"kolibrios/games/the_bus/objects.png", PROGS .. "/cmm/the_bus/objects.png"},
  {"kolibrios/games/the_bus/road.png", PROGS .. "/cmm/the_bus/road.png"},
@@ -269,11 +268,13 @@ if build_type == "rus" then tup.append_table(extra_files, {
  {"HD_Load/9x2klbr/", PROGS .. "/hd_load/9x2klbr/readme_win.txt"},
  {"HD_Load/mtldr/", PROGS .. "/hd_load/mtldr/install.txt"},
  {"HD_Load/USB_Boot/", PROGS .. "/hd_load/usb_boot/readme.txt"},
+ {"kolibrios/games/ataka", "common/games/ataka/ataka_ru"},
  {"kolibrios/games/Dungeons/Resources/Textures/Environment/", PROGS .. "/games/Dungeons/Resources/Textures/Environment/*"},
  {"kolibrios/games/Dungeons/Resources/Textures/Objects/", PROGS .. "/games/Dungeons/Resources/Textures/Objects/*"},
  {"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/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"},
@@ -288,6 +289,8 @@ if build_type == "rus" then tup.append_table(extra_files, {
  {"HD_Load/9x2klbr/", PROGS .. "/hd_load/9x2klbr/readme.txt"},
  {"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/media/zsea/zsea_keys.txt", PROGS .. "/media/zsea/Docs/zSea_keys_eng.txt"},
 }) end
 --[[
@@ -452,6 +455,7 @@ tup.append_table(img_files, {
  {"MEDIA/MIDAMP", PROGS .. "/media/midamp/trunk/midamp"},
  {"MEDIA/MP3INFO", PROGS .. "/media/mp3info/mp3info"},
  {"MEDIA/PALITRA", PROGS .. "/media/palitra/trunk/palitra"},
+ {"MEDIA/PIANO", PROGS .. "/media/piano/piano"},
  {"MEDIA/STARTMUS", PROGS .. "/media/startmus/trunk/STARTMUS"},
  {"NETWORK/PING", PROGS .. "/network/ping/ping"},
  {"NETWORK/NETCFG", PROGS .. "/network/netcfg/netcfg"},
@@ -550,7 +554,6 @@ tup.append_table(extra_files, {
 if build_type == "rus" then tup.append_table(img_files, {
  {"PERIOD", PROGS .. "/other/period/trunk/period"},
  {"DEVELOP/TESTCON2", PROGS .. "/develop/libraries/console_coff/examples/testcon2_rus"},
- {"MEDIA/PIANO", PROGS .. "/media/piano/piano"},
 }) else tup.append_table(img_files, {
  {"DEVELOP/TESTCON2", PROGS .. "/develop/libraries/console_coff/examples/testcon2_eng"},
 }) end

data/common/settings/games.ini

@@ -33,14 +33,14 @@ Almaz=/k/games/almaz,81
 Tanks=games/tanks,67
 RocketForces=games/rforces,110
 Pig=/k/games/pig/pigex,120
-; Ataka=games/ataka,35  ;rus only
+Ataka=/k/games/ataka,35
 Donkey=/k/games/donkey
 Loderunner=/k/games/LRL/LRL,41
 ; 21days=/k/games/21days,104 ;rus only
 BabyPainter=/k/games/BabyPainter,87
 Klavisha=games/klavisha,69
 Millioneer=/k/games/WHOWTBAM/whowtbam,114
-StarTrek71=/k/games/sstartrek/SStarTrek_en
+StarTrek71=/k/games/sstartrek/SStarTrek
 
 [3D Shooter]
 Quake=/k/games/quake/sdlquake,56

data/rus/settings/games.ini

@@ -33,14 +33,14 @@ Almaz=/k/games/almaz,81
 Tanks=games/tanks,67
 RocketForces=games/rforces,110
 Pig=/k/games/pig/pigex
-Ataka=games/ataka,35  ;rus only
+Ataka=/k/games/ataka,35
 Donkey=/k/games/donkey
 Loderunner=/k/games/LRL/LRL,41
 21days=/k/games/21days,104 ;rus only
 BabyPainter=/k/games/BabyPainter,87
 Klavisha=games/klavisha,69
 Millioneer=/k/games/WHOWTBAM/whowtbam,114
-StarTrek71=/k/games/sstartrek/SStarTrek_en
+StarTrek71=/k/games/sstartrek/SStarTrek
 
 [3D Shooter]
 Quake=/k/games/quake/sdlquake,56

programs/media/piano/build.bat

@@ -1,3 +1,4 @@
-@fasm.exe  piano.asm piano
+@echo lang fix en >lang.inc
-
+@fasm piano.asm piano
-pause
+@erase lang.inc
+@pause

programs/media/piano/piano.asm

@@ -37,6 +37,7 @@
   dd	 0	     ;  ¤à¥á ¡ãä¥à  ¤«ï ¯ à ¬¥â஢
   dd	 0	     ; § à¥§¥à¢¨à®¢ ­®
 
+include "lang.inc"
 include "../../macros.inc" ; ¬ ªà®áë ®¡«¥£ç îâ ¦¨§­ì  áᥬ¡«¥à騪®¢!
 
 ;---------------------------------------------------------------------
@@ -839,7 +840,7 @@ draw_window:
 
     mov   edx, [sc.work]	 ; 梥â ä®­ 
     or	  edx, 0x33000000	 ; ¨ ⨯ ®ª­  3
-    mcall 0, <20,WHITE_W*15+9>, <200,250>, , ,title
+    mcall 0, <20,WHITE_W*15+9>, <200,250>, , ,caption
 	
     mcall 8,  <WHITE_W*0,WHITE_W>, <0,100>, 0x21, 0xff7a74
     mcall 8,  <WHITE_W*1,WHITE_W>, <0,100>, 0x23, 0x907040
@@ -924,13 +925,23 @@ M:
 
 sc system_colors
 
-message db '‘¯à ¢ª : éñ«ª­¨â¥ 2 à §  ­  § £®«®¢ª¥.',0
+if lang eq ru
-message1 db '<27> ¦¬¨â¥ «î¡ãî ª« ¢¨èã ¢  ­£«¨©áª®© à áª« ¤ª¥ - ',0
+  message  db '‘¯à ¢ª : éñ«ª­¨â¥ 2 à §  ­  § £®«®¢ª¥.',0
-message2  db '¤®«¦¥­ §¢ãç âì ¢áâ஥­­ë© ¤¨­ ¬¨ª ª®¬¯ìîâ¥à  (­¥ ª®«®­ª¨!)',0
+  message1 db '<27> ¦¬¨â¥ «î¡ãî ª« ¢¨èã ¢  ­£«¨©áª®© à áª« ¤ª¥ - ',0
-message3  db '<27>®â  "„®" - ª« ¢¨è¨ V,Tab,U,Enter, ¯à¨ ¢ª«î祭¨¨',0
+  message2 db '¤®«¦¥­ §¢ãç âì ¢áâ஥­­ë© ¤¨­ ¬¨ª ª®¬¯ìîâ¥à  (­¥ ª®«®­ª¨!)',0
-message4  db 'Caps Lock - ª« ¢¨è¨ V,Q,I.',0
+  message3 db '<27>®â  "„®" - ª« ¢¨è¨ V,Tab,U,Enter',0
-t_notes  db '„Ž    <20>…    Œˆ    ”€   ‘Ž‹œ   ‹Ÿ    ‘ˆ    „Ž',0
+  message4 db '¯à¨ ¢ª«î祭¨¨ Caps Lock - ª« ¢¨è¨ V,Q,I.',0
-title db '„¥â᪮¥ ¯¨ ­¨­®',0
+  t_notes  db '„Ž    <20>…    Œˆ    ”€   ‘Ž‹œ   ‹Ÿ    ‘ˆ    „Ž',0
+  caption  db '„¥â᪮¥ ¯¨ ­¨­®',0
+else
+  message  db 'To see help click twice on the window header',0
+  message1 db 'Press any key in English keyboard layout - ',0
+  message2 db 'so you will hear the sound from the PC-speaker (Beeper)',0
+  message3 db 'Note "C" is the key V,Tab,U,Enter',0
+  message4 db 'and when Caps Lock is on then the keys V,Q,I.',0
+  t_notes  db 'C     D     E     F     G     A     B     C ',0
+  caption  db 'Baby piano',0
+end if
 
 ;---------------------------------------------------------------------