Merge remote-tracking branch 'upstream/master' into badguy-sprites

Author: Rusty-Box

src/badguy/dart.cpp

@@ -28,7 +28,7 @@ const float DART_SPEED = 200;
 static const std::string DART_SOUND = "sounds/flame.wav";
 
 Dart::Dart(const ReaderMapping& reader) :
-  BadGuy(reader, "images/creatures/darttrap/dart.sprite"),
+  BadGuy(reader, "images/creatures/dart/dart.sprite"),
   parent(nullptr),
   sound_source()
 {
@@ -39,13 +39,8 @@ Dart::Dart(const ReaderMapping& reader) :
   SoundManager::current()->preload("sounds/stomp.wav");
 }
 
-<<<<<<< HEAD
-Dart::Dart(const Vector& pos, Direction d, const BadGuy* parent_ = nullptr) :
-  BadGuy(pos, d, "images/creatures/darttrap/dart.sprite"),
-=======
 Dart::Dart(const Vector& pos, Direction d, const BadGuy* parent_, const std::string& sprite, Flip flip) :
   BadGuy(pos, d, sprite),
->>>>>>> upstream/master
   parent(parent_),
   sound_source()
 {