actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Remove ERASE_SEG macro from TimingData.cpp

Browse Source
This commit is contained in:
sukibaby
2024-08-06 15:37:24 -07:00
committed by teejusb
parent 091b762f79
commit d53d1b113b
1 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/TimingData.cpp
+14 -4
View File
@@ -278,7 +278,6 @@ void TimingData::ShiftRange(int start_row, int end_row,
segs[i]->SetRow(dest_row); segs[i]->SetRow(dest_row);
} }
} }
#define ERASE_SEG(s) if(segs.size() > 1) { EraseSegment(segs, s, segs[s]); --i; --last_affected; erased= true; }
for(std::size_t i= first_affected; i <= static_cast<std::size_t>(last_affected) && i < segs.size(); ++i) for(std::size_t i= first_affected; i <= static_cast<std::size_t>(last_affected) && i < segs.size(); ++i)
{ {
bool erased= false; bool erased= false;
@@ -290,7 +289,13 @@ void TimingData::ShiftRange(int start_row, int end_row,
// segments that were run over. -Kyz // segments that were run over. -Kyz
while(seg_row >= next_row && seg_row < start_row) while(seg_row >= next_row && seg_row < start_row)
{ {
ERASE_SEG(i); if(segs.size() > 1)
{
EraseSegment(segs, i, segs[i]);
--i;
--last_affected;
erased = true;
}
if(i < segs.size()) if(i < segs.size())
{ {
seg_row= segs[i]->GetRow(); seg_row= segs[i]->GetRow();
@@ -306,11 +311,16 @@ void TimingData::ShiftRange(int start_row, int end_row,
int prev_row= segs[i-1]->GetRow(); int prev_row= segs[i-1]->GetRow();
if(prev_row >= seg_row) if(prev_row >= seg_row)
{ {
ERASE_SEG(i); if(segs.size() > 1)
{
EraseSegment(segs, i, segs[i]);
--i;
--last_affected;
erased = true;
}
} }
} }
} }
#undef ERASE_SEG
} }
} }
} }