Merge branch 'master' into android

This commit is contained in:
Reece H. Dunn
2013-05-03 16:28:25 +01:00
19 changed files with 253 additions and 114 deletions
+2 -1
View File
@@ -903,7 +903,8 @@ voice_t *LoadVoice(const char *vname, int control)
case V_OPTION:
value2 = 0;
if((sscanf(p,"%s %d %d",option_name,&value,&value2) >= 2) && ((ix = LookupMnem(options_tab, option_name)) >= 0))
if(((sscanf(p,"%s %d %d",option_name,&value,&value2) >= 2) && ((ix = LookupMnem(options_tab, option_name)) >= 0)) ||
((sscanf(p,"%d %d %d",&ix,&value,&value2) >= 2) && (ix < N_LOPTS)))
{
langopts->param[ix] = value;
langopts->param2[ix] = value2;