Skip to content

options menu: rem keybind debug spam #1638

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Azaezel merged 3 commits into from
Dec 26, 2025
Merged

options menu: rem keybind debug spam #1638

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7bca1db
options menu: rem keybind debug spam
Azaezel Dec 25, 2025
d50161d
fix GuiBitmapButtonCtrl setBitmap script command
Azaezel Dec 25, 2025
0e4b08e
roll back _setitmap macro-mirroring. seems there was somethin off there
Azaezel Dec 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Engine/source/gui/buttons/guiBitmapButtonCtrl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -669,4 +669,10 @@ bool GuiBitmapButtonCtrl::pointInControl(const Point2I& parentCoordPoint)
return Parent::pointInControl(parentCoordPoint);
}

DEF_ASSET_BINDS_REFACTOR(GuiBitmapButtonCtrl, Bitmap)
DefineEngineMethod(GuiBitmapButtonCtrl, getBitmap, StringTableEntry, (), , "get name") {
return object->getBitmapFile();
}DefineEngineMethod(GuiBitmapButtonCtrl, getBitmapAsset, StringTableEntry, (), , assetText(Bitmap, asset reference)) {
return object->_getBitmap();
}DefineEngineMethod(GuiBitmapButtonCtrl, setBitmap, void, (const char* assetName), , assetText(Bitmap, assignment.first tries asset then flat file.)) {
object->setBitmap(StringTable->insert(assetName));
}
8 changes: 7 additions & 1 deletion Engine/source/gui/buttons/guiIconButtonCtrl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -464,4 +464,10 @@ void GuiIconButtonCtrl::renderBitmapArray(RectI &bounds, S32 state)
}
}

DEF_ASSET_BINDS_REFACTOR(GuiIconButtonCtrl, Bitmap)
DefineEngineMethod(GuiIconButtonCtrl, getBitmap, StringTableEntry, (), , "get name") {
return object->getBitmapFile();
}DefineEngineMethod(GuiIconButtonCtrl, getBitmapAsset, StringTableEntry, (), , assetText(Bitmap, asset reference)) {
return object->_getBitmap();
}DefineEngineMethod(GuiIconButtonCtrl, setBitmap, void, (const char* assetName), , assetText(Bitmap, assignment.first tries asset then flat file.)) {
object->setBitmap(StringTable->insert(assetName));
}
4 changes: 3 additions & 1 deletion Templates/BaseGame/game/data/DamageModel/DamageModel.module
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
Group="Game"
scriptFile="DamageModel.tscript"
CreateFunction="onCreate"
DestroyFunction="onDestroy">
DestroyFunction="onDestroy"
Group="Game"
Dependencies="UI=1">
<DeclaredAssets
Extension="asset.taml"
Recurse="true"/>
Expand Down
8 changes: 4 additions & 4 deletions Templates/BaseGame/game/data/DamageModel/guis/damageGuiOverlay.gui
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ $guiContent = new GuiContainer(damageGuiOverlay) {
minExtent = "8 8";
horizSizing = "relative";
vertSizing = "relative";
profile = "GuiDefaultProfile";
profile = "GuiModelessDialogProfile";
tooltipProfile = "GuiToolTipProfile";
canSaveDynamicFields = "1";
enabled = "1";
Expand All @@ -25,7 +25,6 @@ $guiContent = new GuiContainer(damageGuiOverlay) {
};
new GuiCrossHairHud(Reticle) {
damageOffset = "0 10";
BitmapAsset = "";
position = "624 344";
extent = "32 32";
minExtent = "8 8";
Expand Down Expand Up @@ -64,6 +63,7 @@ $guiContent = new GuiContainer(damageGuiOverlay) {
};
new GuiBitmapCtrl(previewImage) {
BitmapAsset = "UI:hudfill_image";
BitmapFile = "data/UI/images/hudfill.png";
position = "8 0";
extent = "108 56";
horizSizing = "width";
Expand All @@ -80,7 +80,7 @@ $guiContent = new GuiContainer(damageGuiOverlay) {
extent = "120 16";
minExtent = "8 8";
vertSizing = "top";
profile = "HudTextItalicProfile";
profile = "GuiModelessDialogProfile";
tooltipProfile = "GuiToolTipProfile";
isContainer = "0";
};
Expand All @@ -95,7 +95,7 @@ $guiContent = new GuiContainer(damageGuiOverlay) {
position = "5 645";
extent = "72 72";
vertSizing = "top";
profile = "GuiBigTextProfile";
profile = "GuiModelessDialogProfile";
tooltipProfile = "GuiToolTipProfile";
};
new GuiControl(DamageHUD) {
Expand Down
6 changes: 3 additions & 3 deletions Templates/BaseGame/game/data/UI/guis/optionsMenu.tscript
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1036,7 +1036,7 @@ function OptionsMenu::populateKeybinds(%this,%device, %controlsList) {
if($activeRemapControlSet $= "")
$activeRemapControlSet = getField(%actionMapList, 0);

echo("============================================");
//echo("============================================");

for(%am = 0; %am < getFieldCount(%actionMapList); %am++)
{
Expand Down Expand Up @@ -1064,7 +1064,7 @@ function OptionsMenu::populateKeybinds(%this,%device, %controlsList) {
%keyMap = buildFullMapString( %i, $RemapActionMap[%i], %device );
%description = $RemapDescription[%i];

echo("Added ActionMap Entry: " @ %actionMapName @ " | " @ %device @ " | " @ %keymap @ " | " @ %description);
//echo("Added ActionMap Entry: " @ %actionMapName @ " | " @ %device @ " | " @ %keymap @ " | " @ %description);

%remapEntry = addActionMapEntry(%actionMapName, %device, %keyMap, %i, %description);
%controlsList.add(%remapEntry);
Expand Down Expand Up @@ -1245,7 +1245,7 @@ function addActionMapEntry(%actionMap, %device, %keyMap, %index, %description)
};

%buttonContainer = %entry.findObjectByInternalName("valuesContainer");
echo("Keymap: " @ %keymap @ " | Keymap word count: " @ getWordCount(getField(%keyMap, 1)));
//echo("Keymap: " @ %keymap @ " | Keymap word count: " @ getWordCount(getField(%keyMap, 1)));
if(getWordCount(getField(%keyMap, 1)) == 2)
{
%modifierBtn = new GuiIconButtonCtrl() {
Expand Down
Loading