WIP MAIN_MENU_PANEL_OFFSET_X/Y

files/ce.dat/config/game.cfg

@@ -55,6 +55,9 @@ big_font_color=0
 ; Pixel offset for main menu buttons.
 offset_x=0
 offset_y=0
+; Pixel offset for the high resolution main menu button panel.
+main_menu_panel_offset_x=16
+main_menu_panel_offset_y=15
 ; Pixel offset for the copyright text line.
 credits_offset_x=0
 credits_offset_y=0

files/fallout2.cfg

@@ -165,16 +165,6 @@ main_menu_scale_mode=1
 ; Set to 1 to show a Help option in the in-game options menu which opens the F1 help screen.
 in_game_menu_help=1
 
-; Weight/size indicator for PC, critters and containers
-; Set to 0 for vanilla behavior (no weight indicator)
-; Set to 1 to show a simple weight indicator; works with all inventory_columns values
-; Set to 2 to show a detailed weight indicator; works with inventory_columns > 1 only
-loot_weight_indicator=1
-
-; Set to 0 to show container indicator at all times
-; Set to XX to show container indicator when size reaches XX%
-; Set to 100 to show container indicator when full
-loot_container_size_indicator_threshold=50
 
 [qol]
 ; Automatically open doors that are unlocked and has no script attached.

src/art.cc

@@ -1789,13 +1789,11 @@ void FrmImage::resetInternal()
 
 bool FrmImage::setFrame(const Art* art, int frame, int direction)
 {
-    unsigned char* data = artGetFrameData(art, frame, direction, &_width, &_height, nullptr, nullptr);
+    unsigned char* data = artGetFrameData(art, frame, direction, &_width, &_height, &_xOffset, &_yOffset);
     if (data == nullptr) {
         return false;
     }
 
-    _xOffset = art->xOffsets[direction];
-    _yOffset = art->yOffsets[direction];
     _data = data;
     return true;
 }

src/content_config.cc

@@ -15,8 +15,9 @@ void contentConfigInit()
         return;
     }
 
-    // Try to migrate some settings from sfall.
+    // Try to migrate some settings from legacy config files.
     contentConfigTryMigrateFromSfall(kConfigPatchPath);
+    contentConfigTryMigrateFromF2Res(kConfigPatchPath);
 
     if (!configInit(&gContentConfig)) {
         return;
@@ -35,4 +36,4 @@ void contentConfigExit()
     configFree(&gContentConfig);
 }
 
-} // namespace fallout
+} // namespace fallout

src/game_config_migration.cc

