diff --git a/programs/cmm/lib/patterns/libimg_load_skin.h b/programs/cmm/lib/patterns/libimg_load_skin.h index 4f3f97c466..d0259e50a9 100644 --- a/programs/cmm/lib/patterns/libimg_load_skin.h +++ b/programs/cmm/lib/patterns/libimg_load_skin.h @@ -10,7 +10,6 @@ void load_as24b(); void load(); void replace_color(); - void fill_transparent(); } skin; :void libimg_image::load_as24b(dword file_path) @@ -50,17 +49,12 @@ for (i = imgsrc; i < max_i; i += 4) if (DSDWORD[i]==old_color) DSDWORD[i] = new_color; } -:void libimg_image::fill_transparent(new_color) -{ - if (new_color) replace_color(0, new_color); -} - :libimg_image icons32draw; :void DrawIcon32(dword x,y, bg, icon_n) { //load_dll(libimg, #libimg_init,1); if (!icons32draw.image) { icons32draw.load("/sys/icons32.png"); - icons32draw.fill_transparent(bg); + icons32draw.replace_color(0x00000000, bg); } if (icon_n>=0) img_draw stdcall(icons32draw.image, x, y, 32, 32, 0, icon_n*32); } diff --git a/programs/cmm/misc/mblocks.c b/programs/cmm/misc/mblocks.c index e853714c9b..c10e9b4bc1 100644 --- a/programs/cmm/misc/mblocks.c +++ b/programs/cmm/misc/mblocks.c @@ -45,7 +45,7 @@ void main() load_dll(libimg, #libimg_init,1); skin.load("/sys/icons32.png"); - skin.fill_transparent(COLOR_CELL_BG); + skin.replace_color(0x00000000, COLOR_CELL_BG); NewGame(); diff --git a/programs/cmm/misc/software_widget.c b/programs/cmm/misc/software_widget.c index b84121b75a..7418968777 100644 --- a/programs/cmm/misc/software_widget.c +++ b/programs/cmm/misc/software_widget.c @@ -152,7 +152,7 @@ void SetAppColors() void LoadImages() { skin.load("/sys/icons32.png"); - skin.fill_transparent(swc.list_bg); + skin.replace_color(0x00000000, swc.list_bg); } diff --git a/programs/cmm/taskbar2/taskbar2.c b/programs/cmm/taskbar2/taskbar2.c index 70b26111e7..59623c34f6 100644 --- a/programs/cmm/taskbar2/taskbar2.c +++ b/programs/cmm/taskbar2/taskbar2.c @@ -65,7 +65,7 @@ void main() load_dll(libini, #lib_init,1); skin.load("/sys/icons32.png"); - skin.fill_transparent(COLOR_BG); + skin.replace_color(0x00000000, COLOR_BG); ini_get_int stdcall ("/sys/appicons.ini", "taskbar", "attachement", ATTACHEMENT_BOTTOM); attachement = EAX;