diff options
| author | Freya Murphy <freya@freyacat.org> | 2025-11-22 01:00:53 -0500 |
|---|---|---|
| committer | Freya Murphy <freya@freyacat.org> | 2025-11-22 01:00:53 -0500 |
| commit | 20dc6941752047a2e94176340a1297304dc7f123 (patch) | |
| tree | 032826be32887e777138fa199025fa0f77670ce1 /graphics/src/audio/parse | |
| parent | audio: fix tempo (off by one, rahhhgit status!) (diff) | |
| download | DungeonCrawl-20dc6941752047a2e94176340a1297304dc7f123.tar.gz DungeonCrawl-20dc6941752047a2e94176340a1297304dc7f123.tar.bz2 DungeonCrawl-20dc6941752047a2e94176340a1297304dc7f123.zip | |
audio: change tempo -> pause_len
Diffstat (limited to 'graphics/src/audio/parse')
| -rw-r--r-- | graphics/src/audio/parse/lex.rs | 6 | ||||
| -rw-r--r-- | graphics/src/audio/parse/parser.rs | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/graphics/src/audio/parse/lex.rs b/graphics/src/audio/parse/lex.rs index a349c53..9969c9e 100644 --- a/graphics/src/audio/parse/lex.rs +++ b/graphics/src/audio/parse/lex.rs @@ -12,8 +12,8 @@ pub enum Token { Eof, LineSeparator, Pause(usize), + PauseLen(u32), Jump(usize), - Tempo(u32), ChanSpec(ChanSpec), SetVolume(u8), SetPitch(u8), @@ -179,8 +179,8 @@ impl<'s> Lexer<'s> { '-' => self.next_pause()?, // jump 'j' => T::Jump(self.next_int()?), - // tempO - 'o' => T::Tempo(self.next_int()?), + // pause len + 'P' => T::PauseLen(self.next_int()?), // eof '\0' => T::Eof, // new line diff --git a/graphics/src/audio/parse/parser.rs b/graphics/src/audio/parse/parser.rs index 23ba8a4..5157fa1 100644 --- a/graphics/src/audio/parse/parser.rs +++ b/graphics/src/audio/parse/parser.rs @@ -87,9 +87,9 @@ impl<'s> Parser<'s> { self.next()?; prog.push(Instruction::Jump(pc)); } - Token::Tempo(tempo) => { + Token::PauseLen(pause_len) => { self.next()?; - prog.push(Instruction::Tempo(tempo)); + prog.push(Instruction::PauseLen(pause_len)); } _ => self.parse_line(&mut prog)?, } |