12 files changed, 142 insertions, 5 deletions

@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="48" height="32" tilewidth="16" tileheight="16" infinite="0" nextlayerid="2" nextobjectid="1">
+ <properties>
+  <property name="music" value="red_green_yellow_yellow"/>
+ </properties>
  <tileset firstgid="1" source="hallucination.tsx"/>
  <layer id="1" name="Lower" width="48" height="32">
   <data encoding="csv">
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="48" height="48" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="5">
+ <properties>
+  <property name="music" value="red_green_yellow_yellow"/>
+ </properties>
  <tileset firstgid="1" source="hallucination.tsx"/>
  <layer id="2" name="Background" width="48" height="48">
   <data encoding="csv">
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="32" height="16" tilewidth="16" tileheight="16" infinite="0" nextlayerid="3" nextobjectid="5">
+ <properties>
+  <property name="music" value="red_green_yellow_yellow"/>
+ </properties>
  <tileset firstgid="1" source="hallucination.tsx"/>
  <layer id="2" name="Lower" width="32" height="16">
   <data encoding="csv">
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map version="1.4" tiledversion="1.4.3" orientation="orthogonal" renderorder="right-down" width="64" height="64" tilewidth="16" tileheight="16" infinite="0" nextlayerid="2" nextobjectid="3">
+ <properties>
+  <property name="music" value="red_green_yellow_yellow"/>
+ </properties>
  <tileset firstgid="1" source="hallucination.tsx"/>
  <layer id="1" name="Lower" width="64" height="64">
   <data encoding="csv">
@@ -260,7 +260,13 @@ function ChangeMap(map, warp, options)
     FadeToBlack(150)
   end
   loadMap(map)
-  character():transplantParty(playerId, getWarpPoint(warp), direction)
+  character():transplantParty(playerId, getMap():getWarpPoint(warp), direction)
+
+  if (mixer():isPlayingMusic() and not getMap():hasMusic()) then
+    mixer():fadeoutMusic(150)
+  elseif (getMap():hasMusic() and (not mixer():isPlayingMusic() or not mixer():getPlayingTrack() == getMap():getMusic())) then
+    mixer():playMusic(getMap():getMusic(), 150)
+  end
 
   coroutine.yield()
   if (options & ChangeMapOptions.DO_NOT_FADE == 0) then
@@ -70,6 +70,10 @@ void loop(Renderer& renderer, std::mt19937& rng) {
 
   renderer.render(game);
 
+  if (game.getMap().hasMusic()) {
+    game.getMixer().playMusic(game.getMap().getMusic());
+  }
+
   size_t lastTime = SDL_GetTicks();
 
   while (!game.shouldQuit()) {
@@ -153,6 +153,12 @@ Map::Map(std::string_view name) : name_(name) {
       }
     }
   }
+
+  for (const tmx::Property& property : mapfile.getProperties()) {
+    if (property.getName() == "music") {
+      music_ = property.getStringValue();
+    }
+  }
 }
 
 bool Map::isBlocked(int x, int y) const {
@@ -77,6 +77,10 @@ public:
 
   const Zone& getZone(const std::string& name) const { return zones_.at(name); }
 
+  bool hasMusic() const { return !music_.empty(); }
+
+  const std::string& getMusic() const { return music_; }
+
 private:
 
   std::string name_;
@@ -90,6 +94,7 @@ private:
   std::map<std::string, vec2i> warpPoints_;
   std::vector<Trigger> triggers_;
   std::map<std::string, Zone> zones_;
+  std::string music_;
 };
 
 #endif /* end of include guard: MAP_H_D95D6D47 */
@@ -23,6 +23,49 @@ void Mixer::stopChannel(int channel) {
   Mix_HaltChannel(channel);
 }
 
