From 7c44fcb552d4f7e2c93dc4699f6a872d5cf77bf9 Mon Sep 17 00:00:00 2001 From: "Kirill Lipatov (Leency)" Date: Sun, 7 Feb 2016 18:37:13 +0000 Subject: [PATCH] remove sys_colors_new from macros.inc, update info3ds, TynyGL examples git-svn-id: svn://kolibrios.org@6164 a494cfbc-eb01-0410-851d-a64ba20cac60 --- programs/develop/info3ds/info3ds.asm | 3 +- programs/develop/info3ds/info3ds_u.asm | 3 +- .../TinyGL/asm_fork/examples/test_glu2.asm | 3 +- .../TinyGL/asm_fork/examples/textures0.asm | 3 +- .../TinyGL/asm_fork/examples/textures1.asm | 3 +- programs/macros.inc | 51 ------------------- 6 files changed, 5 insertions(+), 61 deletions(-) diff --git a/programs/develop/info3ds/info3ds.asm b/programs/develop/info3ds/info3ds.asm index 7c5b010fbd..2941b0ef22 100644 --- a/programs/develop/info3ds/info3ds.asm +++ b/programs/develop/info3ds/info3ds.asm @@ -144,7 +144,7 @@ start: add ebp,ll_struc_size cmp ebp,l_libs_end jl .test_lib_open - mcall SF_STYLE_SETTINGS,SSF_GET_COLORS,sc,sizeof.sys_colors_new + mcall SF_STYLE_SETTINGS,SSF_GET_COLORS,sc,sizeof.system_colors mcall SF_SET_EVENTS_MASK,0x27 stdcall [OpenDialog_Init],OpenDialog_data ;подготовка диалога @@ -1429,7 +1429,6 @@ i_end: procinfo process_information run_file_70 FileInfoBlock sc system_colors - rb sizeof.sys_colors_new-sizeof.system_colors angle_x rd 1 ;углы поворота сцены angle_y rd 1 angle_z rd 1 diff --git a/programs/develop/info3ds/info3ds_u.asm b/programs/develop/info3ds/info3ds_u.asm index 138ed95607..30e0a5090a 100644 --- a/programs/develop/info3ds/info3ds_u.asm +++ b/programs/develop/info3ds/info3ds_u.asm @@ -150,7 +150,7 @@ start: add ebp,ll_struc_size cmp ebp,l_libs_end jl .test_lib_open - mcall SF_STYLE_SETTINGS,SSF_GET_COLORS,sc,sizeof.sys_colors_new + mcall SF_STYLE_SETTINGS,SSF_GET_COLORS,sc,sizeof.system_colors mcall SF_SET_EVENTS_MASK,0x27 stdcall [OpenDialog_Init],OpenDialog_data ;подготовка диалога @@ -1462,7 +1462,6 @@ i_end: procinfo process_information run_file_70 FileInfoBlock sc system_colors - rb sizeof.sys_colors_new-sizeof.system_colors angle_x rd 1 ;углы поворота сцены angle_y rd 1 angle_z rd 1 diff --git a/programs/develop/libraries/TinyGL/asm_fork/examples/test_glu2.asm b/programs/develop/libraries/TinyGL/asm_fork/examples/test_glu2.asm index 0092fbc425..6450f97c6a 100644 --- a/programs/develop/libraries/TinyGL/asm_fork/examples/test_glu2.asm +++ b/programs/develop/libraries/TinyGL/asm_fork/examples/test_glu2.asm @@ -82,7 +82,7 @@ load_libraries l_libs_start,l_libs_end cmp ebp,l_libs_end jl .test_lib_open - mcall SF_STYLE_SETTINGS,SSF_GET_COLORS,sc,sizeof.sys_colors_new + mcall SF_STYLE_SETTINGS,SSF_GET_COLORS,sc,sizeof.system_colors mcall SF_SET_EVENTS_MASK,0x27 stdcall [kosglMakeCurrent], 5,30,[buf_ogl.w],[buf_ogl.h],ctx1 @@ -536,7 +536,6 @@ align 4 i_end: run_file_70 FileInfoBlock sc system_colors - rb sizeof.sys_colors_new-sizeof.system_colors align 16 rb 4096 stacktop: diff --git a/programs/develop/libraries/TinyGL/asm_fork/examples/textures0.asm b/programs/develop/libraries/TinyGL/asm_fork/examples/textures0.asm index 00562e8818..1920ebc3ac 100644 --- a/programs/develop/libraries/TinyGL/asm_fork/examples/textures0.asm +++ b/programs/develop/libraries/TinyGL/asm_fork/examples/textures0.asm @@ -82,7 +82,7 @@ load_libraries l_libs_start,l_libs_end cmp ebp,l_libs_end jl .test_lib_open - mcall SF_STYLE_SETTINGS,SSF_GET_COLORS,sc,sizeof.sys_colors_new + mcall SF_STYLE_SETTINGS,SSF_GET_COLORS,sc,sizeof.system_colors mcall SF_SET_EVENTS_MASK,0x27 stdcall [kosglMakeCurrent], 5,30,[buf_ogl.w],[buf_ogl.h],ctx1 @@ -614,7 +614,6 @@ align 4 i_end: run_file_70 FileInfoBlock sc system_colors - rb sizeof.sys_colors_new-sizeof.system_colors align 16 rb 4096 stacktop: diff --git a/programs/develop/libraries/TinyGL/asm_fork/examples/textures1.asm b/programs/develop/libraries/TinyGL/asm_fork/examples/textures1.asm index d527eaae9c..3530475e89 100644 --- a/programs/develop/libraries/TinyGL/asm_fork/examples/textures1.asm +++ b/programs/develop/libraries/TinyGL/asm_fork/examples/textures1.asm @@ -82,7 +82,7 @@ load_libraries l_libs_start,l_libs_end cmp ebp,l_libs_end jl .test_lib_open - mcall SF_STYLE_SETTINGS,SSF_GET_COLORS,sc,sizeof.sys_colors_new + mcall SF_STYLE_SETTINGS,SSF_GET_COLORS,sc,sizeof.system_colors mcall SF_SET_EVENTS_MASK,0x27 stdcall [kosglMakeCurrent], 5,30,[buf_ogl.w],[buf_ogl.h],ctx1 @@ -528,7 +528,6 @@ align 4 i_end: run_file_70 FileInfoBlock sc system_colors - rb sizeof.sys_colors_new-sizeof.system_colors align 16 rb 4096 stacktop: diff --git a/programs/macros.inc b/programs/macros.inc index bfa2a1dc0d..b1651feb4a 100644 --- a/programs/macros.inc +++ b/programs/macros.inc @@ -479,57 +479,6 @@ struct system_colors work_graph dd ? ends -struct sys_colors_new - menu_body dd ? - 3d_face dd ? - 3d_dark dd ? - 3d_light dd ? - win_title dd ? - win_body dd ? - btn_face dd ? - btn_text dd ? - win_text dd ? - panel_frame dd ? - win_face dd ? - win_inface dd ? - win_frame dd ? - win_inframe dd ? - win_border dd ? - win_inborder dd ? - win_graytext dd ? - menu_frame dd ? - menu_text dd ? - panel_body dd ? - panel_text dd ? - hint_frame dd ? - hint_body dd ? - hint_text dd ? - btn_inface dd ? - btn_fcface dd ? - btn_frame dd ? - btn_inframe dd ? - btn_fcframe dd ? - btn_intext dd ? - btn_fctext dd ? - gui_shadow dd ? - gui_face dd ? - gui_inface dd ? - gui_fcface dd ? - gui_frame dd ? - gui_inframe dd ? - gui_fcframe dd ? - gui_text dd ? - gui_intext dd ? - gui_fctext dd ? - gui_select dd ? - res_var_a dd ? - res_var_b dd ? - res_var_c dd ? - res_var_d dd ? - res_var_e dd ? - res_var_f dd ? -ends - struct FILEDATE Second db ? Minute db ?