From 4d26b7cfd73cef00a7295e3ec9bf021506f0838c Mon Sep 17 00:00:00 2001 From: Kelly Rauchenberger Date: Fri, 5 Feb 2021 20:31:13 -0500 Subject: Organised resources folder --- src/character_system.cpp | 2 +- src/main.cpp | 10 +++++----- src/message_system.cpp | 12 ++++++------ src/step_type.h | 22 +++++++++++----------- 4 files changed, 23 insertions(+), 23 deletions(-) (limited to 'src') diff --git a/src/character_system.cpp b/src/character_system.cpp index 2f26aee..4d2d338 100644 --- a/src/character_system.cpp +++ b/src/character_system.cpp @@ -123,7 +123,7 @@ void CharacterSystem::tick(double dt) { if (blocked && sprite.characterState == CharacterState::Running) { stopRunning(spriteId); - game_.getMixer().playSound("../res/bump.wav"); + game_.getMixer().playSound("../res/sfx/bump.wav"); } // Move everything diff --git a/src/main.cpp b/src/main.cpp index 8f23881..4c560c7 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -22,28 +22,28 @@ void loop(Renderer& renderer) { game.emplaceSystem(); game.emplaceSystem(); - auto map = std::make_unique("../res/map1.tmx", renderer); + auto map = std::make_unique("../res/maps/map1.tmx", renderer); game.setMap(std::move(map)); int lucasSprite = game.emplaceSprite(); game.getSystem().initSprite(lucasSprite, {32, 32}); - game.getSystem().initSprite(lucasSprite, "../res/lucas_anim.txt", renderer); + game.getSystem().initSprite(lucasSprite, "../res/sprites/lucas_anim.txt", renderer); game.getSprite(lucasSprite).controllable = true; game.getSystem().initSprite(lucasSprite); int kumaSprite = game.emplaceSprite(); game.getSystem().initSprite(kumaSprite, {32, 32}); - game.getSystem().initSprite(kumaSprite, "../res/kuma_anim.txt", renderer); + game.getSystem().initSprite(kumaSprite, "../res/sprites/kuma_anim.txt", renderer); game.getSystem().addSpriteToParty(lucasSprite, kumaSprite); int dusterSprite = game.emplaceSprite(); game.getSystem().initSprite(dusterSprite, {32, 32}); - game.getSystem().initSprite(dusterSprite, "../res/duster_anim.txt", renderer); + game.getSystem().initSprite(dusterSprite, "../res/sprites/duster_anim.txt", renderer); game.getSystem().addSpriteToParty(lucasSprite, dusterSprite); int boneySprite = game.emplaceSprite(); game.getSystem().initSprite(boneySprite, {32, 32}); - game.getSystem().initSprite(boneySprite, "../res/boney_anim.txt", renderer); + game.getSystem().initSprite(boneySprite, "../res/sprites/boney_anim.txt", renderer); game.getSystem().addSpriteToParty(lucasSprite, boneySprite); game.getSystem().setFollowingSprite(lucasSprite); diff --git a/src/message_system.cpp b/src/message_system.cpp index 67c840e..4a31a69 100644 --- a/src/message_system.cpp +++ b/src/message_system.cpp @@ -27,15 +27,15 @@ void MessageSystem::tick(double dt) { // Every so often play a beep. if (line.charsRevealed % CHARS_PER_BEEP == 0) { if (speaker_ == SpeakerType::Man) { - game_.getMixer().playSound("../res/speaking_man.wav"); + game_.getMixer().playSound("../res/sfx/speaking_man.wav"); } else if (speaker_ == SpeakerType::Woman) { - game_.getMixer().playSound("../res/speaking_woman.wav"); + game_.getMixer().playSound("../res/sfx/speaking_woman.wav"); } else if (speaker_ == SpeakerType::Boy) { - game_.getMixer().playSound("../res/speaking_boy.wav"); + game_.getMixer().playSound("../res/sfx/speaking_boy.wav"); } else if (speaker_ == SpeakerType::Girl) { - game_.getMixer().playSound("../res/speaking_girl.wav"); + game_.getMixer().playSound("../res/sfx/speaking_girl.wav"); } else if (speaker_ == SpeakerType::Nonhuman) { - game_.getMixer().playSound("../res/speaking_nonhuman.wav"); + game_.getMixer().playSound("../res/sfx/speaking_nonhuman.wav"); } } @@ -198,7 +198,7 @@ void MessageSystem::advanceText() { if (lines_.empty()) { linesToShow_.clear(); } else { - game_.getMixer().playSound("../res/pageflip.wav"); + game_.getMixer().playSound("../res/sfx/pageflip.wav"); } } diff --git a/src/step_type.h b/src/step_type.h index c38d6f9..a961a8f 100644 --- a/src/step_type.h +++ b/src/step_type.h @@ -36,17 +36,17 @@ inline StepType stepTypeFromString(std::string_view str) { inline std::string_view runningSfxForStepType(StepType step) { switch (step) { - case StepType::wood: return "../res/running_wood.wav"; - case StepType::land_light: return "../res/running_land_light.wav"; - case StepType::land: return "../res/running_land.wav"; - case StepType::sand: return "../res/running_sand.wav"; - case StepType::water: return "../res/running_water.wav"; - case StepType::mechanical: return "../res/running_mechanical.wav"; - case StepType::grass: return "../res/running_grass.wav"; - case StepType::unknown: return "../res/running_unknown.wav"; - case StepType::paved: return "../res/running_paved.wav"; - case StepType::carpet: return "../res/running_carpet.wav"; - case StepType::weak_wood: return "../res/running_weak_wood.wav"; + case StepType::wood: return "../res/sfx/running_wood.wav"; + case StepType::land_light: return "../res/sfx/running_land_light.wav"; + case StepType::land: return "../res/sfx/running_land.wav"; + case StepType::sand: return "../res/sfx/running_sand.wav"; + case StepType::water: return "../res/sfx/running_water.wav"; + case StepType::mechanical: return "../res/sfx/running_mechanical.wav"; + case StepType::grass: return "../res/sfx/running_grass.wav"; + case StepType::unknown: return "../res/sfx/running_unknown.wav"; + case StepType::paved: return "../res/sfx/running_paved.wav"; + case StepType::carpet: return "../res/sfx/running_carpet.wav"; + case StepType::weak_wood: return "../res/sfx/running_weak_wood.wav"; case StepType::none: throw std::invalid_argument("No running sfx for none step type"); } } -- cgit 1.4.1