From 51e00b2d86617ce346171a7fea90dcf24d0660a2 Mon Sep 17 00:00:00 2001
From: sukibaby <163092272+sukibaby@users.noreply.github.com>
Date: Wed, 10 Jul 2024 02:54:56 -0700
Subject: [PATCH] Remove macro from TimingData::GetBeatInternal

---
 src/TimingData.cpp | 23 +++++++++++------------
 1 file changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/TimingData.cpp b/src/TimingData.cpp
index 13a878541d..2a57ced921 100644
--- a/src/TimingData.cpp
+++ b/src/TimingData.cpp
@@ -809,21 +809,17 @@ void TimingData::GetBeatInternal(GetBeatStarts& start, GetBeatArgs& args,
 	unsigned int curr_segment= start.bpm+start.warp+start.stop+start.delay;
 
 	float bps= GetBPMAtRow(start.last_row) / 60.0f;
-#define INC_INDEX(index) ++curr_segment; ++index;
-
 	while(curr_segment < max_segment)
 	{
 		int event_row= INT_MAX;
 		int event_type= NOT_FOUND;
-		FindEvent(event_row, event_type, start, 0, false, bpms, warps, stops,
-			delays);
+		FindEvent(event_row, event_type, start, 0, false, bpms, warps, stops, delays);
 		if(event_type == NOT_FOUND)
 		{
 			break;
 		}
-		float time_to_next_event= start.is_warping ? 0 :
-			NoteRowToBeat(event_row - start.last_row) / bps;
-		float next_event_time= start.last_time + time_to_next_event;
+		float time_to_next_event = start.is_warping ? 0 : NoteRowToBeat(event_row - start.last_row) / bps;
+		float next_event_time = start.last_time + time_to_next_event;
 		if(args.elapsed_time < next_event_time)
 		{
 			break;
@@ -836,7 +832,8 @@ void TimingData::GetBeatInternal(GetBeatStarts& start, GetBeatArgs& args,
 				break;
 			case FOUND_BPM_CHANGE:
 				bps= ToBPM(bpms[start.bpm])->GetBPS();
-				INC_INDEX(start.bpm);
+				++start.bpm;
+				++curr_segment;
 				break;
 			case FOUND_DELAY:
 			case FOUND_STOP_DELAY:
@@ -853,7 +850,8 @@ void TimingData::GetBeatInternal(GetBeatStarts& start, GetBeatArgs& args,
 						return;
 					}
 					start.last_time= next_event_time;
-					INC_INDEX(start.delay);
+					++start.delay;
+					++curr_segment;
 					if(event_type == FOUND_DELAY)
 					{
 						break;
@@ -874,7 +872,8 @@ void TimingData::GetBeatInternal(GetBeatStarts& start, GetBeatArgs& args,
 						return;
 					}
 					start.last_time= next_event_time;
-					INC_INDEX(start.stop);
+					++start.stop;
+					++curr_segment;
 					break;
 				}
 			case FOUND_WARP:
@@ -888,13 +887,13 @@ void TimingData::GetBeatInternal(GetBeatStarts& start, GetBeatArgs& args,
 					}
 					args.warp_begin_out= event_row;
 					args.warp_dest_out= start.warp_destination;
-					INC_INDEX(start.warp);
+					++start.warp;
+					++curr_segment;
 					break;
 				}
 		}
 		start.last_row= event_row;
 	}
-#undef INC_INDEX
 	if(args.elapsed_time == FLT_MAX)
 	{
 		args.elapsed_time= start.last_time;