+void Mixer::playMusic(std::string_view name, int ms) {
+  Mix_Music* song = getMusicByName(name);
+  int ret;
+
+  if (ms == 0) {
+    ret = Mix_PlayMusic(song, -1);
+  } else {
+    ret = Mix_FadeInMusic(song, -1, ms);
+  }
+
+  if (ret == -1) {
+    throw mix_error();
+  }
+
+  playingTrack_ = name;
+}
+
+void Mixer::fadeoutMusic(int ms) {
+  if (Mix_FadeOutMusic(ms) == 0) {
+    throw mix_error();
+  }
+
+  playingTrack_ = "";
+}
+
+void Mixer::muteMusic() {
+  Mix_VolumeMusic(0);
+  musicMuted_ = true;
+}
+
+void Mixer::unmuteMusic() {
+  Mix_VolumeMusic(musicVolume_);
+  musicMuted_ = false;
+}
+
+void Mixer::pauseMusic() {
+  Mix_PauseMusic();
+}
+
+void Mixer::unpauseMusic() {
+  Mix_ResumeMusic();
+}
+
 Mix_Chunk* Mixer::getChunkByFilename(std::string filename) {
   if (!sounds_.count(filename)) {
     Mix_Chunk* sample = Mix_LoadWAV(filename.c_str());
@@ -35,3 +78,18 @@ Mix_Chunk* Mixer::getChunkByFilename(std::string filename) {
 
   return sounds_[filename].get();
 }
+
+Mix_Music* Mixer::getMusicByName(std::string_view name) {
+  std::string filename = "../res/music/" + std::string(name) + ".wav";
+
+  if (!music_.count(filename)) {
+    Mix_Music* song = Mix_LoadMUS(filename.c_str());
+    if (!song) {
+      throw mix_error();
+    }
+
+    music_[filename] = music_ptr(song);
+  }
+
+  return music_[filename].get();
+}
@@ -52,6 +52,16 @@ public:
 
 using chunk_ptr = std::unique_ptr<Mix_Chunk, chunk_deleter>;
 
+class music_deleter {
+public:
+
+  void operator()(Mix_Music* music) {
+    Mix_FreeMusic(music);
+  }
+};
+
+using music_ptr = std::unique_ptr<Mix_Music, music_deleter>;
+
 // MUST create the Renderer first!
 class Mixer {
 public:
@@ -62,12 +72,38 @@ public:
 
   void stopChannel(int channel);
 
+  // name is the name of the file, not containing the extension
+  // ms is the time in milliseconds to fade in
+  void playMusic(std::string_view name, int ms = 0);
+
+  bool isPlayingMusic() const { return !playingTrack_.empty(); }
+
+  const std::string& getPlayingTrack() const { return playingTrack_; }
+
+  void fadeoutMusic(int ms);
+
+  void muteMusic();
+
+  void unmuteMusic();
+
+  bool isMusicMuted() const { return musicMuted_; }
+
+  void pauseMusic();
+
+  void unpauseMusic();
+
 private:
 
   Mix_Chunk* getChunkByFilename(std::string filename);
 
+  Mix_Music* getMusicByName(std::string_view name);
+
   mix_wrapper mix_;
   std::map<std::string, chunk_ptr> sounds_;
+  std::map<std::string, music_ptr> music_;
+  std::string playingTrack_;
+  int musicVolume_ = MIX_MAX_VOLUME;
+  bool musicMuted_ = false;
 };
 
 #endif /* end of include guard: MIXER_H_6DF82000 */
@@ -97,7 +97,17 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
     "mixer",
     "playSound", &Mixer::playSound,
     "loopSound", &Mixer::loopSound,
-    "stopChannel", &Mixer::stopChannel);
+    "stopChannel", &Mixer::stopChannel,
+    "playMusic", &Mixer::playMusic,
+    "fadeoutMusic", &Mixer::fadeoutMusic,
+    "isPlayingMusic", &Mixer::isPlayingMusic,
+    "getPlayingTrack", &Mixer::getPlayingTrack);
+
+  engine_.new_usertype<Map>(
+    "map",
+    "getWarpPoint", &Map::getWarpPoint,
+    "hasMusic", &Map::hasMusic,
+    "getMusic", &Map::getMusic);
 
   engine_.set_function(
     "message",
@@ -190,9 +200,9 @@ ScriptSystem::ScriptSystem(Game& game) : game_(game) {
     });
 
   engine_.set_function(
-    "getWarpPoint",
-    [&] (std::string warp) {
-      return game_.getMap().getWarpPoint(warp);
+    "getMap",
+    [&] () -> const Map& {
+      return game_.getMap();
     });
 
   engine_.set_function(