4 files changed, 23 insertions, 23 deletions

@@ -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
@@ -22,28 +22,28 @@ void loop(Renderer& renderer) {
   game.emplaceSystem<MessageSystem>();
   game.emplaceSystem<ScriptSystem>();
 
-  auto map = std::make_unique<Map>("../res/map1.tmx", renderer);
+  auto map = std::make_unique<Map>("../res/maps/map1.tmx", renderer);
   game.setMap(std::move(map));
 
   int lucasSprite = game.emplaceSprite();
   game.getSystem<TransformSystem>().initSprite(lucasSprite, {32, 32});
-  game.getSystem<AnimationSystem>().initSprite(lucasSprite, "../res/lucas_anim.txt", renderer);
+  game.getSystem<AnimationSystem>().initSprite(lucasSprite, "../res/sprites/lucas_anim.txt", renderer);
   game.getSprite(lucasSprite).controllable = true;
   game.getSystem<CharacterSystem>().initSprite(lucasSprite);
 
   int kumaSprite = game.emplaceSprite();
   game.getSystem<TransformSystem>().initSprite(kumaSprite, {32, 32});
-  game.getSystem<AnimationSystem>().initSprite(kumaSprite, "../res/kuma_anim.txt", renderer);
+  game.getSystem<AnimationSystem>().initSprite(kumaSprite, "../res/sprites/kuma_anim.txt", renderer);
   game.getSystem<CharacterSystem>().addSpriteToParty(lucasSprite, kumaSprite);
 
   int dusterSprite = game.emplaceSprite();
   game.getSystem<TransformSystem>().initSprite(dusterSprite, {32, 32});
-  game.getSystem<AnimationSystem>().initSprite(dusterSprite, "../res/duster_anim.txt", renderer);
+  game.getSystem<AnimationSystem>().initSprite(dusterSprite, "../res/sprites/duster_anim.txt", renderer);
   game.getSystem<CharacterSystem>().addSpriteToParty(lucasSprite, dusterSprite);
 
   int boneySprite = game.emplaceSprite();
   game.getSystem<TransformSystem>().initSprite(boneySprite, {32, 32});
-  game.getSystem<AnimationSystem>().initSprite(boneySprite, "../res/boney_anim.txt", renderer);
+  game.getSystem<AnimationSystem>().initSprite(boneySprite, "../res/sprites/boney_anim.txt", renderer);
   game.getSystem<CharacterSystem>().addSpriteToParty(lucasSprite, boneySprite);
 
   game.getSystem<CameraSystem>().setFollowingSprite(lucasSprite);
@@ -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");
   }
 }
 
@@ -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");
   }
 }