From: drumsetmonkey <abelleisle@roadrunner.com>
Date: Tue, 6 Oct 2015 15:56:04 +0000 (-0400)
Subject: Updated Textures
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=6986331694adb60265c815af6637caf2dbc23ede;p=clyne%2Fgamedev.git

Updated Textures
---

6986331694adb60265c815af6637caf2dbc23ede
diff --cc main.cpp
index e45ed96,b9512cd..4aaf161
--- a/main.cpp
+++ b/main.cpp
@@@ -58,16 -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