diff --git a/programs/cmm/browser/include/unicode_tags.h b/programs/cmm/browser/include/unicode_tags.h index 743c827216..73b8723cd1 100644 --- a/programs/cmm/browser/include/unicode_tags.h +++ b/programs/cmm/browser/include/unicode_tags.h @@ -78,10 +78,10 @@ unsigned char GetUnicodeSymbol() } } - rez = atoi(#tag + 1) - 1040; - if (tag[1] == '1') && (rez>=0) && (rez<=72) && (strlen(#tag) == 5) + j = atoi(#tag + 1) - 1040; + if (tag[1] == '1') && (j>=0) && (j<=72) && (strlen(#tag) == 5) { - return unicode_chars[rez]; + return unicode_chars[j]; } strcat(#line,#tag); //выводим на экран необработанный тег, так браузеры зачем-то делают diff --git a/programs/cmm/lib/edit_box_lib.h b/programs/cmm/lib/edit_box_lib.h index 0822183a8f..017be3373d 100644 --- a/programs/cmm/lib/edit_box_lib.h +++ b/programs/cmm/lib/edit_box_lib.h @@ -2,8 +2,8 @@ dword boxlib = #aEdit_box_lib; //Asper char aEdit_box_lib[22]="/sys/lib/box_lib.obj\0"; //Asper -dword edit_box_draw = #aEdit_box_draw; -dword edit_box_key = #aEdit_box_key; +dword edit_box_draw = #aEdit_box_draw; +dword edit_box_key = #aEdit_box_key; dword edit_box_mouse = #aEdit_box_mouse; dword version_ed = #aVersion_ed; diff --git a/programs/cmm/lib/figures.h b/programs/cmm/lib/figures.h index 3cb8be8e35..fcba800c6a 100644 --- a/programs/cmm/lib/figures.h +++ b/programs/cmm/lib/figures.h @@ -14,10 +14,10 @@ void DrawRectangle3D(dword x,y,width,height,color1,color2) DrawBar(x,y+height,width,1,color2); } -void DrawCaptButton(dword x,y,width,height,id,color,text,text_len) +void DrawCaptButton(dword x,y,width,height,id,color_b, color_t,text,text_len) { - DefineButton(x,y,width,height,id+BT_HIDE,0xEFEBEF); - WriteText(-text_len*6+width/2+x+1,height/2-3+y,0x80,0,text,0); + DefineButton(x,y,width,height,id,color_b); + WriteText(-text_len*6+width/2+x+1,height/2-3+y,0x80,color_t,text,0); } void DrawCircle(int x, y, r) @@ -30,4 +30,4 @@ void DrawCircle(int x, y, r) px = py / r + px; py = -px / r + py; } -} \ No newline at end of file +} diff --git a/programs/cmm/lib/kolibri.h b/programs/cmm/lib/kolibri.h index 79edcc8fb0..a466175f6a 100644 --- a/programs/cmm/lib/kolibri.h +++ b/programs/cmm/lib/kolibri.h @@ -137,7 +137,7 @@ inline fastcall word GetKey() //+Gluk fix } -inline fastcall Pause( EBX) +inline fastcall pause( EBX) { $mov eax, 5 $int 0x40 diff --git a/programs/cmm/lib/scroll_lib.h b/programs/cmm/lib/scroll_lib.h index 27e88a36a2..75fac9b37f 100644 --- a/programs/cmm/lib/scroll_lib.h +++ b/programs/cmm/lib/scroll_lib.h @@ -1,20 +1,20 @@ //lev //:dword boxlib = #abox_lib; -:char abox_lib[]="/sys/lib/box_lib.obj"; +char abox_lib[]="/sys/lib/box_lib.obj"; -:char aboxlib_init[] = "lib_init"; -:char aScrollbar_v_draw = "scrollbar_v_draw"; -:char aScrollbar_v_mouse = "scrollbar_v_mouse"; -:char aScrollbar_h_draw = "scrollbar_h_draw"; -:char aScrollbar_h_mouse = "scrollbar_h_mouse"; -:char aVersion_scrollbar = "version_scrollbar"; +char aboxlib_init[] = "lib_init"; +char aScrollbar_v_draw[] = "scrollbar_v_draw"; +char aScrollbar_v_mouse[] = "scrollbar_v_mouse"; +char aScrollbar_h_draw[] = "scrollbar_h_draw"; +char aScrollbar_h_mouse[] = "scrollbar_h_mouse"; +char aVersion_scrollbar[] = "version_scrollbar"; -dword boxlib_init = #aboxlib_init; -dword scrollbar_v_draw = #aScrollbar_v_draw; -dword scrollbar_v_mouse = #aScrollbar_v_mouse; -dword scrollbar_h_draw = #aScrollbar_h_draw; -dword scrollbar_h_mouse = #aScrollbar_h_mouse; -:dword version_scrollbar = #aVersion_scrollbar; +dword boxlib_init = #aboxlib_init; +dword scrollbar_v_draw = #aScrollbar_v_draw; +dword scrollbar_v_mouse = #aScrollbar_v_mouse; +dword scrollbar_h_draw = #aScrollbar_h_draw; +dword scrollbar_h_mouse = #aScrollbar_h_mouse; +dword version_scrollbar = #aVersion_scrollbar; dword sc_am__ = 0x0; dword sc_bm__ = 0x0;