@@ -16,6 +16,8 @@ namespace fallout {
 namespace {
 
 #define F2_RES_CONFIG_FILE_NAME "f2_res.ini"
+#define F2_RES_MAIN_MENU_BUTTON_X 30
+#define F2_RES_MAIN_MENU_BUTTON_Y 19
 
     struct F2ResMigrationEntry {
         const char* legacySection;
@@ -29,6 +31,7 @@ namespace {
     static bool gameConfigMigrateMainMenuScaleModeKey(Config* legacyConfig, Config* gameConfig);
     static bool gameConfigMigrateStringKey(Config* legacyConfig, Config* gameConfig, const F2ResMigrationEntry& entry);
     static bool gameConfigMigrateScaleKey(Config* legacyConfig, Config* gameConfig);
+    static bool contentConfigMigrateF2ResMainMenuPanelOffsetKey(Config* legacyConfig, Config* contentConfig, const char* legacyKey, const char* targetKey, int baseValue, int defaultValue);
 
     static constexpr F2ResMigrationEntry kF2ResMigrationEntries[] = {
         { "MAIN", "SCR_WIDTH", GAME_CONFIG_SCREEN_KEY, GAME_CONFIG_RESOLUTION_X_KEY },
@@ -110,6 +113,27 @@ namespace {
 
         return configSetInt(gameConfig, GAME_CONFIG_SCREEN_KEY, GAME_CONFIG_SCALE_KEY, value + 1);
     }
+
+    static bool contentConfigMigrateF2ResMainMenuPanelOffsetKey(Config* legacyConfig, Config* contentConfig, const char* legacyKey, const char* targetKey, int baseValue, int defaultValue)
+    {
+        assert(legacyConfig != nullptr && contentConfig != nullptr);
+
+        if (gameConfigHasKey(contentConfig, CONTENT_CONFIG_MAIN_MENU_SECTION, targetKey)) {
+            return false;
+        }
+
+        int value;
+        if (!configGetInt(legacyConfig, "MAINMENU", legacyKey, &value)) {
+            return false;
+        }
+
+        value += baseValue;
+        if (value == defaultValue) {
+            return false;
+        }
+
+        return configSetInt(contentConfig, CONTENT_CONFIG_MAIN_MENU_SECTION, targetKey, value);
+    }
 } // namespace
 
 // Migrate settings F2_RES.INI to fallout2.cfg
@@ -301,6 +325,82 @@ static bool contentConfigMigrateFromSfall(Config* sfallConfig, const char* conte
     return migrated;
 }
 
+static bool contentConfigEnsureDirectory(const char* contentConfigFilePath)
+{
+    char drive[COMPAT_MAX_DRIVE];
+    char dirPart[COMPAT_MAX_DIR];
+    char pathWithoutFile[COMPAT_MAX_PATH];
+    compat_splitpath(contentConfigFilePath, drive, dirPart, nullptr, nullptr);
+    compat_makepath(pathWithoutFile, drive, dirPart, nullptr, nullptr);
+    return compat_mkdir_recursive(pathWithoutFile) == 0;
+}
+
+static bool contentConfigMigrateFromF2Res(Config* legacyConfig, const char* contentConfigFilePath)
+{
+    assert(legacyConfig != nullptr && contentConfigFilePath != nullptr);
+
+    Config migratedConfig;
+    if (!configInit(&migratedConfig)) {
+        return false;
+    }
+
+    configRead(&migratedConfig, contentConfigFilePath, false);
+
+    bool migrated = false;
+    if (contentConfigMigrateF2ResMainMenuPanelOffsetKey(legacyConfig, &migratedConfig, "MENU_BG_OFFSET_X", "main_menu_panel_offset_x", F2_RES_MAIN_MENU_BUTTON_X, 16)) {
+        migrated = true;
+    }
+    if (contentConfigMigrateF2ResMainMenuPanelOffsetKey(legacyConfig, &migratedConfig, "MENU_BG_OFFSET_Y", "main_menu_panel_offset_y", F2_RES_MAIN_MENU_BUTTON_Y, 15)) {
+        migrated = true;
+    }
+
+    if (migrated) {
+        if (contentConfigEnsureDirectory(contentConfigFilePath)) {
+            if (!configWriteEx(&migratedConfig, contentConfigFilePath, CONFIG_RETAIN_ALL)) {
+                debugPrint("Failed to write migrated settings to %s!\n", contentConfigFilePath);
+            }
+        } else {
+            debugPrint("Failed to create directory for migrated settings at %s!\n", contentConfigFilePath);
+        }
+    }
+
+    configFree(&migratedConfig);
+    return migrated;
+}
+
+void contentConfigTryMigrateFromF2Res(const char* contentConfigPath)
+{
+    const auto& masterPatches = settings.system.master_patches_path;
+    if (masterPatches.empty()) {
+        debugPrint("Failed to migrate from f2_res.ini: no master_patches is set.\n");
+        return;
+    }
+    if (!compat_is_dir(masterPatches.c_str())) {
+        return;
+    }
+
+    char f2ResFilePath[COMPAT_MAX_PATH];
+    char drive[COMPAT_MAX_DRIVE];
+    char dir[COMPAT_MAX_DIR];
+    compat_splitpath(gGameConfigFilePath, drive, dir, nullptr, nullptr);
+    compat_makepath(f2ResFilePath, drive, dir, F2_RES_CONFIG_FILE_NAME, nullptr);
+
+    Config legacyConfig;
+    if (!configInit(&legacyConfig)) {
+        return;
+    }
+
+    if (configRead(&legacyConfig, f2ResFilePath, false)) {
+        char contentCfgPath[COMPAT_MAX_PATH];
+        snprintf(contentCfgPath, sizeof(contentCfgPath), "%s\\%s", masterPatches.c_str(), contentConfigPath);
+        if (contentConfigMigrateFromF2Res(&legacyConfig, contentCfgPath)) {
+            debugPrint("Migrated settings from f2_res.ini to game.cfg.\n");
+        }
+    }
+
+    configFree(&legacyConfig);
+}
+
 void contentConfigTryMigrateFromSfall(const char* contentConfigPath)
 {
     if (!gSfallConfig.isInitialized() || gSfallConfig.entriesLength == 0) {

src/game_config_migration.h

@@ -6,6 +6,7 @@
 namespace fallout {
 
 bool gameConfigMigrateFromF2Res(const char* gameConfigFilePath, Config* gameConfig);
+void contentConfigTryMigrateFromF2Res(const char* contentConfigPath);
 void contentConfigTryMigrateFromSfall(const char* contentConfigPath);
 
 } // namespace fallout

src/game_dialog.cc

@@ -3500,11 +3500,6 @@ int gameDialogGetWindow()
     return windowGetWindow(gGameDialogWindow) != nullptr ? gGameDialogWindow : -1;
 }
 
-int gameDialogGetBackgroundWindow()
-{
-    return windowGetWindow(gGameDialogBackgroundWindow) != nullptr ? gGameDialogBackgroundWindow : -1;
-}
-
 // 0x448660 gdialog_barter_cleanup_tables
 void gameDialogBarterCleanupTables()
 {

src/game_dialog.h

@@ -41,7 +41,6 @@ int gameDialogBarter(int modifier);
 void gameDialogEndBarter();
 bool gameDialogIsBarterWindowExpanded();
 int gameDialogGetWindow();
-int gameDialogGetBackgroundWindow();
 
 } // namespace fallout
 

src/game_mouse.cc

@@ -704,24 +704,6 @@ void gameMouseRefresh()
                     int primaryAction = -1;
 
                     switch (FID_TYPE(pointedObject->fid)) {
-                    case OBJ_TYPE_SCENERY:                      
-                    case OBJ_TYPE_WALL:
-                    case OBJ_TYPE_MISC: {
-                        if (_obj_action_can_use(pointedObject)) {
-                            primaryAction = GAME_MOUSE_ACTION_MENU_ITEM_USE;
-                            break;
-                        }
-
-                        primaryAction = GAME_MOUSE_ACTION_MENU_ITEM_LOOK;
-                    
-                        // if the pointedObject is scenery/wall/misc object then it finds possible outlined item object behind it
-                        Object* itemObject = gameMouseGetObjectUnderCursor(OBJ_TYPE_ITEM, true, gElevation);
-                        if (itemObject == nullptr) {
-                            break;
-                        }
-                        pointedObject = itemObject;
-                    }
-                    // FALLTHROUGH
                     case OBJ_TYPE_ITEM:
                         primaryAction = GAME_MOUSE_ACTION_MENU_ITEM_USE;
                         if (gGameMouseItemHighlightEnabled) {
@@ -751,6 +733,16 @@ void gameMouseRefresh()
                             }
                         }
                         break;
+                    case OBJ_TYPE_SCENERY:
+                        if (!_obj_action_can_use(pointedObject)) {
+                            primaryAction = GAME_MOUSE_ACTION_MENU_ITEM_LOOK;
+                        } else {
+                            primaryAction = GAME_MOUSE_ACTION_MENU_ITEM_USE;
+                        }
+                        break;
+                    case OBJ_TYPE_WALL:
+                        primaryAction = GAME_MOUSE_ACTION_MENU_ITEM_LOOK;
+                        break;
                     }
 
                     if (primaryAction != -1) {
@@ -1001,25 +993,6 @@ void _gmouse_handle_event(int mouseX, int mouseY, int mouseState)
             Object* targetObj = gameMouseGetObjectUnderCursor(-1, true, gElevation);
             if (targetObj != nullptr) {
                 switch (FID_TYPE(targetObj->fid)) {
-                case OBJ_TYPE_WALL:
-                case OBJ_TYPE_SCENERY:
-                case OBJ_TYPE_MISC: {
-                    // if the targetObj is wall/scenery/misc object then it allows to pickup outlined items potentially behind
-                    Object* itemObj = gameMouseGetObjectUnderCursor(OBJ_TYPE_ITEM, true, gElevation);
-                    if (!objectIsOutlined(itemObj)) {
-                        if (_obj_action_can_use(targetObj)) {
-                            _action_use_an_object(gDude, targetObj);
-                        } 
-                        break;
-                    }
-
-                    targetObj = itemObj;
-
-                    if (objectExamine(gDude, targetObj) == -1) {
-                        objectLookAt(gDude, targetObj);
-                    }
-                }
-                // FALLTHROUGH
                 case OBJ_TYPE_ITEM:
                     actionPickUp(gDude, targetObj);
                     break;
@@ -1045,6 +1018,20 @@ void _gmouse_handle_event(int mouseX, int mouseY, int mouseState)
                         }
                     }
                     break;
+                case OBJ_TYPE_SCENERY:
+                    if (_obj_action_can_use(targetObj)) {
+                        _action_use_an_object(gDude, targetObj);
+                    } else {
+                        if (objectExamine(gDude, targetObj) == -1) {
+                            objectLookAt(gDude, targetObj);
+                        }
+                    }
+                    break;
+                case OBJ_TYPE_WALL:
+                    if (objectExamine(gDude, targetObj) == -1) {
+                        objectLookAt(gDude, targetObj);
+                    }
+                    break;
                 }
             }
             return;

src/inventory.cc

@@ -5,7 +5,6 @@
 #include <string.h>
 
 #include <algorithm>
-#include <cmath>
 #include <string>
 #include <utility>
 
@@ -926,31 +925,7 @@ static bool inventoryLootMouseHitTestScroller(bool targetInventory)
 
 static void inventoryLootRenderPaneWeight(unsigned char* windowBuffer, int pitch, bool targetPane, Object* object, int extraWeight)
 {
-    int loot_weight_indicator = settings.ui.loot_weight_indicator;
-
-    bool showLabel = inventoryLootLayout.columns > 1;
-    bool showDetailed = loot_weight_indicator == 2 && showLabel;
-    bool showSimple = loot_weight_indicator == 1 || (loot_weight_indicator == 2 && !showLabel);
-
-    if (!showDetailed && !showSimple) {
-        return;
-    }
-
-    int containerSizeThreshold = settings.ui.loot_container_size_indicator_threshold;
-
-    // Wt.
-    MessageListItem messageListItem;
-    messageListItem.num = 30;
-
-    if (showLabel) {
-        if (!messageListGetItem(&gInventoryMessageList, &messageListItem)) {
-            showSimple = true;
-            showDetailed = false;
-            showLabel = false;
-        }
-    }
-
-    char formattedText[30];
+    char formattedText[20];
     formattedText[0] = '\0';
 
     int oldFont = fontGetCurrent();
@@ -967,54 +942,26 @@ static void inventoryLootRenderPaneWeight(unsigned char* windowBuffer, int pitch
             pitch);
     }
 
-    int color = COLOR_WHITE;
-    int inventoryWeight = objectGetInventoryWeight(object);
+    int color = COLOR_GREEN;
     if (PID_TYPE(object->pid) == OBJ_TYPE_CRITTER) {
-        int currentWeight = inventoryWeight + extraWeight;
+        int currentWeight = objectGetInventoryWeight(object) + extraWeight;
         int maxWeight = critterGetStat(object, STAT_CARRY_WEIGHT);
-        int weightPercentage = maxWeight < 1 ? 0 : (int)std::ceil(currentWeight * 100 / (float)maxWeight);
-
-        if (showSimple) {
-            if (showLabel) {
-                snprintf(formattedText, sizeof(formattedText), "%s %d/%d", messageListItem.text, currentWeight, maxWeight);
-            } else {
-                snprintf(formattedText, sizeof(formattedText), "%d/%d", currentWeight, maxWeight);
-            }
-        } else if (showDetailed) {
-            snprintf(formattedText, sizeof(formattedText), "%s %d/%d (%d%%)", messageListItem.text, currentWeight, maxWeight, weightPercentage);
-        }
-
+        snprintf(formattedText, sizeof(formattedText), "%d/%d", currentWeight, maxWeight);
         if (currentWeight > maxWeight) {
             color = COLOR_RED;
         }
     } else if (targetPane && PID_TYPE(object->pid) == OBJ_TYPE_ITEM && itemGetType(object) == ITEM_TYPE_CONTAINER) {
         int currentSize = containerGetTotalSize(object);
         int maxSize = containerGetMaxSize(object);
-        int sizePercentage = maxSize < 1 ? 0 : (int)std::ceil(currentSize * 100 / (float)maxSize);
-
-        if (sizePercentage < containerSizeThreshold) {
-            fontSetCurrent(oldFont);
-            return;
-        }
-
-        if (showSimple) {
-            snprintf(formattedText, sizeof(formattedText), "%d%%", sizePercentage);
-        } else if (showDetailed) {
-            snprintf(formattedText, sizeof(formattedText), "%s %d (%d%%)", messageListItem.text, inventoryWeight, sizePercentage);
-        }
+        snprintf(formattedText, sizeof(formattedText), "%d/%d", currentSize, maxSize);
     } else {
-        if (showLabel) {
-            snprintf(formattedText, sizeof(formattedText), "%s %d", messageListItem.text, inventoryWeight);
-        } else {
-            snprintf(formattedText, sizeof(formattedText), "%d", inventoryWeight);
-        }
+        int inventoryWeight = objectGetInventoryWeight(object);
+        snprintf(formattedText, sizeof(formattedText), "%d", inventoryWeight);
     }
 
-    if (strlen(formattedText) > 0) {
-        int x = targetPane ? inventoryLootLayout.rightScrollerX : inventoryLootLayout.leftScrollerX;
-        int y = (targetPane ? inventoryLootLayout.rightScrollerY : inventoryLootLayout.leftScrollerY) + inventoryLootLayout.scrollerHeight + 2;
-        inventoryDrawCenteredText(windowBuffer, pitch, inventoryLootLayout.scrollerWidth, x, y, formattedText, color);
-    }
+    int x = targetPane ? inventoryLootLayout.rightScrollerX : inventoryLootLayout.leftScrollerX;
+    int y = (targetPane ? inventoryLootLayout.rightScrollerY : inventoryLootLayout.leftScrollerY) + inventoryLootLayout.scrollerHeight + 2;
+    inventoryDrawCenteredText(windowBuffer, pitch, inventoryLootLayout.scrollerWidth, x, y, formattedText, color);
 
     fontSetCurrent(oldFont);
 }
@@ -4149,10 +4096,10 @@ static void displayLootPanePartyName(unsigned char* windowBuffer, int windowPitc
 
     int oldFont = fontGetCurrent();
     fontSetCurrent(101);
-    int nameY = rect.bottom - fontGetLineHeight();
+    int nameY = rect.bottom - fontGetLineHeight() - 2;
     fontSetCurrent(oldFont);
 
-    inventoryDrawCenteredText(windowBuffer, windowPitch, INVENTORY_BODY_VIEW_WIDTH, rect.left, nameY, name, COLOR_WHITE);
+    inventoryDrawCenteredText(windowBuffer, windowPitch, INVENTORY_BODY_VIEW_WIDTH, rect.left, nameY, name, COLOR_GREEN);
 }
 
 // Displays item description.

src/mainmenu.cc

@@ -305,8 +305,13 @@ static void mainMenuDrawPanel(const MainMenuLayout& layout, const MainMenuOffset
         return;
     }
 
+    int panelOffsetX = MAIN_MENU_PANEL_OFFSET_X;
+    int panelOffsetY = MAIN_MENU_PANEL_OFFSET_Y;
+    configGetInt(&gContentConfig, CONTENT_CONFIG_MAIN_MENU_SECTION, "main_menu_panel_offset_x", &panelOffsetX, MAIN_MENU_PANEL_OFFSET_X);
+    configGetInt(&gContentConfig, CONTENT_CONFIG_MAIN_MENU_SECTION, "main_menu_panel_offset_y", &panelOffsetY, MAIN_MENU_PANEL_OFFSET_Y);
+
     Size panelSize = mainMenuTransformSize(layout, mainMenuButtonPanelFrmImage.getWidth(), mainMenuButtonPanelFrmImage.getHeight());
-    Point panelOrigin = mainMenuTransformPoint(layout, MAIN_MENU_PANEL_OFFSET_X, MAIN_MENU_PANEL_OFFSET_Y);
+    Point panelOrigin = mainMenuTransformPoint(layout, panelOffsetX, panelOffsetY);
 
     blitBuffer2DScaledTrans(mainMenuButtonPanelFrmImage.getBuffer(),
         Buffer2D(gMainMenuWindowBuffer, layout.screenWidth, layout.screenHeight),

src/map.cc

@@ -978,7 +978,7 @@ static int mapLoad(File* stream)
     }
 
     lightSetAmbientIntensity(LIGHT_INTENSITY_MAX, false);
-    objectSetLocation(gDude, gEnteringTile, gElevation, nullptr);
+    objectSetLocation(gDude, gCenterTile, gElevation, nullptr);
     objectSetRotation(gDude, gEnteringRotation, nullptr);
     gMapHeader.index = wmMapMatchNameToIdx(gMapHeader.name);
 

src/object.cc

@@ -821,8 +821,10 @@ void _obj_render_pre_roof(Rect* rect, int elevation)
                     if ((objectListNode->obj->flags & OBJECT_HIDDEN) == 0) {
                         _obj_render_object(objectListNode->obj, &updatedRect, lightIntensity);
 
-                        if (objectIsOutlined(objectListNode->obj) && _outlineCount < 100) {
-                            _outlinedObjects[_outlineCount++] = objectListNode->obj;
+                        if ((objectListNode->obj->outline & OUTLINE_TYPE_MASK) != 0) {
+                            if ((objectListNode->obj->outline & OUTLINE_DISABLED) == 0 && _outlineCount < 100) {
+                                _outlinedObjects[_outlineCount++] = objectListNode->obj;
+                            }
                         }
                     }
                 }
@@ -857,8 +859,10 @@ void _obj_render_pre_roof(Rect* rect, int elevation)
                 if ((objectListNode->obj->flags & OBJECT_HIDDEN) == 0) {
                     _obj_render_object(object, &updatedRect, lightIntensity);
 
-                    if (objectIsOutlined(objectListNode->obj) && _outlineCount < 100) {
-                        _outlinedObjects[_outlineCount++] = objectListNode->obj;
+                    if ((objectListNode->obj->outline & OUTLINE_TYPE_MASK) != 0) {
+                        if ((objectListNode->obj->outline & OUTLINE_DISABLED) == 0 && _outlineCount < 100) {
+                            _outlinedObjects[_outlineCount++] = objectListNode->obj;
+                        }
                     }
                 }
             }
@@ -1877,7 +1881,7 @@ int objectHide(Object* object, Rect* rect)
 
     object->flags |= OBJECT_HIDDEN;
 
-    if (objectIsOutlined(object)) {
+    if ((object->outline & OUTLINE_TYPE_MASK) != 0) {
         object->outline |= OUTLINE_DISABLED;
     }
 
@@ -1915,7 +1919,7 @@ int objectDisableOutline(Object* object, Rect* rect)
         return -1;
     }
 
-    if (objectIsOutlined(object)) {
+    if ((object->outline & OUTLINE_TYPE_MASK) != 0) {
         object->outline |= OUTLINE_DISABLED;
     }
 
@@ -2331,7 +2335,10 @@ void objectGetRect(Object* obj, Rect* rect)
         return;
     }
 
-    bool isOutlined = objectIsOutlined(obj);
+    bool isOutlined = false;
+    if ((obj->outline & OUTLINE_TYPE_MASK) != 0) {
+        isOutlined = true;
+    }
 
     CacheEntry* artHandle;
     Art* art = artLock(obj->fid, &artHandle);
@@ -2881,11 +2888,6 @@ void _intensity_mask_buf_to_buf(unsigned char* src, int srcWidth, int srcHeight,
     }
 }
 
-bool objectIsOutlined(Object* obj)
-{
-    return obj != nullptr && (obj->outline & OUTLINE_TYPE_MASK) != 0 && (obj->outline & OUTLINE_DISABLED) == 0;
-}
-
 // 0x48C2B4 obj_outline_object
 int objectSetOutline(Object* obj, int outlineType, Rect* rect)
 {
@@ -2893,7 +2895,7 @@ int objectSetOutline(Object* obj, int outlineType, Rect* rect)
         return -1;
     }
 
-    if (objectIsOutlined(obj)) {
+    if ((obj->outline & OUTLINE_TYPE_MASK) != 0) {
         return -1;
     }
 

src/object.h

@@ -102,7 +102,6 @@ void _obj_fix_violence_settings(int* fid);
 
 Object* objectTypedFindById(int id, int type);
 bool isExitGridAt(int tile, int elevation);
-bool objectIsOutlined(Object* obj);
 
 // RAII wrapper for Object*.
 class UniqueObject {

src/pipboy.cc

@@ -501,14 +501,13 @@ int pipboyOpen(int intent)
         return 0;
     }
 
+    ScopedGameMode gm(GameMode::kPipboy);
+
     intent = pipboyWindowInit(intent);
     if (intent == -1) {
         return -1;
     }
 
-    ScopedGameMode gm(GameMode::kPipboy);
-    windowRefresh(gPipboyWindow);
-
     touch_set_touchscreen_mode(true);
 
     mouseGetPositionInWindow(gPipboyWindow, &gPipboyPreviousMouseX, &gPipboyPreviousMouseY);

src/settings.cc

@@ -172,8 +172,6 @@ void initSettingsRegistry(bool isMapper)
     SETTING(extend_ap_bar);
     SETTING(expand_barter_window);
     SETTING_P(inventory_columns, clamp(1, 2));
-    SETTING_P(loot_weight_indicator, clamp(0, 2));
-    SETTING_P(loot_container_size_indicator_threshold, clamp(0, 100));
 #undef SECT
 
 #define SECT preferences

src/settings.h

@@ -95,16 +95,6 @@ struct UISettings {
     bool enable_high_resolution_stencil = true;
     // Maximum number of columns in inventory and loot windows
     int inventory_columns = 1;
-
-    // 0 - No indicator, vanilla
-    // 1 - Simple indicator
-    // 2 - Detailed indicator, works with inventory_columns > 1 only
-    int loot_weight_indicator = 1;
-
-    // 0   - Container indicator is always visible
-    // XX  - Container indicator is visible when size reaches XX percent
-    // 100 - Container indicator is visible when fully loaded
-    int loot_container_size_indicator_threshold = 50;
 };
 
 // These are settings handled by preferences UI and saved in save games.

src/sfall_metarules.cc

@@ -958,7 +958,7 @@ static InterfaceWindowLookupResult getInterfaceWindowByType(int winType, int& wi
         window = inventoryGetWindow();
         break;
     case 1:
-        window = gameDialogGetBackgroundWindow();
+        window = gameDialogGetWindow();
         break;
     case 2:
         window = pipboyGetWindow();
@@ -989,6 +989,35 @@ static InterfaceWindowLookupResult getInterfaceWindowByType(int winType, int& wi
     return window != -1 ? InterfaceWindowLookupResult::Found : InterfaceWindowLookupResult::Missing;
 }
 
+static int getCurrentInterfaceWindow()
+{
+    int window = -1;
+    if (GameMode::isInGameMode(GameMode::kInventory)
+        || GameMode::isInGameMode(GameMode::kUseOn)
+        || GameMode::isInGameMode(GameMode::kLoot)
+        || GameMode::isInGameMode(GameMode::kBarter)) {
+        window = inventoryGetWindow();
+    } else if (GameMode::isInGameMode(GameMode::kDialog)) {
+        window = gameDialogGetWindow();
+    } else if (GameMode::isInGameMode(GameMode::kPipboy)) {
+        window = pipboyGetWindow();
+    } else if (GameMode::isInGameMode(GameMode::kWorldmap)) {
+        window = worldmapGetWindow();
+    } else if (GameMode::isInGameMode(GameMode::kEditor)) {
+        window = characterEditorGetWindow();
+    } else if (GameMode::isInGameMode(GameMode::kSkilldex)) {
+        window = skilldexGetWindow();
+    } else if (GameMode::isInGameMode(GameMode::kOptions)) {
+        window = optionsGetWindow();
+    } else if (GameMode::isInGameMode(GameMode::kAutomap)) {
+        window = automapGetWindow();
+    } else if (windowGetWindow(gInterfaceBarWindow) != nullptr) {
+        window = gInterfaceBarWindow;
+    }
+
+    return window;
+}
+
 static bool clampWindowFillRect(int windowWidth, int windowHeight, int& x, int& y, int& width, int& height)
 {
     if (x < 0) {
@@ -1841,10 +1870,10 @@ void mf_set_window_flag(OpcodeContext& ctx)
 
     int windowId = ctx.arg(0).asInt();
     if (windowId <= 0) {
-        windowId = inventoryGetWindow();
+        windowId = getCurrentInterfaceWindow();
     }
 
-    if (windowId == -1 || windowGetWindow(windowId) == nullptr) {
+    if (windowId == -1) {
         return;
     }