Упрощённый синтаксис для звуков и очереди воспроизведения

This commit is contained in:
Victor 2015-05-04 18:15:36 +03:00
parent 8be3028f07
commit 5de73e0f90

View File

@ -404,7 +404,7 @@ public final class Parser {
if (match(TokenType.SOUND)) loop = false; if (match(TokenType.SOUND)) loop = false;
else if (match(TokenType.SOUNDLOOP)) loop = true; else if (match(TokenType.SOUNDLOOP)) loop = true;
final String name = consume(TokenType.WORD).getText(); final String name = consumeMusicName();
final FadeInfo fade = matchFade(); final FadeInfo fade = matchFade();
ViewActivity.getInstance().sound(name, loop, fade); ViewActivity.getInstance().sound(name, loop, fade);
return false; return false;
@ -431,7 +431,7 @@ public final class Parser {
} }
private boolean queueSound() { private boolean queueSound() {
final String name = consume(TokenType.TEXT).getText(); final String name = consumeMusicName();
ViewActivity.getInstance().addSoundToQueue(name); ViewActivity.getInstance().addSoundToQueue(name);
return false; return false;
} }