From 830f8c0cf777a46023abdaaddd045f811a8c45fa Mon Sep 17 00:00:00 2001 From: aurhat Date: Sun, 12 Nov 2017 10:07:38 +0100 Subject: [PATCH] Cleanup Thanks DADSGETNDOWN for the report for maps/mapmodel configs. --- config/default_map_settings.cfg | 4 ++-- packages/models/mapmodels/makke/wires/2x8/md3.cfg | 1 + packages/models/mapmodels/makke/wires/3x8/md3.cfg | 1 + packages/models/mapmodels/makke/wires/4x8/md3.cfg | 1 + packages/models/mapmodels/makke/wires/4x8a/md3.cfg | 1 + source/src/menus.cpp | 2 +- 6 files changed, 7 insertions(+), 3 deletions(-) diff --git a/config/default_map_settings.cfg b/config/default_map_settings.cfg index 9b3f3547..c25a7463 100644 --- a/config/default_map_settings.cfg +++ b/config/default_map_settings.cfg @@ -269,8 +269,8 @@ mapmodel 4 1 0 0 "cleaner/cactus/cactus2" //201 // mapmodel 1 3 0 0 "makke/barrel_toxic" // Toxic barrel. // mapmodel 1 3 0 0 "makke/barrel_newsteel" // Steel barrel. // mapmodel 1 2 0 0 "makke/barrel_newsteel_fallen" // Steel barrel fallen. -// mapmodel 2 1 0 0 "cleaner/grates/grate_hor" // Grate, rusty (hor). -// mapmodel 1 2 0 0 "cleaner/grates/grate_vert" // Grate, rusty (vert). +// mapmodel 2 1 0 0 "cleaner/grates/grate_hor_rust" // Grate, rusty (hor). +// mapmodel 1 2 0 0 "cleaner/grates/grate_vert_rust" // Grate, rusty (vert). // mapmodel 3 8 0 0 "makke/mine-shaft_elevator" // Mine lift. // mapmodel 1 2 0 0 "cleaner/minecart/up" // Mine cart. // mapmodel 1 2 0 0 "cleaner/minecart/down" // Fallen mine cart. diff --git a/packages/models/mapmodels/makke/wires/2x8/md3.cfg b/packages/models/mapmodels/makke/wires/2x8/md3.cfg index dc1d5484..7aaaae19 100644 --- a/packages/models/mapmodels/makke/wires/2x8/md3.cfg +++ b/packages/models/mapmodels/makke/wires/2x8/md3.cfg @@ -4,4 +4,5 @@ mdlattribute keywords "street" mdlattribute desc "Wires 2x8" mdlattribute author makke mdlattribute distribution official +mdlattribute defaults "0 0 2 0" diff --git a/packages/models/mapmodels/makke/wires/3x8/md3.cfg b/packages/models/mapmodels/makke/wires/3x8/md3.cfg index 53de0faf..5c85c244 100644 --- a/packages/models/mapmodels/makke/wires/3x8/md3.cfg +++ b/packages/models/mapmodels/makke/wires/3x8/md3.cfg @@ -4,4 +4,5 @@ mdlattribute keywords "street" mdlattribute desc "Wires 3x8" mdlattribute author makke mdlattribute distribution official +mdlattribute defaults "0 0 2 0" diff --git a/packages/models/mapmodels/makke/wires/4x8/md3.cfg b/packages/models/mapmodels/makke/wires/4x8/md3.cfg index daf4c10e..c37b31ea 100644 --- a/packages/models/mapmodels/makke/wires/4x8/md3.cfg +++ b/packages/models/mapmodels/makke/wires/4x8/md3.cfg @@ -4,4 +4,5 @@ mdlattribute keywords "street" mdlattribute desc "Wires 4x8 1" mdlattribute author makke mdlattribute distribution official +mdlattribute defaults "0 0 2 0" diff --git a/packages/models/mapmodels/makke/wires/4x8a/md3.cfg b/packages/models/mapmodels/makke/wires/4x8a/md3.cfg index 82ad714d..032fa6b1 100644 --- a/packages/models/mapmodels/makke/wires/4x8a/md3.cfg +++ b/packages/models/mapmodels/makke/wires/4x8a/md3.cfg @@ -4,4 +4,5 @@ mdlattribute keywords "street" mdlattribute desc "Wires 4x8 2" mdlattribute author makke mdlattribute distribution official +mdlattribute defaults "0 0 2 0" diff --git a/source/src/menus.cpp b/source/src/menus.cpp index a40919e9..baa8ca0c 100644 --- a/source/src/menus.cpp +++ b/source/src/menus.cpp @@ -754,13 +754,13 @@ struct mitemcheckbox : mitem int offs = ((menurighttabwidth - FONTH) * ((msctrl % 41) ? pos : (50 + 50 * sinf(totalmillis / 300.0f + y)))) / 100; int c = greyedout ? 128 : 255; - draw_text(text, x, y, c, c, c); if(sel) { renderbg(x, y, w-boxsize-offs-FONTH/2, menuseldescbgcolor); renderbg(x+w-boxsize-offs, y, boxsize, menuselbgcolor); if(offs > FONTH/2) renderbg(x+w-offs+FONTH/2, y, offs-FONTH/2, menuseldescbgcolor); } + draw_text(text, x, y, c, c, c); x -= offs; blendbox(x+w-boxsize, y, x+w, y+boxsize, false, -1, &gray); color *col = greyedout ? &gray : (sel ? &whitepulse : &white);