Skip to content
Snippets Groups Projects
Commit a41e6836 authored by mazmazz's avatar mazmazz
Browse files

Merge branch 'openmpt-deprecated-fix' into 'master'

Fix OPENMPT deprecation error, openmpt_module_ctl_set

See merge request STJr/SRB2!990
parents d2fefb6b a5f7f9a5
No related branches found
No related tags found
No related merge requests found
...@@ -880,13 +880,18 @@ boolean I_SetSongSpeed(float speed) ...@@ -880,13 +880,18 @@ boolean I_SetSongSpeed(float speed)
#ifdef HAVE_OPENMPT #ifdef HAVE_OPENMPT
if (openmpt_mhandle) if (openmpt_mhandle)
{ {
char modspd[13];
if (speed > 4.0f) if (speed > 4.0f)
speed = 4.0f; // Limit this to 4x to prevent crashing, stupid fix but... ~SteelT 27/9/19 speed = 4.0f; // Limit this to 4x to prevent crashing, stupid fix but... ~SteelT 27/9/19
#if OPENMPT_API_VERSION_MAJOR < 1 && OPENMPT_API_VERSION_MINOR < 5
sprintf(modspd, "%g", speed); {
openmpt_module_ctl_set(openmpt_mhandle, "play.tempo_factor", modspd); // deprecated in 0.5.0
char modspd[13];
sprintf(modspd, "%g", speed);
openmpt_module_ctl_set(openmpt_mhandle, "play.tempo_factor", modspd);
}
#else
openmpt_module_ctl_set_floatingpoint(openmpt_mhandle, "play.tempo_factor", (double)speed);
#endif
return true; return true;
} }
#else #else
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment