williamjcm/MassBuilderSaveTool
williamjcm/MassBuilderSaveTool
1
0
Fork 0
Code Issues 15 Pull requests Releases 21 Wiki Activity

1.5: Fuckin' UE5... #38

Manually merged
williamjcm merged 126 commits from one-point-five into master 2024-07-22 11:06:13 +02:00
Conversation 0 Commits 126 Files changed 199 +4 -6
1 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit f9aa4bc817 - Show all commits

10
src/SaveTool/SaveTool_MassViewer_Weapons.cpp
View file

@ -28,7 +28,7 @@ SaveTool::drawWeapons() {
return; return;
} }
const float footer_height_to_reserve = ImGui::GetStyle().ItemSpacing.y + ImGui::GetFrameHeightWithSpacing(); const float footer_height_to_reserve = ImGui::GetFrameHeightWithSpacing();
ImGui::BeginGroup(); ImGui::BeginGroup();
@ -51,13 +51,11 @@ SaveTool::drawWeapons() {
ImGui::EndTable(); ImGui::EndTable();
ImGui::Separator();
bool dirty = _meleeDirty || _shieldsDirty || _bShootersDirty || _eShootersDirty || _bLaunchersDirty || _eLaunchersDirty; bool dirty = _meleeDirty || _shieldsDirty || _bShootersDirty || _eShootersDirty || _bLaunchersDirty || _eLaunchersDirty;
ImGui::BeginDisabled(!dirty); ImGui::BeginDisabled(!dirty);
if(drawUnsafeWidget([]{ return ImGui::Button(ICON_FA_SAVE " Save"); })) { if(drawUnsafeWidget([]{ return ImGui::Button(ICON_FA_SAVE " Save order"); })) {
if(_meleeDirty) { if(_meleeDirty) {
_modifiedBySaveTool = true; _modifiedBySaveTool = true;
if(!_currentMass->writeMeleeWeapons()) { if(!_currentMass->writeMeleeWeapons()) {
@ -158,6 +156,8 @@ SaveTool::drawWeapons() {
ImGui::EndGroup(); ImGui::EndGroup();
ImGui::SameLine();
ImGui::SeparatorEx(ImGuiSeparatorFlags_Vertical);
ImGui::SameLine(); ImGui::SameLine();
if(!_currentWeapon) { if(!_currentWeapon) {
@ -176,8 +176,6 @@ SaveTool::drawWeapons() {
ImGui::EndChild(); ImGui::EndChild();
ImGui::Separator();
if(drawUnsafeWidget([](){ return ImGui::Button(ICON_FA_SAVE " Save changes to weapon category"); })) { if(drawUnsafeWidget([](){ return ImGui::Button(ICON_FA_SAVE " Save changes to weapon category"); })) {
_modifiedBySaveTool = true; _modifiedBySaveTool = true;
switch(_currentWeapon->type) { switch(_currentWeapon->type) {