williamjcm/MassBuilderSaveTool
williamjcm/MassBuilderSaveTool
1
0
Fork 0
Code Issues 16 Pull requests Releases 18 Wiki Activity

Build viewer/editor #13

Manually merged
williamjcm merged 128 commits from mass-viewer into master 2022-03-02 14:50:10 +01:00
Conversation 1 Commits 128 Files changed 125 +53 -43
1 changed files with 53 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 940fe3feee - Show all commits

10
src/SaveTool/SaveTool_MassViewer.cpp
View file

@ -651,13 +651,19 @@ void SaveTool::drawWeapons() {
} \ } \
if(ImGui::BeginDragDropSource()) { \ if(ImGui::BeginDragDropSource()) { \
ImGui::SetDragDropPayload(payload_type, &i, sizeof(UnsignedInt)); \ ImGui::SetDragDropPayload(payload_type, &i, sizeof(UnsignedInt)); \
if(ImGui::GetIO().KeyCtrl) { \
ImGui::Text(payload_tooltip " %i - %s (copy)", i + 1, weapon.name.c_str()); \
} \
else { \
ImGui::Text(payload_tooltip " %i - %s", i + 1, weapon.name.c_str()); \ ImGui::Text(payload_tooltip " %i - %s", i + 1, weapon.name.c_str()); \
} \
ImGui::EndDragDropSource(); \ ImGui::EndDragDropSource(); \
} \ } \
if(ImGui::BeginDragDropTarget()) { \ if(ImGui::BeginDragDropTarget()) { \
if(const ImGuiPayload* payload = ImGui::AcceptDragDropPayload(payload_type)) { \ if(const ImGuiPayload* payload = ImGui::AcceptDragDropPayload(payload_type)) { \
int index = *static_cast<int*>(payload->Data); \ int index = *static_cast<int*>(payload->Data); \
\ \
if(!ImGui::GetIO().KeyCtrl) { \
if(current_weapon == &_currentMass->array()[index]) { \ if(current_weapon == &_currentMass->array()[index]) { \
current_weapon = &_currentMass->array()[i]; \ current_weapon = &_currentMass->array()[i]; \
} \ } \
@ -666,6 +672,10 @@ void SaveTool::drawWeapons() {
} \ } \
\ \
std::swap(_currentMass->array()[index], _currentMass->array()[i]); \ std::swap(_currentMass->array()[index], _currentMass->array()[i]); \
} \
else { \
_currentMass->array()[i] = _currentMass->array()[index]; \
} \
(dirty) = true; \ (dirty) = true; \
} \ } \
\ \