Resolve merge conflict

3 files changed, 13 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index d79e2a7..896b8e6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,4 +6,5 @@ Release/
 *.sln
 *.vcxproj
 *.vcxproj.filters
-*.vcxproj.user
\ No newline at end of file
+*.vcxproj.user
+/stb_image.h
diff --git a/main.cpp b/main.cpp
index 610dbb1..02f7902 100644
--- a/main.cpp
+++ b/main.cpp
@@ -2,10 +2,15 @@
 #include <cmath>
 
 #include "window.h"
+#include "windows.h"
 #include "bitmap.h"
 #include "level.h"
 #include "train.h"
 
+#include "iostream"
+#pragma comment(lib, "winmm.lib") // For audio files
+
+
 struct Point2D {
 	float x, y;
 };
@@ -85,13 +90,16 @@ int main(int argc, char **argv)
 	Level level(32, 32);
 
 	Bitmap bitmap(Width, Height);
+	TrainCar car(0, 0);
+
+	//bool audio_play1 = PlaySound(TEXT("res\\Starliner.wav"), NULL, SND_LOOP | SND_ASYNC);
+	//Adds Starliner.wav and plays it on startup and loops,
+	//I imagine this would get very annoying during debug so it's commented out for now.
 
 	int xOffs = 0, yOffs = 0;
 	int xDrag, yDrag;
 	bool isDragging = false;
 
-	TrainCar car(0, 0);
-
 	window.onMouseDown([&](int button, int x, int y) {
 		if (button == 1) {
 			static const auto update_direction = [&](int xt, int yt) {
diff --git a/res/Starliner.wav.REMOVED.git-id b/res/Starliner.wav.REMOVED.git-id
new file mode 100644
index 0000000..79f5427
--- /dev/null
+++ b/res/Starliner.wav.REMOVED.git-id
@@ -0,0 +1 @@
+fefc606c3ca8fd6ad7fd3f979a45037a42fda6a8
\ No newline at end of file