diff --git a/src/engine/defines.h b/src/engine/defines.h index 13583712..17b23beb 100644 --- a/src/engine/defines.h +++ b/src/engine/defines.h @@ -33,6 +33,6 @@ // sample related #define DIV_MAX_SAMPLE_TYPE 4 -typedef unsigned char ORDERTYPE; +typedef unsigned char PatternOrder; #endif diff --git a/src/engine/orders.h b/src/engine/orders.h index baf20101..3bb34e49 100644 --- a/src/engine/orders.h +++ b/src/engine/orders.h @@ -21,7 +21,7 @@ #define _ORDERS_H struct DivOrders { - ORDERTYPE ord[DIV_MAX_CHANS][DIV_MAX_PATTERNS]; + PatternOrder ord[DIV_MAX_CHANS][DIV_MAX_PATTERNS]; DivOrders() { memset(ord,0,DIV_MAX_CHANS*DIV_MAX_PATTERNS); diff --git a/src/gui/orders.cpp b/src/gui/orders.cpp index 0b6b6de8..6a5338f1 100644 --- a/src/gui/orders.cpp +++ b/src/gui/orders.cpp @@ -177,10 +177,10 @@ void FurnaceGUI::drawOrders() { e->lockSave([this,i,j]() { if (changeAllOrders) { for (int k=0; kgetTotalChannelCount(); k++) { - if (e->curOrders->ord[k][i]<(ORDERTYPE)(DIV_MAX_PATTERNS-1)) e->curOrders->ord[k][i]++; + if (e->curOrders->ord[k][i]<(PatternOrder)(DIV_MAX_PATTERNS-1)) e->curOrders->ord[k][i]++; } } else { - if (e->curOrders->ord[j][i]<(ORDERTYPE)(DIV_MAX_PATTERNS-1)) e->curOrders->ord[j][i]++; + if (e->curOrders->ord[j][i]<(PatternOrder)(DIV_MAX_PATTERNS-1)) e->curOrders->ord[j][i]++; } }); e->walkSong(loopOrder,loopRow,loopEnd);