Add SuperStarTrack to ISO, add associations for CNC editor, update CPUid

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

data/Tupfile.lua

@@ -197,6 +197,7 @@ 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"},

data/common/File Managers/kfar.ini

@@ -58,6 +58,7 @@ sna=/kolibrios/emul/e80/e80
 gb=/kolibrios/emul/gameboy
 gbc=/kolibrios/emul/gameboy
 min=/kolibrios/emul/pokemini
+nc=/kolibrios/utils/cnc_editor/cnc_editor
 
 [Menu]
 AsmMenu1=&Edit,/sys/TinyPad

data/common/File Managers/kfm.ini

@@ -193,13 +193,14 @@ mp4 /kolibrios/media/fplay_run
 mpeg /kolibrios/media/fplay_run
 3gp /kolibrios/media/fplay_run
 webm /kolibrios/media/fplay_run
-smc=/kolibrios/emul/zsnes
-mcr=/kolibrios/emul/psx4all
-nes=/kolibrios/emul/fceu/fceu
-sna=/kolibrios/emul/e80/e80
-gb=/kolibrios/emul/gameboy
-gbc=/kolibrios/emul/gameboy
-min=/kolibrios/emul/pokemini
+smc /kolibrios/emul/zsnes
+mcr /kolibrios/emul/psx4all
+nes /kolibrios/emul/fceu/fceu
+sna /kolibrios/emul/e80/e80
+gb /kolibrios/emul/gameboy
+gbc /kolibrios/emul/gameboy
+min /kolibrios/emul/pokemini
+nc /kolibrios/utils/cnc_editor/cnc_editor
 
 lap /sys/media/listplay
 asf /sys/media/listplay

data/common/settings/app_plus.ini

@@ -14,6 +14,7 @@ uPDF=/sys/lod|*pdf* /kolibrios/media/updf,73
 DosBox=/kolibrios/emul/dosbox/dosbox,11
 Dicty=/kolibrios/utils/DICTY.KEX,79
 fNav=/sys/File managers/fNav/fNav,93
+CncEditor=/kolibrios/utils/cnc_editor/cnc_editor,15
 Life=/kolibrios/demos/life2,13
 Calc+=/kolibrios/utils/calcplus,4
 TinyBasic=/kolibrios/develop/TinyBasic/TinyBasic,91

data/common/settings/assoc.ini

@@ -3,11 +3,6 @@ exec=/sys/tinypad
 icon=9
 next=$TextEditor
 
-[WebView]
-exec=/sys/network/webview
-icon=31
-next=$TinyPad
-
 [TextEditor]
 exec=/sys/develop/t_edit
 icon=58
@@ -18,6 +13,15 @@ exec=/sys/txtread
 icon=85
 next=$HexEditor
 
+[FB2Read]
+exec=/sys/fb2read
+icon=44
+
+[WebView]
+exec=/sys/network/webview
+icon=31
+next=$TinyPad
+
 [zSea]
 exec=/kolibrios/media/zsea/zsea
 icon=46
@@ -49,19 +53,10 @@ icon=40
 exec=/sys/media/ac97snd
 icon=64
 
-[MidAMP]
-exec=/sys/media/midamp
-icon=74
-
 [HexEditor]
 exec=/sys/develop/heed
 icon=22
 
-[Shell]
-exec=/sys/shell
-icon=1
-next=$TinyPad
-
 [FASM]
 exec=/sys/develop/fasm
 icon=10
@@ -70,18 +65,14 @@ icon=10
 exec=/sys/kpack
 icon=99
 
-[View3DS]
-exec=/sys/3d/view3ds
-icon=75
-
-[FB2Read]
-exec=/sys/fb2read
-icon=44
-
 [Unz]
 exec=/sys/unz
 icon=89
 
+[IconEdit]
+exec=/sys/media/iconedit
+icon=98
+
 [Assoc]
 /=/sys/file managers/eolite
 
@@ -141,8 +132,8 @@ m3u=$AC97snd
 lap=/sys/media/listplay
 asf=/sys/media/listplay
 
-mid=$MidAMP
-midi=$MidAMP
+mid=/sys/media/midamp
+midi=/sys/media/midamp
 
 rtf=/sys/rtfread
 
@@ -156,11 +147,11 @@ obj=/sys/develop/cObj
 
 raw=$HeEd
 
-shell=$Shell
-sh=$Shell
+shell=/sys/shell
+sh=/sys/shell
 
-3ds=$View3DS
-asc=$View3DS
+3ds=/sys/3d/view3ds
+asc=/sys/3d/view3ds
 
 skn=/sys/skincfg
 lif=/kolibrios/demos/life2
@@ -174,6 +165,7 @@ sna=/kolibrios/emul/e80/e80
 gb=/kolibrios/emul/gameboy
 gbc=/kolibrios/emul/gameboy
 min=/kolibrios/emul/pokemini
+nc=/kolibrios/utils/cnc_editor/cnc_editor
 
 zip=$Unz
 7z=$Unz

data/common/settings/games.ini

@@ -40,6 +40,7 @@ Loderunner=/k/games/LRL/LRL,41
 BabyPainter=/k/games/BabyPainter,87
 Klavisha=games/klavisha,69
 Millioneer=/k/games/WHOWTBAM/whowtbam,114
+StarTrack79=/k/games/sstartrek/SStarTrek_en
 
 [3D Shooter]
 Quake=/k/games/quake/sdlquake,56

data/rus/settings/games.ini

@@ -40,6 +40,7 @@ Loderunner=/k/games/LRL/LRL,41
 BabyPainter=/k/games/BabyPainter,87
 Klavisha=games/klavisha,69
 Millioneer=/k/games/WHOWTBAM/whowtbam,114
+StarTrack79=/k/games/sstartrek/SStarTrek_ru
 
 [3D Shooter]
 Quake=/k/games/quake/sdlquake,56

programs/system/cpuid/trunk/CPUID.ASM

@@ -1176,7 +1176,7 @@ NEWintel:
         jz I26
         cmp [em],$1C   ;Pineview/Silverthorne
         jz I1C
-        jnz no_known
+        mov [cname], no_known
 
 Inewunknown:
         jmp MMXtest
@@ -3827,7 +3827,7 @@ db 'Pineview',0
 P1Clen:
 
 no_known:
-db 'SORRY, CODENAME IS NOT SUPPORTED YET '
+db 'SORRY, CODENAME IS NOT SUPPORTED YET ', 0
 
 ;---------AMD