1 files changed, 14 insertions, 1 deletions
diff --git a/main.cpp b/main.cpp
index b9512cd..4aaf161 100644
--- a/main.cpp
+++ b/main.cpp
@@ -58,6 +58,19 @@ int main(int argc, char *argv[]){
 	}
 	atexit(Mix_Quit);
 
+<<<<<<< HEAD
+	//Load music
+	music = Mix_LoadMUS("assets/BennyHillTheme.wav");
+	horn = Mix_LoadWAV("assets/air-horn-club-sample_1.wav");
+	if( music == NULL ){
+		printf( "Failed to load beat music! SDL_mixer Error: %s\n", Mix_GetError() );
+	}
+	//Mix_PlayMusic( music, -1 );
+
+
+
+=======
+>>>>>>> 1c0767766506407babdfefea9efe2b5627569244
 	// Turn on double buffering
     SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
     // Create the window
@@ -185,7 +198,7 @@ void render(){
 	**************************/
 
 	currentWorld->draw(&player->loc);	// Draw the world around the player
-	glColor3ub(0,0,0);
+	glColor3ub(255,255,255);
 	player->near=true;
 	player->draw();						// Draw the player
 	player->inv->draw();