From b153f393293b77c164d6407f65dae98e5bab4ac6 Mon Sep 17 00:00:00 2001 From: MaikelChan Date: Sun, 26 Dec 2021 02:38:43 +0100 Subject: [PATCH] Skip the PC CD-Rom info screens. --- .vscode/tasks.json | 2 +- PlumbersDontWearTies/Game.cpp | 4 ++-- PlumbersDontWearTies/Game.h | 1 + 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index 5ba7f07..ab2ca6d 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -25,7 +25,7 @@ "WIILOAD": "tcp:192.168.1.16" } }, - "command": "wiiload PlumbersDontWearTies.dol", + "command": "wiiload PlumbersDontWearTies-SDL.dol", "group": "build", "problemMatcher": [] } diff --git a/PlumbersDontWearTies/Game.cpp b/PlumbersDontWearTies/Game.cpp index 7e93e53..8e2f559 100644 --- a/PlumbersDontWearTies/Game.cpp +++ b/PlumbersDontWearTies/Game.cpp @@ -89,7 +89,7 @@ void Game::Start() return; currentGameState = GameStates::BeginScene; - currentSceneIndex = 0; + currentSceneIndex = 1; // Skip the PC CD-Rom info screens lastDecisionSceneIndex = 0; currentPictureIndex = 0; currentDecisionIndex = -1; @@ -103,7 +103,7 @@ void Game::Start() desiredAudioSpec.freq = WAV_FREQUENCY; desiredAudioSpec.format = AUDIO_S16; desiredAudioSpec.channels = WAV_CHANNELS; - desiredAudioSpec.samples = 256; + desiredAudioSpec.samples = WAV_SAMPLES; desiredAudioSpec.callback = AudioCallback; if (SDL_OpenAudio(&desiredAudioSpec, &obtainedAudioSpec) < 0) diff --git a/PlumbersDontWearTies/Game.h b/PlumbersDontWearTies/Game.h index b0996dc..fff0aef 100644 --- a/PlumbersDontWearTies/Game.h +++ b/PlumbersDontWearTies/Game.h @@ -13,6 +13,7 @@ #define WAV_FREQUENCY 11025 // Hz #define WAV_FORMAT 2 // 2 bytes, 16 bits #define WAV_CHANNELS 2 // Stereo +#define WAV_SAMPLES 1024 // SDL Wii always ignores this and sets it to 1152 // TODO: Does audio data in a WAV always start in the same offset?