Skip to content

Commit ef937ef

Browse files
committed
🔨 Test ogg file loading, make time scale less bonkers
1 parent 8235324 commit ef937ef

File tree

3 files changed

+11
-8
lines changed

3 files changed

+11
-8
lines changed

assets/music/custom-beat.ogg

249 KB
Binary file not shown.

assets/music/paniots-nine.wav

-37.2 MB
Binary file not shown.

src/game/main.cpp

+11-8
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ int main(int argc, char *argv[]) {
104104
auto slowDown =
105105
assetManager->load<ste::AudioFile>(ste::getAssetPath("sfx/slowdown.wav"));
106106
auto music = assetManager->load<ste::AudioFile>(
107-
ste::getAssetPath("music/paniots-nine.wav"));
107+
ste::getAssetPath("music/custom-beat.ogg"));
108108

109109
// Enable alpha blending
110110
glEnable(GL_BLEND);
@@ -204,19 +204,22 @@ int main(int argc, char *argv[]) {
204204

205205
switch (event.key.keysym.sym) {
206206
case SDLK_1:
207-
timeScale->targetScale = 0.5f;
208-
audioEngine.setSpeed(0.5f);
209-
audioEngine.playSound(slowDown);
207+
timeScale->targetScale = 0.72f;
208+
audioEngine.setSpeed(0.72f);
209+
if (timeScale->currentScale != 0.72f)
210+
audioEngine.playSound(slowDown);
210211
break;
211212
case SDLK_2:
212213
timeScale->targetScale = 1.0f;
213214
audioEngine.setSpeed(1.0f);
214-
audioEngine.playSound(slowDown);
215+
if (timeScale->currentScale != 1.0f)
216+
audioEngine.playSound(slowDown);
215217
break;
216218
case SDLK_3:
217-
timeScale->targetScale = 2.0f;
218-
audioEngine.setSpeed(2.0f);
219-
audioEngine.playSound(slowDown);
219+
timeScale->targetScale = 1.68f;
220+
audioEngine.setSpeed(1.68f);
221+
if (timeScale->currentScale != 1.68f)
222+
audioEngine.playSound(slowDown);
220223
break;
221224
case SDLK_SPACE:
222225
audioEngine.playSound(realTrapShit);

0 commit comments

Comments
 (0)