diff --git a/gamedata/configs/engine_external.ltx b/gamedata/configs/engine_external.ltx index bb9bdf0f1..eb43a6822 100644 --- a/gamedata/configs/engine_external.ltx +++ b/gamedata/configs/engine_external.ltx @@ -4,6 +4,7 @@ title = st_ixray_title ; Mod name [ui] HQIcons = false DisableCharacterInfo = false +DisableInventoryGrid = false ; Uses ui\ui_grid_alt.dds instead of ui\ui_grid.dds [physics] DeadBodyRagdoll = false diff --git a/gamedata/textures/ui/ui_font_menu.ini b/gamedata/textures/ui/ui_font_menu.ini deleted file mode 100644 index aeb10ff96..000000000 --- a/gamedata/textures/ui/ui_font_menu.ini +++ /dev/null @@ -1,258 +0,0 @@ -[symbol_coords] -height = 26 -000 = 0, 0, 0, 0 -001 = 0, 0, 0, 0 -002 = 0, 0, 0, 0 -003 = 0, 0, 0, 0 -004 = 0, 0, 0, 0 -005 = 0, 0, 0, 0 -006 = 0, 0, 0, 0 -007 = 0, 0, 0, 0 -008 = 0, 0, 0, 0 -009 = 0, 0, 0, 0 -010 = 0, 0, 0, 0 -011 = 0, 0, 0, 0 -012 = 0, 0, 0, 0 -013 = 0, 0, 0, 0 -014 = 0, 0, 0, 0 -015 = 0, 0, 0, 0 -016 = 0, 0, 0, 0 -017 = 0, 0, 0, 0 -018 = 0, 0, 0, 0 -019 = 0, 0, 0, 0 -020 = 0, 0, 0, 0 -021 = 0, 0, 0, 0 -022 = 0, 0, 0, 0 -023 = 0, 0, 0, 0 -024 = 0, 0, 0, 0 -025 = 0, 0, 0, 0 -026 = 0, 0, 0, 0 -027 = 0, 0, 0, 0 -028 = 0, 0, 0, 0 -029 = 0, 0, 0, 0 -030 = 0, 0, 0, 0 -031 = 0, 0, 0, 0 -032 = 0, 0, 13, 26 -033 = 13, 0, 23, 26 -034 = 23, 0, 30, 26 -035 = 30, 0, 49, 26 -036 = 49, 0, 68, 26 -037 = 68, 0, 94, 26 -038 = 94, 0, 116, 26 -039 = 116, 0, 122, 26 -040 = 122, 0, 130, 26 -041 = 130, 0, 138, 26 -042 = 138, 0, 150, 26 -043 = 150, 0, 162, 26 -044 = 162, 0, 172, 26 -045 = 172, 0, 181, 26 -046 = 181, 0, 191, 26 -047 = 191, 0, 199, 26 -048 = 199, 0, 218, 26 -049 = 218, 0, 237, 26 -050 = 237, 0, 256, 26 -051 = 0, 26, 19, 52 -052 = 19, 26, 38, 52 -053 = 38, 26, 57, 52 -054 = 57, 26, 76, 52 -055 = 76, 26, 95, 52 -056 = 95, 26, 114, 52 -057 = 114, 26, 133, 52 -058 = 133, 26, 143, 52 -059 = 143, 26, 153, 52 -060 = 153, 26, 165, 52 -061 = 165, 26, 177, 52 -062 = 177, 26, 189, 52 -063 = 189, 26, 205, 52 -064 = 205, 26, 221, 52 -065 = 221, 26, 241, 52 -066 = 0, 52, 20, 78 -067 = 20, 52, 40, 78 -068 = 40, 52, 61, 78 -069 = 61, 52, 78, 78 -070 = 78, 52, 95, 78 -071 = 95, 52, 116, 78 -072 = 116, 52, 137, 78 -073 = 137, 52, 144, 78 -074 = 144, 52, 160, 78 -075 = 160, 52, 180, 78 -076 = 180, 52, 196, 78 -077 = 196, 52, 222, 78 -078 = 222, 52, 244, 78 -079 = 0, 78, 22, 104 -080 = 22, 78, 41, 104 -081 = 41, 78, 63, 104 -082 = 63, 78, 83, 104 -083 = 83, 78, 103, 104 -084 = 103, 78, 120, 104 -085 = 120, 78, 141, 104 -086 = 141, 78, 160, 104 -087 = 160, 78, 186, 104 -088 = 186, 78, 206, 104 -089 = 206, 78, 225, 104 -090 = 225, 78, 243, 104 -091 = 243, 78, 251, 104 -092 = 0, 104, 8, 130 -093 = 8, 104, 16, 130 -094 = 16, 104, 28, 130 -095 = 28, 104, 39, 130 -096 = 39, 104, 45, 130 -097 = 45, 104, 61, 130 -098 = 61, 104, 77, 130 -099 = 77, 104, 92, 130 -100 = 92, 104, 108, 130 -101 = 108, 104, 124, 130 -102 = 124, 104, 134, 130 -103 = 134, 104, 150, 130 -104 = 150, 104, 166, 130 -105 = 166, 104, 172, 130 -106 = 172, 104, 178, 130 -107 = 178, 104, 193, 130 -108 = 193, 104, 199, 130 -109 = 199, 104, 223, 130 -110 = 223, 104, 239, 130 -111 = 239, 104, 255, 130 -112 = 0, 130, 16, 156 -113 = 16, 130, 32, 156 -114 = 32, 130, 45, 156 -115 = 45, 130, 61, 156 -116 = 61, 130, 73, 156 -117 = 73, 130, 89, 156 -118 = 89, 130, 103, 156 -119 = 103, 130, 124, 156 -120 = 124, 130, 138, 156 -121 = 138, 130, 152, 156 -122 = 152, 130, 166, 156 -123 = 166, 130, 174, 156 -124 = 174, 130, 179, 156 -125 = 179, 130, 187, 156 -126 = 187, 130, 199, 156 -127 = 0, 0, 13, 26 -128 = 0, 0, 13, 26 -129 = 0, 0, 13, 26 -130 = 199, 130, 205, 156 -131 = 205, 130, 224, 156 -132 = 0, 0, 13, 26 -133 = 0, 0, 13, 26 -134 = 0, 0, 13, 26 -135 = 0, 0, 13, 26 -136 = 0, 0, 13, 26 -137 = 0, 0, 13, 26 -138 = 224, 130, 244, 156 -139 = 244, 130, 251, 156 -140 = 0, 156, 26, 182 -141 = 0, 0, 13, 26 -142 = 26, 156, 44, 182 -143 = 0, 0, 13, 26 -144 = 44, 156, 55, 182 -145 = 55, 156, 61, 182 -146 = 61, 156, 67, 182 -147 = 67, 156, 77, 182 -148 = 77, 156, 87, 182 -149 = 87, 156, 98, 182 -150 = 0, 0, 13, 26 -151 = 0, 0, 13, 26 -152 = 0, 0, 13, 26 -153 = 98, 156, 118, 182 -154 = 118, 156, 134, 182 -155 = 134, 156, 141, 182 -156 = 141, 156, 167, 182 -157 = 0, 0, 13, 26 -158 = 167, 156, 181, 182 -159 = 181, 156, 200, 182 -160 = 0, 0, 13, 26 -161 = 200, 156, 210, 182 -162 = 210, 156, 229, 182 -163 = 229, 156, 248, 182 -164 = 0, 0, 13, 26 -165 = 0, 0, 13, 26 -166 = 0, 0, 13, 26 -167 = 0, 0, 13, 26 -168 = 0, 0, 13, 26 -169 = 0, 182, 16, 208 -170 = 16, 182, 26, 208 -171 = 26, 182, 37, 208 -172 = 0, 0, 13, 26 -173 = 37, 182, 46, 208 -174 = 46, 182, 62, 208 -175 = 62, 182, 68, 208 -176 = 68, 182, 77, 208 -177 = 77, 182, 89, 208 -178 = 89, 182, 102, 208 -179 = 102, 182, 115, 208 -180 = 115, 182, 121, 208 -181 = 121, 182, 137, 208 -182 = 0, 0, 13, 26 -183 = 137, 182, 147, 208 -184 = 147, 182, 153, 208 -185 = 153, 182, 166, 208 -186 = 166, 182, 177, 208 -187 = 177, 182, 188, 208 -188 = 0, 0, 13, 26 -189 = 0, 0, 13, 26 -190 = 0, 0, 13, 26 -191 = 188, 182, 204, 208 -192 = 204, 182, 224, 208 -193 = 224, 182, 244, 208 -194 = 0, 208, 20, 234 -195 = 20, 208, 40, 234 -196 = 40, 208, 60, 234 -197 = 60, 208, 80, 234 -198 = 80, 208, 105, 234 -199 = 105, 208, 125, 234 -200 = 125, 208, 142, 234 -201 = 142, 208, 159, 234 -202 = 159, 208, 176, 234 -203 = 176, 208, 193, 234 -204 = 193, 208, 200, 234 -205 = 200, 208, 207, 234 -206 = 207, 208, 214, 234 -207 = 214, 208, 221, 234 -208 = 221, 208, 242, 234 -209 = 0, 234, 22, 260 -210 = 22, 234, 44, 260 -211 = 44, 234, 66, 260 -212 = 66, 234, 88, 260 -213 = 88, 234, 110, 260 -214 = 110, 234, 132, 260 -215 = 132, 234, 144, 260 -216 = 144, 234, 166, 260 -217 = 166, 234, 187, 260 -218 = 187, 234, 208, 260 -219 = 208, 234, 229, 260 -220 = 229, 234, 250, 260 -221 = 0, 260, 19, 286 -222 = 19, 260, 38, 286 -223 = 38, 260, 54, 286 -224 = 54, 260, 70, 286 -225 = 70, 260, 86, 286 -226 = 86, 260, 102, 286 -227 = 102, 260, 118, 286 -228 = 118, 260, 134, 286 -229 = 134, 260, 150, 286 -230 = 150, 260, 175, 286 -231 = 175, 260, 190, 286 -232 = 190, 260, 206, 286 -233 = 206, 260, 222, 286 -234 = 222, 260, 238, 286 -235 = 238, 260, 254, 286 -236 = 0, 286, 6, 312 -237 = 6, 286, 12, 312 -238 = 12, 286, 18, 312 -239 = 18, 286, 24, 312 -240 = 24, 286, 40, 312 -241 = 40, 286, 56, 312 -242 = 56, 286, 72, 312 -243 = 72, 286, 88, 312 -244 = 88, 286, 104, 312 -245 = 104, 286, 120, 312 -246 = 120, 286, 136, 312 -247 = 136, 286, 148, 312 -248 = 148, 286, 164, 312 -249 = 164, 286, 180, 312 -250 = 180, 286, 196, 312 -251 = 196, 286, 212, 312 -252 = 212, 286, 228, 312 -253 = 228, 286, 242, 312 -254 = 0, 312, 16, 338 -255 = 16, 312, 30, 338 diff --git a/gamedata/textures/ui/ui_grid_alt.dds b/gamedata/textures/ui/ui_grid_alt.dds new file mode 100644 index 000000000..57d821de4 Binary files /dev/null and b/gamedata/textures/ui/ui_grid_alt.dds differ diff --git a/src/xrEngine/EngineExternal.h b/src/xrEngine/EngineExternal.h index 8a1be1a99..91ef19b04 100644 --- a/src/xrEngine/EngineExternal.h +++ b/src/xrEngine/EngineExternal.h @@ -3,6 +3,7 @@ enum class EEngineExternalUI { HQIcons, DisableCharacterInfo, + DisableInventoryGrid, None }; diff --git a/src/xrGame/ui/UIDragDropListEx.cpp b/src/xrGame/ui/UIDragDropListEx.cpp index fad700a8b..b132e6165 100644 --- a/src/xrGame/ui/UIDragDropListEx.cpp +++ b/src/xrGame/ui/UIDragDropListEx.cpp @@ -531,7 +531,15 @@ CUICell& CUIDragDropListEx::GetCellAt(const Ivector2& pos) CUICellContainer::CUICellContainer(CUIDragDropListEx* parent) { m_pParentDragDropList = parent; - hShader->create ( "hud\\fog_of_war", "ui\\ui_grid" ); + const static bool isGridDisabled = EngineExternal()[EEngineExternalUI::DisableInventoryGrid]; + if (isGridDisabled) + { + hShader->create("hud\\fog_of_war", "ui\\ui_grid_alt"); + } + else + { + hShader->create("hud\\fog_of_war", "ui\\ui_grid"); + } // hShader_selected->create ( "hud\\fog_of_war", "ui_grid_selected" ); m_cellSpacing.set ( 0, 0 ); }