fix even more openmpt errors at startup X)

remove those startup errors and smoler fixes
goddamn my dumbass made the musicsystem restart at gamestart

src/doomdef.h

@@ -149,8 +149,8 @@ extern char  logfilename[1024];
 #else
 #define VERSION    1 // Game version
 #define SUBVERSION 6 // more precise version number
-#define VERSIONSTRING "Saturn v1 "
-#define VERSIONSTRINGW L"Saturn v1"
+#define VERSIONSTRING "Saturn v1.1 "
+#define VERSIONSTRINGW L"Saturn v1.1"
 // Hey! If you change this, add 1 to the MODVERSION below! Otherwise we can't force updates!
 // And change CMakeLists.txt (not src/, but in root), for CMake users!
 // AND appveyor.yml, for the build bots!

src/s_sound.c

@@ -154,7 +154,7 @@ consvar_t cv_amigafilter = {"amigafilter", "1", CV_SAVE|CV_CALL, amigafilter_con
 
 #if OPENMPT_API_VERSION_MAJOR < 1 && OPENMPT_API_VERSION_MINOR > 4
 static CV_PossibleValue_t amigatype_cons_t[] = {{0, "auto"}, {1, "a500"}, {2, "a1200"}, {0, NULL}};
-consvar_t cv_amigatype = {"amigatype", "0", CV_SAVE|CV_CALL, amigatype_cons_t, AmigaType_OnChange, 0, NULL, NULL, 0, 0, NULL};
+consvar_t cv_amigatype = {"amigatype", "0", CV_SAVE|CV_CALL|CV_NOINIT, amigatype_cons_t, AmigaType_OnChange, 0, NULL, NULL, 0, 0, NULL};
 #endif
 
 #endif
@@ -2257,9 +2257,10 @@ void AmigaFilter_OnChange(void)
 void AmigaType_OnChange(void)
 {
 	if (openmpt_mhandle)
-		openmpt_module_ctl_set_text(openmpt_mhandle, "render.resampler.emulate_amiga", cv_amigatype.string);
+		openmpt_module_ctl_set_text(openmpt_mhandle, "render.resampler.emulate_amiga_type", cv_amigatype.string);
 
-	S_RestartMusic(); //need to restart the music system or else it wont work
+	if (sound_started)
+        S_RestartMusic(); //need to restart the music system or else it wont work
 }
 #endif
 #endif

src/sdl/mixer_sound.c

@@ -121,12 +121,11 @@ static UINT16 current_track;
 #endif
 
 #ifdef HAVE_OPENMPT
-static openmpt_module *mod = 0;
-int mod_err = OPENMPT_ERROR_OK;
+static int mod_err = OPENMPT_ERROR_OK;
 static const char *mod_err_str;
 static UINT16 current_subsong;
-size_t probesize;
-int result;
+static size_t probesize;
+static int result;
 #endif
 
 static void var_cleanup(void)
@@ -1137,7 +1136,7 @@ boolean I_LoadSong(char *data, size_t len)
 
 #ifdef HAVE_OPENMPT
 	/*
-		If the size of the data to be checked is bigger than the recommended size (> 2048)
+		If the size of the data to be checked is bigger than the recommended size (> 2048 bytes)
 		Let's just set the probe size to the recommended size
 		Otherwise let's give it the full data size
 	*/
@@ -1421,6 +1420,8 @@ boolean I_SetSongTrack(int track)
 		return false;
 	}
 #endif
+	if (I_SongType() == MU_MOD)
+		return !Mix_SetMusicPosition(track);
 	(void)track;
 	return false;
 }