Merge relocators

src/commands.cpp

@@ -946,13 +946,14 @@ void patterncommands()
         {
           song.pattern[epnum[epchn]][eppos*4] = newbyte;
         }
-      }
-      if (recordmode && (autoadvance < 1))
-      {
-        eppos++;
-        if (eppos > getPattlen(epnum[epchn]))
+
+        if (autoadvance < 1)
         {
-          eppos = 0;
+          eppos++;
+          if (eppos > getPattlen(epnum[epchn]))
+          {
+            eppos = 0;
+          }
         }
       }
     }

src/help.cpp

@@ -323,7 +323,7 @@ void onlinehelp(int standalone, int context)
       left = printrows(0 + offsetX,left,color_normal, tables);
       left++;
     } else {
-      switch(editmode) {
+      switch (editmode) {
       case EDIT_PATTERN:
         printtext(0 + offsetX,left++, color_header, "PATTERN EDIT MODE");
         left = printrows(0 + offsetX,left,color_normal, patternkeys);
@@ -360,7 +360,7 @@ void onlinehelp(int standalone, int context)
       }
     }
 
-    if(!lastrow) lastrow=left;
+    if (!lastrow) lastrow=left;
 
     printblank(0, 0, MAX_COLUMNS);
     printbg(0, 0, colors.CHDRBG, MAX_COLUMNS);

src/loadtrk.cpp

@@ -1007,14 +1007,7 @@ void mousecommands()
         save();
       if ((input.mousex >= 49) && (input.mousex <= 57))
       {
-        if (config.numsids == 1)
-        {
-          relocator(loadedsongfilename);
-        }
-        else if (config.numsids == 2)
-        {
-          relocator_stereo(loadedsongfilename);
-        }
+        relocator(loadedsongfilename);
       }
       if ((input.mousex >= 59) && (input.mousex <= 64))
         onlinehelp(0,0);
@@ -1220,14 +1213,7 @@ void generalcommands()
     case KEY_F9:
     if (!input.shiftpressed)
     {
-        if (config.numsids == 1)
-        {
-          relocator(loadedsongfilename);
-        }
-        else if (config.numsids == 2)
-        {
-          relocator_stereo(loadedsongfilename);
-        }
+        relocator(loadedsongfilename);
     }
     else if (input.shiftpressed && (config.numsids == 2))
     {