From: Clyne Sullivan <tullivan99@gmail.com>
Date: Fri, 12 Feb 2016 13:48:50 +0000 (-0500)
Subject: mergge
X-Git-Url: https://code.bitgloo.com/?a=commitdiff_plain;h=51b0b214967ca4770b1674431cffa15777b0ec06;p=clyne%2Fgamedev.git

mergge
---

51b0b214967ca4770b1674431cffa15777b0ec06
diff --cc include/world.h
index 0e26ed9,43da6fc..48ab409
--- a/include/world.h
+++ b/include/world.h
@@@ -342,7 -351,13 +351,13 @@@ public
  	 * playable.
  	 */
  	
 -	void setBGM(const char *path);
 +	void setBGM(std::string path);
+ 
+ 	/**
+ 	 *	Sets the worlds style folder
+ 	 */
+ 
+ 	void setStyle(const char* pre); 
  	
  	/**
  	 * Plays/stops this world's BGM. If `prev` is not NULL, that world's BGM